Merge branch 'lal' into 'develop'

Lal See merge request 8timerv2/8timerapiv200!158

Merge branch 'lal' into 'develop'
Lal See merge request 8timerv2/8timerapiv200!158
cfb72281 · leialin · bce50eb0 · f734ec31 · cfb72281 · cfb72281
Commit cfb72281 authored 4 years ago by leialin
5 changed files
--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -28,6 +28,8 @@ import cn.timer.api.bean.kqmk.KqglAssoZhoupaiban;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.exception.CustomException;
+import cn.timer.api.dao.kqmk.KqglAssoBcszMapper;
+import cn.timer.api.dao.kqmk.KqglAssoDkjlMapper;
 import cn.timer.api.dao.kqmk.KqglAssoDkmxMapper;
 import cn.timer.api.dao.kqmk.KqglAssoPbmxMapper;
 import cn.timer.api.dao.kqmk.KqglMainKqzMapper;
@@ -54,9 +56,16 @@ public class ClockInController {
 	@Autowired
 	private KqglAssoDkmxMapper kqglassodkmxmapper;
+	@Autowired
+	private KqglAssoDkjlMapper kqglassodkjlmapper;
+	@Autowired
+	private KqglAssoBcszMapper kqglassobcszmapper;
 	SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
 	SimpleDateFormat sdf2 = new SimpleDateFormat("EEE");
+	SimpleDateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	/**
 	 * 考勤打卡
 	 * 
@@ -69,6 +78,17 @@ public class ClockInController {
 	@ApiOperationSupport(order = 1)
 	public Result<Object> punchclock(@RequestParam String json) throws Exception {
+		String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+		String current = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+		String yesterday = ClockInTool.requires_extra_times(current,-1,3);//前一天
+		Long startDateyesterday = DateUtil.getStartTime(0,DateUtil.getStringTime(yesterday,"yyyy-MM-dd")).getTime();
+		Long endDateyesterday = DateUtil.getnowEndTime(23,DateUtil.getStringTime(yesterday,"yyyy-MM-dd")).getTime();
+		Long attendance_date = 0l;//考勤日期
+		String toweek = "";
 		String msg = "未知错误，请联系管理员";
 		int sbyf = 0;//0:失败；1:成功
@@ -76,12 +96,11 @@ public class ClockInController {
 		String asDevId = jsonArray.get("dev_id").toString();//考勤机编码
 		String asUserId = jsonArray.get("user_id").toString();//打卡用户id
 		String asVerifyMode = jsonArray.get("verify_mode").toString();//考勤机打卡方式(1:指纹;20:人脸;40:掌纹;60:密码(猜的^v^))
-		String sStdIoTime = jsonArray.get("io_time").toString();//打卡时间
+		String sStdIoTime = jsonArray.get("io_time").toString();//打卡时间 **判断次日打卡情况**
 		KqglAssoKqj kqjdev = KqglAssoKqj.builder().build().selectOne(new QueryWrapper<KqglAssoKqj>().lambda().eq(KqglAssoKqj::getCode, asDevId));
 		if (kqjdev == null) 
 			return ResultUtil.error("考勤机不存在！");
-//		YgglMainEmp user = new LambdaQueryChainWrapper<YgglMainEmp>(ygglmainempmapper).eq(YgglMainEmp::getEmpNum, asUserId).eq(YgglMainEmp::getOrgCode, kqjdev.getQyid()).one();
 		YgglMainEmp user = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, asUserId).eq(YgglMainEmp::getOrgCode, kqjdev.getQyid()));
 		if(user != null) {
 			int qyid = user.getOrgCode();
@@ -90,11 +109,12 @@ public class ClockInController {
 			//pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 			/*******/
-			long time_ = DateUtil.getStringTime(sStdIoTime, "yyyy-MM-dd HH:mm:ss");
+			long time_ = DateUtil.getStringTime(sStdIoTime, "yyyy-MM-dd HH:mm:ss");//打卡时间戳
-			String putime = new SimpleDateFormat("yyyy-MM-dd").format(time_);//转换打卡时间格式
+			String putime = new SimpleDateFormat("yyyy-MM-dd").format(time_);//转换打卡时间格式 年月日
 			//打卡当天开始时间,打卡当天结束时间
 			Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();
 			Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();
 			int dkmx = 0;
 			int shifid = 0;
@@ -105,7 +125,7 @@ public class ClockInController {
 			ClockCollectData clockt = new ClockCollectData();
 			/*******/
-			if(attgro != null) {
+			if(attgro != null) {//判断考勤组是否存在
 				List<KqglAssoKqzdkfs> kqjs = KqglAssoKqzdkfs.builder().build().selectList(new QueryWrapper<KqglAssoKqzdkfs>().lambda().eq(KqglAssoKqzdkfs::getKqzId, attgro.getId()));
 				if(kqjs.size() > 0) {
 //					long time_ = DateUtil.getStringTime(sStdIoTime, "yyyy-MM-dd HH:mm:ss");
@@ -114,11 +134,91 @@ public class ClockInController {
 //					Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();
 //					Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();
-					//查询打卡当天是否有记录
-					KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
+					//查询打卡当天是否有记录**********************************
-							.ge(KqglAssoDkmx::getDksj, startDate).le(KqglAssoDkmx::getDksj, endDate));
+//					KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
+//							.ge(KqglAssoDkmx::getDksj, startDate).le(KqglAssoDkmx::getDksj, endDate));
+					KqglAssoDkmx dkmc = KqglAssoDkmx.builder().build();
+					//putime： 根据日期  得到打卡所需的详细信息
 					AttendanceCardListDto attdate = MethodCall(qyid,userid,putime);
+					String dakariqi = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDateyesterday))+" "+ClockInTool.dateToWeek2(yesterday);
+					//检查昨日的班次是否存在次日打卡
+					KqglAssoDkjl balan = kqglassodkjlmapper.selectOne(new QueryWrapper<KqglAssoDkjl>().lambda().eq(KqglAssoDkjl::getUserId, userid).eq(KqglAssoDkjl::getAttdate, dakariqi).ne(KqglAssoDkjl::getBcid, 0).orderByDesc(KqglAssoDkjl :: getSort).last("LIMIT 1"));
+					if(balan != null) {//前一天是否打过卡    去班次id查询是否存在次日打卡
+						//班次信息
+						KqglAssoBcsz shif = kqglassobcszmapper.selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, balan.getBcid()));
+						int dkcs = shif.getSxbcs()*2;
+						List<AttSchedule> ashss = attdate.getAttsch();//获取今天应打卡时间
+						System.out.println(ashss.get(0).getTime());
+						boolean dnck = false;
+						if(ashss.size() > 0) {
+							Date sd1=df1.parse(ClockInTool.stampToDate(String.valueOf(ashss.get(0).getTime())));//当天应打的首次上班卡时间
+							Date sd2=df1.parse(current_time);//当前时间
+							if(sd1.after(sd2)) {
+								dnck = true;
+							}
+						}
+						int isXbdk1Cr = shif.getIsXbdk1Cr();//下班1是否次日（0：否；1：是）
+						int isSbdk2Cr = shif.getIsSbdk2Cr();//上班2是否次日（0：否；1：是）
+						int isXbdk2Cr = shif.getIsXbdk2Cr();//下班2是否次日（0：否；1：是）
+						int isSbdk3Cr = shif.getIsSbdk3Cr();//上班3是否次日（0：否；1：是）
+						int isXbdk3Cr = shif.getIsXbdk3Cr();//下班3是否次日（0：否；1：是）
+						boolean crdk = false;//当次打卡是否存在次日打卡
+						if(balan.getSort() < dkcs) {
+							if(balan.getSort()+1 == 2 && dkcs == 2) {
+								if(isXbdk1Cr > 0) {//次日
+									crdk = true;
+								}
+							}
+							if(balan.getSort()+1 == 3 && dkcs == 4) {
+								if(isSbdk2Cr > 0) {//次日
+									crdk = true;
+								}
+							}
+							if(balan.getSort()+1 == 4 && dkcs == 4) {
+								if(isXbdk2Cr > 0) {//次日
+									crdk = true;
+								}
+							}
+							if(balan.getSort()+1 == 5 && dkcs == 6) {
+								if(isSbdk3Cr > 0) {//次日
+									crdk = true;
+								}
+							}
+							if(balan.getSort()+1 == 6 && dkcs == 6) {
+								if(isXbdk3Cr > 0) {//次日
+									crdk = true;
+								}
+							}
+						}
+						if(crdk && dnck) {
+							dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
+									.ge(KqglAssoDkmx::getDksj, startDateyesterday).le(KqglAssoDkmx::getDksj, endDateyesterday));
+							attdate = MethodCall(qyid,userid,yesterday);
+							attendance_date = startDateyesterday;
+							toweek = yesterday;
+						}else {
+							dkmc = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
+									.ge(KqglAssoDkmx::getDksj, startDate).le(KqglAssoDkmx::getDksj, endDate));
+//							attdate = MethodCall(qyid,userid,putime);
+							attendance_date = startDate;
+							toweek = putime;
+						}
+					}else {
+						//无记录的话就找昨天的数据
+						AttendanceCardListDto attdate1 = MethodCall(qyid,userid,yesterday);
+					}
+					//putime： 根据日期  得到打卡所需的详细信息
+//					AttendanceCardListDto attdate = MethodCall(qyid,userid,putime);
 //					ClockCollectData clockt = new ClockCollectData();
 					long starttime1 = 0,starttime1ks = 0,starttime1js = 0,endtime1 = 0,endtime1ks = 0,endtime1js = 0,starttime2 = 0,starttime2ks = 0,starttime2js = 0,endtime2 = 0,endtime2ks = 0,endtime2js = 0,starttime3 = 0,starttime3ks = 0,starttime3js = 0,
@@ -141,6 +241,8 @@ public class ClockInController {
 							endtime3 = ash.get(5).getTime();endtime3ks = ash.get(5).getStarttime();endtime3js = ash.get(5).getEndtime();
 						 }
 					 }
 //					 long punchcardtime,punchstart,punchend = 0;//应打卡时间,应打卡开始时间,应打卡结束时间
 //					 int atttype = 0;
 					 if(dkmc == null) {//上班1   ****新增
@@ -150,21 +252,36 @@ public class ClockInController {
 						 atttype = 1;
 					 }else {
 						 if((!("").equals(dkmc.getSbdk1()) || dkmc.getSbdk1() != null) && (("").equals(dkmc.getXbdk1()) || dkmc.getXbdk1() == null)){	//下班1
-							 punchcardtime = endtime1;punchstart = endtime1ks;punchend = endtime1js;atttype = 2;
+							 punchcardtime = endtime1;
+							 punchstart = endtime1ks;
+							 punchend = endtime1js;
+							 atttype = 2;
 					     }else if((!("").equals(dkmc.getSbdk1()) || dkmc.getSbdk1() != null) && (!("").equals(dkmc.getXbdk1()) || dkmc.getXbdk1() != null)
 					    		 && (("").equals(dkmc.getSbdk2()) || dkmc.getSbdk2() == null)){	//上班2
-					    	 punchcardtime = starttime2;punchstart = starttime2ks;punchend = starttime2js;atttype = 3;
+					    	 punchcardtime = starttime2;
+					    	 punchstart = starttime2ks;
+					    	 punchend = starttime2js;
+					    	 atttype = 3;
 					     }else if((!("").equals(dkmc.getSbdk1()) || dkmc.getSbdk1() != null) && (!("").equals(dkmc.getXbdk1()) || dkmc.getXbdk1() != null)
 					    		 && (!("").equals(dkmc.getSbdk2()) || dkmc.getSbdk2() != null) && (("").equals(dkmc.getXbdk2()) || dkmc.getXbdk2() == null)){	//下班2
-					    	 punchcardtime = endtime2;punchstart = endtime2ks;punchend = endtime2js;atttype = 4;
+					    	 punchcardtime = endtime2;
+					    	 punchstart = endtime2ks;
+					    	 punchend = endtime2js;
+					    	 atttype = 4;
 					     }else if((!("").equals(dkmc.getSbdk1()) || dkmc.getSbdk1() != null) && (!("").equals(dkmc.getXbdk1()) || dkmc.getXbdk1() != null)
 					    		 && (!("").equals(dkmc.getSbdk2()) || dkmc.getSbdk2() != null) && (!("").equals(dkmc.getXbdk2()) || dkmc.getXbdk2() != null)
 					    		 && (("").equals(dkmc.getSbdk3()) || dkmc.getSbdk3() == null)){	//上班3
-					    	 punchcardtime = starttime3;punchstart = starttime3ks;punchend = starttime3js;atttype = 5;
+					    	 punchcardtime = starttime3;
+					    	 punchstart = starttime3ks;
+					    	 punchend = starttime3js;
+					    	 atttype = 5;
 					     }else if((!("").equals(dkmc.getSbdk1()) || dkmc.getSbdk1() != null) && (!("").equals(dkmc.getXbdk1()) || dkmc.getXbdk1() != null)
 					    		 && (!("").equals(dkmc.getSbdk2()) || dkmc.getSbdk2() != null) && (!("").equals(dkmc.getXbdk2()) || dkmc.getXbdk2() != null)
 					    		 && (!("").equals(dkmc.getSbdk3()) || dkmc.getSbdk3() != null) && (("").equals(dkmc.getXbdk3()) || dkmc.getXbdk3() == null)){	//下班3
-					    	 punchcardtime = endtime3;punchstart = endtime3ks;punchend = endtime3js;atttype = 6;
+					    	 punchcardtime = endtime3;
+					    	 punchstart = endtime3ks;
+					    	 punchend = endtime3js;
+					    	 atttype = 6;
 					     }else {
 					    	 punchcardtime = 0;punchstart = 0;punchend = 0;atttype = 7;
 					     }
@@ -329,15 +446,12 @@ public class ClockInController {
 										 }
 								     }
 									 pcd.setId(dkmc.getId());
 									 if(atttype <= 6){
 										 int update = kqglassodkmxmapper.updateByPrimaryKeySelective(pcd);//修改打卡记录
 									 }
 								 }
 							 }else {
-//								 System.out.println("当前打卡时间不在范围内");
 								 msg = "当前打卡时间不在范围内";
 								 sbyf = 0;
 							 }
@@ -345,18 +459,14 @@ public class ClockInController {
 						 msg = "当前是休息时间";
 						 sbyf = 0;
 					 }
 				}else {
-//					return ResultUtil.error("打卡失败！，未加入考勤组！");
+					msg = "未检测到考勤机";
-					msg="打卡失败！，未加入考勤组！";
 					sbyf = 0;
 				}
 /*************************************************************************************************************************************************************************************/
 /*************************************************************************************************************************************************************************************/
+					//	原始打卡记录数据录入
-					//原始打卡记录数据录入**************************************************************************************************************************************
 					int results = 0;
 					Long time = (time_ - punchcardtime)/1000/60;
 					if(punchcardtime != 0){
@@ -404,7 +514,7 @@ public class ClockInController {
 							}
 						}
 					}
-					String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(startDate));//转换打卡时间格式
+					String attdate_ = new SimpleDateFormat("yy-MM-dd").format(Double.valueOf(attendance_date));//转换打卡时间格式
 					long attime;
 //					if(punchcardtime == 0 && !isRange){attime = new Date().getTime();}else{attime = punchcardtime;}// 考勤时间(应打卡时间)
 					if(punchcardtime == 0){// 考勤时间(应打卡时间)
@@ -428,27 +538,27 @@ public class ClockInController {
 					}else {
 						commentary = msg;
 					}
 					//cardtype--1：GPS，2：WIFI，3：考勤机
 					KqglAssoDkjl pre = KqglAssoDkjl.builder().dktime(time_).results(results).userId(userid).type(type).status(status).sort(atttype)
-							.cardType(3).qyid(qyid).attdate(attdate_+" "+ClockInTool.dateToWeek2(putime)).attime(attime).dkmxid(dkmx).bcid(shifid).remarks(remarks).punchmode(Integer.valueOf(asVerifyMode))
+							.cardType(3).qyid(qyid).attdate(attdate_+" "+ClockInTool.dateToWeek2(toweek)).attime(attime).dkmxid(dkmx).bcid(shifid).remarks(remarks).punchmode(Integer.valueOf(asVerifyMode))
 							.punchequipment(asDevId).commentary(commentary).build();
 					if (!pre.insert()) {
 						throw new CustomException("打卡记录-新增异常-2");
 					 }
+				}else {
+					msg="打卡失败！，未加入考勤组！";
+					sbyf = 0;
 				}
 		}else {
 			return ResultUtil.error("打卡失败！，用户不存在！");
 		}
 		if(sbyf == 1) {
 			return  ResultUtil.data(null, "打卡成功");
 		}else {
 			return  ResultUtil.data(msg, "打卡失败");
 		}
 	}
 	@Autowired
@@ -598,53 +708,114 @@ public class ClockInController {
 	//
 	public void Getshiftinformationbatch(KqglAssoBcsz shiftm,AttendanceCardListDto attcar,String str){
+		int isXbdk1Cr = shiftm.getIsXbdk1Cr();//下班1是否次日（0：否；1：是）
+		int isSbdk2Cr = shiftm.getIsSbdk2Cr();//上班2是否次日（0：否；1：是）
+		int isXbdk2Cr = shiftm.getIsXbdk2Cr();//下班2是否次日（0：否；1：是）
+		int isSbdk3Cr = shiftm.getIsSbdk3Cr();//上班3是否次日（0：否；1：是）
+		int isXbdk3Cr = shiftm.getIsXbdk3Cr();//下班3是否次日（0：否；1：是）
+		//次日专用
+		String next_day = ClockInTool.requires_extra_times(str,1,2);
 		 List<AttSchedule> atts = new ArrayList<AttSchedule>();
 	    	if(shiftm.getSxbcs() == 1 || shiftm.getSxbcs() == 2 || shiftm.getSxbcs() == 3){//1次上下班
 	    		for(int o=0;o<2;o++){
 	    			if(o==0){
 			    		AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(1).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbdk1()+":00").replaceAll("\r|\n", ""))))
 			    				.starttime(("").equals(shiftm.getSbqjks1()) || shiftm.getSbqjks1() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjks1()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getSbqjjs1()) || shiftm.getSbqjjs1() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs1()+":00").replaceAll("\r|\n", "")))).build();
+			    				.endtime(("").equals(shiftm.getSbqjjs1()) || shiftm.getSbqjjs1() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs1()+":00").replaceAll("\r|\n", ""))))
+			    				.nextday(0).build();
 			    		atts.add(as);
 	    			}else{
+	    				//次日
+	    				if(isXbdk1Cr > 0) {
+	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(2).time(Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbdk1()+":00").replaceAll("\r|\n", ""))))
+				    				.starttime(("").equals(shiftm.getXbqjks1()) || shiftm.getXbqjks1() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjks1()+":00").replaceAll("\r|\n", ""))))
+				    				.endtime(("").equals(shiftm.getXbqjjs1()) || shiftm.getXbqjjs1() ==null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjjs1()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(1).build();
+				    		atts.add(as);
+	    				}else {
 	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(2).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbdk1()+":00").replaceAll("\r|\n", ""))))
 				    				.starttime(("").equals(shiftm.getXbqjks1()) || shiftm.getXbqjks1() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjks1()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getXbqjjs1()) || shiftm.getXbqjjs1() ==null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs1()+":00").replaceAll("\r|\n", "")))).build();
+				    				.endtime(("").equals(shiftm.getXbqjjs1()) || shiftm.getXbqjjs1() ==null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs1()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(0).build();
 				    		atts.add(as);
 	    				}
+	    			}
 	    		}
 	    		attcar.setAttsch(atts);
 	    	}
 	    	if(shiftm.getSxbcs() == 2 || shiftm.getSxbcs() == 3){//2次上下班
 	    		for(int o=0;o<2;o++){
 	    			if(o==0){
+	    				if(isSbdk2Cr > 0) {//次日
+	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(3).time(Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbdk2()+":00").replaceAll("\r|\n", ""))))
+				    				.starttime(("").equals(shiftm.getSbqjks2())|| shiftm.getSbqjks2()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbqjks2()+":00").replaceAll("\r|\n", ""))))
+				    				.endtime(("").equals(shiftm.getSbqjjs2()) || shiftm.getSbqjjs2()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbqjjs2()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(1).build();
+				    		atts.add(as);
+	    				}else {
 	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(3).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbdk2()+":00").replaceAll("\r|\n", ""))))
 				    				.starttime(("").equals(shiftm.getSbqjks2())|| shiftm.getSbqjks2()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjks2()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getSbqjjs2()) || shiftm.getSbqjjs2()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs2()+":00").replaceAll("\r|\n", "")))).build();
+				    				.endtime(("").equals(shiftm.getSbqjjs2()) || shiftm.getSbqjjs2()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs2()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(0).build();
 				    		atts.add(as);
+	    				}
 	    			}else{
+	    				if(isXbdk2Cr > 0) {//次日
+	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(4).time(Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbdk2()+":00").replaceAll("\r|\n", ""))))
+				    				.starttime(("").equals(shiftm.getXbqjks2()) || shiftm.getXbqjks2()== null? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjks2()+":00").replaceAll("\r|\n", ""))))
+				    				.endtime(("").equals(shiftm.getXbqjjs2()) || shiftm.getXbqjjs2()== null? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjjs2()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(1).build();
+				    		atts.add(as);
+	    				}else {
 	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(4).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbdk2()+":00").replaceAll("\r|\n", ""))))
 				    				.starttime(("").equals(shiftm.getXbqjks2()) || shiftm.getXbqjks2()== null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjks2()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getXbqjjs2()) || shiftm.getXbqjjs2()== null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs2()+":00").replaceAll("\r|\n", "")))).build();
+				    				.endtime(("").equals(shiftm.getXbqjjs2()) || shiftm.getXbqjjs2()== null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs2()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(0).build();
 				    		atts.add(as);
 	    				}
+	    			}
 	    		}
 	    		attcar.setAttsch(atts);
 	    	}
 	    	if(shiftm.getSxbcs() == 3){//3次上下班
 	    		for(int o=0;o<2;o++){
 	    			if(o==0){
+	    				if(isSbdk3Cr > 0) {//次日
+	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(5).time(Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbdk3()+":00").replaceAll("\r|\n", ""))))
+				    				.starttime(("").equals(shiftm.getSbqjks3()) || shiftm.getSbqjks3() == null? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbqjks3()+":00").replaceAll("\r|\n", ""))))
+				    				.endtime(("").equals(shiftm.getSbqjjs3()) || shiftm.getSbqjjs3() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getSbqjjs3()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(1).build();
+				    		atts.add(as);
+	    				}else {
 	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(5).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbdk3()+":00").replaceAll("\r|\n", ""))))
 				    				.starttime(("").equals(shiftm.getSbqjks3()) || shiftm.getSbqjks3() == null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjks3()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getSbqjjs3()) || shiftm.getSbqjjs3() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs3()+":00").replaceAll("\r|\n", "")))).build();
+				    				.endtime(("").equals(shiftm.getSbqjjs3()) || shiftm.getSbqjjs3() == null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getSbqjjs3()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(0).build();
 				    		atts.add(as);
+	    				}
 	    			}else{
+	    				if(isXbdk3Cr > 0) {//次日
+	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(6).time(Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbdk3()+":00").replaceAll("\r|\n", ""))))
+				    				.starttime(("").equals(shiftm.getXbqjks3()) || shiftm.getXbqjks3()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjks3()+":00").replaceAll("\r|\n", ""))))
+				    				.endtime(("").equals(shiftm.getXbqjjs3()) || shiftm.getXbqjjs3() ==null? 0 : Long.valueOf(ClockInTool.dateToStamp((next_day+" "+shiftm.getXbqjjs3()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(1).build();
+				    		atts.add(as);
+	    				}else {
 	    					AttSchedule as = AttSchedule.builder().id(shiftm.getId()).sort(6).time(Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbdk3()+":00").replaceAll("\r|\n", ""))))
 				    				.starttime(("").equals(shiftm.getXbqjks3()) || shiftm.getXbqjks3()== null ? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjks3()+":00").replaceAll("\r|\n", ""))))
-			    				.endtime(("").equals(shiftm.getXbqjjs3()) || shiftm.getXbqjjs3() ==null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs3()+":00").replaceAll("\r|\n", "")))).build();
+				    				.endtime(("").equals(shiftm.getXbqjjs3()) || shiftm.getXbqjjs3() ==null? 0 : Long.valueOf(ClockInTool.dateToStamp((str+" "+shiftm.getXbqjjs3()+":00").replaceAll("\r|\n", ""))))
+				    				.nextday(0).build();
 				    		atts.add(as);
 	    				}
+	    			}
 	    		}
 	    		attcar.setAttsch(atts);
 	    	}

--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java
@@ -23,6 +23,36 @@ public class ClockInTool {
 	static SimpleDateFormat famt = new SimpleDateFormat("yyyy-MM-dd");
 	/**
+	 * @param timeStr 修改的时间
+	 * @param num 修改数字
+	 * @param numtime
+	 * @return 1：增加一年、2：增加一天、3：减10天、4：增加一个月
+	 */
+	public static String requires_extra_times(String timeStr, int num,int numtime) {
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		Date date = null;
+		try {
+			date = df.parse(timeStr);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);// 设置起时间
+		if(numtime == 1) {
+			cal.add(Calendar.YEAR, num);// 增加一年
+		}else if(numtime == 2) {
+			cal.add(Calendar.DATE, num);//增加一天
+		}else if(numtime == 3) {
+			cal.add(Calendar.DATE, num);//减10天
+		}else {
+			cal.add(Calendar.MONTH, num);//增加一个月
+		}
+		return df.format(cal.getTime());
+	}
+	/**
 	 * @param timeStr
 	 * @param addnumber
 	 * @return 通过java Calendar 实现时间+ 分钟
@@ -433,4 +463,17 @@ public class ClockInTool {
 		return res;
 	}
+	/**
+	 * 时间戳转换时间
+	 */
+    public static String stampToDate(String s){
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
 }
--- a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java
@@ -993,6 +993,7 @@ public class TimeCardController {
 				String DevId = "";
 				for(KqglAssoKqzdkfs abp:kqjs) {
 					KqglAssoKqj kqj = KqglAssoKqj.builder().id(abp.getDkfsid()).build().selectById();//查询考勤机“序列号”
+					if(kqj != null) {
 						DevId = kqj.getCode();
 						for(UserAttendanceRel user:attusers) {
 							String user_id = user.getEmpnum();//"1692";//要删除的考勤组里面用户ID
@@ -1008,6 +1009,8 @@ public class TimeCardController {
 					        System.err.print(request.getBody());
 						}
 					}
+				}
 			userequirelationmapper.deleteBykqzid(id);
 			//删除考勤组绑定的打卡方式

--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -31,6 +30,7 @@ import cn.timer.api.bean.kqmk.KqglAssoRelationSummary;
 import cn.timer.api.bean.kqmk.KqglAssoTeshu;
 import cn.timer.api.bean.kqmk.KqglAssoZhoupaiban;
 import cn.timer.api.bean.kqmk.KqglMainKqz;
+import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.controller.kqgl.ClockInTool;
 import cn.timer.api.dao.kqgl.AttendanceWeeklySchMapper;
 import cn.timer.api.dao.kqgl.PunchCardDetailsMapper;
@@ -105,7 +105,7 @@ public class AttendanceTaskTiming{
 	 */
 	 //3.添加定时任务 每天下午七点执行一次
-     @Scheduled(cron = "0 0 19 * * ?")
+     @Scheduled(cron = "0 34 10 * * ?")
    //或直接指定时间间隔，例如：5秒
    //@Scheduled(fixedRate=5000)
@@ -142,7 +142,7 @@ public class AttendanceTaskTiming{
 			ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));  
 			Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(sdf1.format(ca.getTime()),"yyyy-MM-dd")).getTime();
-//			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
+			List<QyzxEntInfoM> orgcodelist = qyzxentinfommapper.selectList(new QueryWrapper<QyzxEntInfoM>());//系统中的所有公司  所有未到期的公司
 			String str = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();//
 			String ttstr = new SimpleDateFormat("yyyy-MM").format(new Date()).toString();//
@@ -154,8 +154,8 @@ public class AttendanceTaskTiming{
 			KqglAssoMonthPunchSummary.builder().build().delete(new QueryWrapper<KqglAssoMonthPunchSummary>().lambda().eq(KqglAssoMonthPunchSummary::getBelongYear, year).eq(KqglAssoMonthPunchSummary::getBelongMonth, month));
-//			for(int t = 0;t<orgcodelist.size();t++){
+			for(int t = 0;t<orgcodelist.size();t++){
-				int org_code = 310;//orgcodelist.get(t).getId();//企业组织代码
+				int org_code = orgcodelist.get(t).getId();//企业组织代码
 				List<AdditionalDto> userlist = kqglassoleavebalancemapper.selectAdditionalList(org_code);
 				for(AdditionalDto user : userlist) {
 					double traveltotal = 0,egresstotal = 0,overtimetotal = 0;
@@ -684,7 +684,7 @@ public class AttendanceTaskTiming{
 					 summary.setDay31(noticesArray[30]);
 					 summary.insert();
 				}
-//			}
+			}
 //			KqglTaskTiming.builder().task("AttendanceTask").id(sockid).executionStatus(0).lastExecutionTime(new Date().getTime()).build().updateById();
 //			return new Exception().getStackTrace()[0].getMethodName();

--- a/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
+++ b/src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java
@@ -20,6 +20,7 @@ public class AttSchedule implements Serializable{
 	private Integer id;
 	private Integer sort;// 1:上班；2：下班； 3：上班；4:下班；5:上班；6:下班
+	private Integer nextday;//0:否；1:是
 	private Long time;
 	private Long starttime;
 	private Long endtime;