Browse Source

新增获取当前用户打卡数据

anderx 3 years ago
parent
commit
8875e6143a

+ 1 - 1
src/main/java/com/goafanti/weChat/bo/InputPublicDtails.java

@@ -17,7 +17,7 @@ public class InputPublicDtails {
 	private String sid;
 	private String depId;
 	/**
-	 * 0业务 1技术 2行政
+	 * 0业务 1技术 2行政 3协单
 	 */
 	private Integer publicType;
 	private Integer pageSize;

+ 7 - 0
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -286,5 +286,12 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res;
 	}
 
+	@RequestMapping(value = "/getMyNewPublic",method = RequestMethod.GET)
+	public Result getMyNewPublic (){
+		Result res =new Result();
+		res.data(publicReleaseService.getMyNewPublic());
+		return res;
+	}
+
 
 }

+ 2 - 0
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -47,4 +47,6 @@ public interface PublicReleaseService {
     List<Map<String,Object>> selectOrderByUid(String uid);
 
 	List<OutPublicRelease> publicByOrder(String orderNo);
+
+    Object getMyNewPublic();
 }

+ 32 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -548,5 +548,37 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return publicReleaseMapper.publicByOrder(orderNo);
 	}
 
+	@Override
+	public Object getMyNewPublic() {
+		List<OutPublicReleaseList> myPublic = getMyPublic(0,0);
+		if (myPublic.isEmpty()){
+			List<OutPublicReleaseList> myPublic2 = getMyPublic(3,0);
+			if (!myPublic2.isEmpty()){
+				return myPublic2.get(0);
+			}else {
+				List<OutPublicReleaseList> myPublic3 = getMyPublic(0,0);
+				if(!myPublic3.isEmpty())return myPublic3.get(0);
+			}
+		}else {
+			return myPublic.get(0);
+		}
+		return null;
+	}
+
+	public List<OutPublicReleaseList>getMyPublic(Integer type,Integer dateType){
+		InputPublicReleaseList in=new InputPublicReleaseList();
+		if (type==null)type=0;
+		in.setType(type);
+		if (dateType==1){
+			Date date = new Date();
+			String clockTime=DateUtils.formatDate(date,AFTConstants.YYYYMMDDHHMMSS);
+			in.setClockTime(clockTime);
+		}
+		in.setPageNo(1);
+		in.setPageSize(1);
+		Pagination<OutPublicReleaseList>  p= (Pagination<OutPublicReleaseList>) listPublicRelease(in);
+		List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) p.getList();
+		return list;
+	}
 
 }