Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!411

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -1705,12 +1705,12 @@ public class ClockInController {
 							 			if(clock.getType() == 1) {
 							 			if(clock.getType() == 1) {
 							 				if(clock.getDiffer() == 2) {//更新打卡
 							 				if(clock.getDiffer() == 2) {//更新打卡
 							 					//如果第二次后打卡，未超过上班时间  即为打卡失效
 							 					//如果第二次后打卡，未超过上班时间  即为打卡失效
-								 				Date sd1=df1.parse(ClockInTool.stampToDate(String.valueOf(starttime1)));//应打卡时间
-												Date sd2=df1.parse(sStdIoTime);//打卡时间
-												if(sd1.after(sd2)) {
+//								 				Date sd1=df1.parse(ClockInTool.stampToDate(String.valueOf(starttime1)));//应打卡时间
+//												Date sd2=df1.parse(sStdIoTime);//打卡时间
+//												if(sd1.after(sd2)) {//大于
 													sbdkkd = true;//打卡无效
 													sbdkkd = true;//打卡无效
-	//												atttype = 1;
-												}
+													atttype = clock.getType();
+//												}
 							 				}
 							 				}
 							 			}else if(clock.getType() == 2){
 							 			}else if(clock.getType() == 2){
 							 				if(dkmc.getSbdk1() != null && dkmc.getXbdk1() == null){
 							 				if(dkmc.getSbdk1() != null && dkmc.getXbdk1() == null){
@@ -2992,7 +2992,7 @@ public class ClockInController {
 						 }
 						 }
 					 }
 					 }
 					 
 					 
-					 //全部为 1 时
+					 //全部为 1 时 iscrdk
 					 if(bccs == bc && b.before(d) && lcdkgb && isdkjj) {
 					 if(bccs == bc && b.before(d) && lcdkgb && isdkjj) {
 						 KqglAssoDkjl dk = KqglAssoDkjl.builder().build().selectOne(new QueryWrapper<KqglAssoDkjl>().lambda().eq(KqglAssoDkjl::getQyid, userBean.getOrgCode())
 						 KqglAssoDkjl dk = KqglAssoDkjl.builder().build().selectOne(new QueryWrapper<KqglAssoDkjl>().lambda().eq(KqglAssoDkjl::getQyid, userBean.getOrgCode())
 								 .eq(KqglAssoDkjl::getUserId, userBean.getEmpNum()).ge(KqglAssoDkjl::getDktime, startDate).le(KqglAssoDkjl::getDktime, endDate)
 								 .eq(KqglAssoDkjl::getUserId, userBean.getEmpNum()).ge(KqglAssoDkjl::getDktime, startDate).le(KqglAssoDkjl::getDktime, endDate)
@@ -3006,8 +3006,14 @@ public class ClockInController {
 							 AttSchedule attw = attsch.get(dk.getSort()-1);
 							 AttSchedule attw = attsch.get(dk.getSort()-1);
 							 attw.setIsupdate(1);
 							 attw.setIsupdate(1);
 						 }else {
 						 }else {
+							 if(iscrdk) {
 								 AttSchedule attc = attsch.get(0);
 								 AttSchedule attc = attsch.get(0);
 								 attc.setIsdk(0);
 								 attc.setIsdk(0);
+							 }else {
+								 AttSchedule attc = attsch.get(cr);
+								 attc.setIsdk(0);
+							 }
+							 
 						 }
 						 }
 					 }
 					 }
 				 }else {
 				 }else {