提交

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

@@ -2318,6 +2318,14 @@ public class ClockInController {
 //		     List<KqglAssoDkjl> dajllist = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
 //		     attdate.setAttpr(dajllist);
 			 int dkcs = 0;
+			 int isxbdk = 0;
+			 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
+			 
+			 if(dajllist_.size() > 0) {
+				 dkcs = dajllist_.size();
+				 isxbdk = dajllist_.get(dajllist_.size()-1).getSort();
+			 }
+			 
 			 if(attdate.getAttgrouptype() != 3) {
 				 List<AttSchedule> attsch = attdate.getAttsch();
 				 if(EmptyUtil.isNotEmpty(attdate.getAttsch()) && attsch.get(0).getId() != 0) {//班次不为空
@@ -2344,6 +2352,7 @@ public class ClockInController {
 										 if(!now.equals(timme)) {//小于
 											 ash.setIsupdate(0);
 										 }else {
+											 
 											 ash.setIsupdate(1);
 										 }
 									 }
@@ -2360,8 +2369,11 @@ public class ClockInController {
 										 if(!now.equals(timme)) {//小于
 											 ash.setIsupdate(0);
 										 }else {
+											 if(isxbdk == 2) {
 												 ash.setIsupdate(1);
 											 }
+											 
+										 }
 									 }
 								 }
 								 r++;
@@ -2439,8 +2451,8 @@ public class ClockInController {
 						 }
 						 
 						 ////
-						 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
-						 dkcs = dajllist_.size();
+//						 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
+//						 dkcs = dajllist_.size();
 						 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 						 for(KqglAssoDkjl daj : dajllist_) {
 							 if(ash.getId() == daj.getBcid() && ash.getSort() == daj.getSort()) {//班次id和打卡顺序对应
@@ -2470,8 +2482,10 @@ public class ClockInController {
 						 }
 						 ash.setDajl(dkjl);
 					 }
+					 
+					 
 					 boolean lcdkgb = true;
-					 if(attdate.getAttsch().size() == 2 && dkcs == 2) {
+					 if(attdate.getAttsch().size() == 2 && dkcs == 2 && now.equals(str)) {
 						 lcdkgb = false;
 						 
 						 KqglAssoDkjl dk = KqglAssoDkjl.builder().build().selectOne(new QueryWrapper<KqglAssoDkjl>().lambda().eq(KqglAssoDkjl::getQyid, userBean.getOrgCode())
@@ -2515,7 +2529,7 @@ public class ClockInController {
 				 //自由工时
 				 List<AttSchedule> attsch = new ArrayList<AttSchedule>();
 				 
-				 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
+//				 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
 				 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 				 
 				 if(dajllist_.size() > 0) {