Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!322

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

@@ -2150,7 +2150,7 @@ public class ClockInController {
 //		     attdate.setAttpr(dajllist);
 			 if(attdate.getAttgrouptype() != 3) {
 				 List<AttSchedule> attsch = attdate.getAttsch();
-				 if(EmptyUtil.isNotEmpty(attdate.getAttsch())) {//班次不为空
+				 if(EmptyUtil.isNotEmpty(attdate.getAttsch()) && attsch.get(0).getId() != 0) {//班次不为空
 					 int bccs = attdate.getAttsch().size();
 					 int r = 1,bc = 0;
 					 int bsz = 0;
@@ -2236,9 +2236,21 @@ public class ClockInController {
 						 if(dk != null && attdate.getAttsch().size() != dk.getSort()) {
 							 AttSchedule att = attsch.get(dk.getSort());
 							 att.setIsdk(0);
+							 
+							 AttSchedule attw = attsch.get(dk.getSort()-1);
+							 attw.setIsupdate(1);
+						 }else {
+							 AttSchedule attc = attsch.get(0);
+							 attc.setIsdk(0);
 						 }
 					 }
+				 }else {
+					 //休息的时候
+					 List<AttSchedule> attsch_ = new ArrayList<AttSchedule>();
+					 attdate.setAttsch(attsch_);
 				 }
+				 
+				 
 			 }else {
 				 //自由工时
 				 List<AttSchedule> attsch = new ArrayList<AttSchedule>();
@@ -2246,18 +2258,9 @@ public class ClockInController {
 				 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
 				 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 				 
-				 if(dajllist_.size() == 0) {
-					 KqglAssoDkjl dkjj = KqglAssoDkjl.builder().build();
-					 AttSchedule ast = AttSchedule.builder().build();
-					 ast.setId(0);
-					 ast.setIsdk(0);
-					 ast.setDajl(dkjj);
-					 attsch.add(ast);
-					 attdate.setAttsch(attsch);
-				 }else {
+				 if(dajllist_.size() > 0) {
 					 for(KqglAssoDkjl ddk : dajllist_) {
 						 BeanUtil.copyProperties(ddk, dkjl,"attdate","bcid","remarks","userId","attime","dkmxid","commentary","punchequipment","punchmode");
-						 
 					 }
 					 AttSchedule ast = AttSchedule.builder().build();
 					 ast.setId(0);
@@ -2267,6 +2270,13 @@ public class ClockInController {
 					 attdate.setAttsch(attsch);
 				 }
 				 
+				 KqglAssoDkjl dkjj = KqglAssoDkjl.builder().build();
+				 AttSchedule ast = AttSchedule.builder().build();
+				 ast.setId(0);
+				 ast.setIsdk(0);
+				 ast.setDajl(dkjj);
+				 attsch.add(ast);
+				 attdate.setAttsch(attsch);
 				 
 			 }
 			 
@@ -2335,6 +2345,7 @@ public class ClockInController {
 		     
 		     if(attdate.getAttgrouptype() != 3) {
 		    	 List<AttSchedule> ash = attdate.getAttsch();
+		    	 if(EmptyUtil.isNotEmpty(attdate.getAttsch()) && ash.get(0).getId() != 0) {
 		    		 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.get(0).getId()));
 					 
 				     if(shif != null) {
@@ -2410,6 +2421,8 @@ public class ClockInController {
 				     }
 		    	 }
 			     
+		     }
+		     
 			return ResultUtil.data(attdate);
 		 }else {
 			 

src/main/java/cn/timer/api/dto/kqmk/AttSchedule.java

@@ -26,6 +26,7 @@ public class AttSchedule implements Serializable{
 	private Long starttime;
 	private Long endtime;
 	
+	private int isupdate;//是否跟新打卡
 	private int isdk;//0:当前打卡  1：已过打卡
 	private KqglAssoDkjl dajl;
 }