Explorar o código

处理元打卡数据标记每天

anderx hai 1 ano
pai
achega
c1358661a2

+ 30 - 21
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -149,6 +149,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			publicReleaseDetailsMapper.insertBatch(prdList);
 		}
+		addPublicReleaseDateClock(in);
 		String userNames=str.substring(0,str.length()-1);
 		in.setUserNames(userNames);
 		PublicRelease updateName=new PublicRelease();
@@ -159,6 +160,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
         return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
 	}
 
+
+
+
 	private void addPublicExamine(Integer id, String aid) {
 		Admin admin = adminMapper.selectByPrimaryKey(aid);
 		addPublicExamine(id,admin);
@@ -1827,31 +1831,36 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public Object pushDateClock() {
 		List<PublicRelease> publicReleases = publicReleaseMapper.selectAll();
 		for (PublicRelease e : publicReleases) {
-			List<PublicReleaseDateClock> list= new ArrayList<>();
-			if (e.getValidDate()!=null){
-				List<Map> maps = JSONArray.parseArray(e.getValidDate(), Map.class);
-				for (Map map : maps) {
-					String dates = (String) map.get("value");
-					if (dates!=null){
-						Date date = DateUtils.parseDate(dates);
-						List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(e.getId());
-						for (OutPublicReleaseDetails det : outPublicReleaseDetails) {
-							PublicReleaseDateClock newPRDC = new PublicReleaseDateClock();
-							newPRDC.setClockInTime(date);
-							newPRDC.setPrid(e.getId());
-							newPRDC.setPrdid(det.getId());
-							newPRDC.setStatus(det.getClockIn());
-							list.add(newPRDC);
-						}
-						if(!list.isEmpty()){
-							publicReleaseDateClockMapper.insertBatch(list);
-							list.clear();
-						}
+			addPublicReleaseDateClock(e);
+		}
+		return 1;
+	}
+
+	private void addPublicReleaseDateClock(PublicRelease e) {
+		List<PublicReleaseDateClock> list= new ArrayList<>();
+		if (e.getValidDate()!=null){
+			List<Map> maps = JSONArray.parseArray(e.getValidDate(), Map.class);
+			for (Map map : maps) {
+				String dates = (String) map.get("value");
+				if (dates!=null){
+					Date date = DateUtils.parseDate(dates);
+					List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(e.getId());
+					for (OutPublicReleaseDetails det : outPublicReleaseDetails) {
+						PublicReleaseDateClock newPRDC = new PublicReleaseDateClock();
+						newPRDC.setClockInTime(date);
+						newPRDC.setPrid(e.getId());
+						newPRDC.setPrdid(det.getId());
+						newPRDC.setStatus(det.getClockIn());
+						list.add(newPRDC);
 					}
 
 				}
+
 			}
 		}
-		return 1;
+		if(!list.isEmpty()){
+			publicReleaseDateClockMapper.insertBatch(list);
+			list.clear();
+		}
 	}
 }