Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!405

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

@@ -2595,61 +2595,64 @@ public class ClockInController {
 						 List<AttSchedule> beforeattsch = beforeattdate.getAttsch();
 						 
 						 int p = 0;
-						 for(AttSchedule befo : beforeattsch) {
-							 boolean isdkjl = true;
-							 if(befo.getNextday() == 1) {
-								 cr++;
-								 AttSchedule attschbefo = AttSchedule.builder().build();
-								 BeanUtil.copyProperties(befo, attschbefo,"nextdaycard","dajl");
-								 attschbefo.setNextdaycard(1);
-								 attschbefo.setNextday(2);//昨日
-								 KqglAssoDkjl dkjlbefo = KqglAssoDkjl.builder().build();
-								 for(KqglAssoDkjl ka : dajllistbefo) {
-									 if(befo.getId() == ka.getBcid() && befo.getSort() == ka.getSort()) {//班次id和打卡顺序对应
-										 BeanUtil.copyProperties(ka, dkjlbefo,"attdate","remarks","userId","attime","dkmxid","commentary","punchequipment","punchmode");
-										 isdkjl = false;
+						 if(EmptyUtil.isNotEmpty(beforeattdate.getAttsch()) && beforeattsch.get(0).getId() != 0) {
+							 for(AttSchedule befo : beforeattsch) {
+								 boolean isdkjl = true;
+								 if(befo.getNextday() == 1) {
+									 cr++;
+									 AttSchedule attschbefo = AttSchedule.builder().build();
+									 BeanUtil.copyProperties(befo, attschbefo,"nextdaycard","dajl");
+									 attschbefo.setNextdaycard(1);
+									 attschbefo.setNextday(2);//昨日
+									 KqglAssoDkjl dkjlbefo = KqglAssoDkjl.builder().build();
+									 for(KqglAssoDkjl ka : dajllistbefo) {
+										 if(befo.getId() == ka.getBcid() && befo.getSort() == ka.getSort()) {//班次id和打卡顺序对应
+											 BeanUtil.copyProperties(ka, dkjlbefo,"attdate","remarks","userId","attime","dkmxid","commentary","punchequipment","punchmode");
+											 isdkjl = false;
+										 }
 									 }
-								 }
-								 
-								 if(dkjlbefo.getDktime() != null) {
-									 bc++;
-									 attschbefo.setIsdk(1);
-								 }else {
-									 attschbefo.setIsdk(0);
-								 }
-								 
-							 	 if(beforeattdate.getAttsch().size() == 2) {
 									 
-								 }else {
-									 boolean ectivedate = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(nowdate), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getStarttime()), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getEndtime()),"yyyy-MM-dd HH:mm");
-									 if(ectivedate) {
-										 if(isdkjl) {
-											 bsz = 1;
-											 attschbefo.setIsdk(0);
-										 }
-										 
-									 }else {
+									 if(dkjlbefo.getDktime() != null) {
 										 bc++;
 										 attschbefo.setIsdk(1);
+									 }else {
+										 attschbefo.setIsdk(0);
 									 }
+									 
+								 	 if(beforeattdate.getAttsch().size() == 2) {
+										 
+									 }else {
+										 boolean ectivedate = ClockInTool.hourMinuteBetween(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(nowdate), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getStarttime()), new SimpleDateFormat("yyyy-MM-dd HH:mm").format(befo.getEndtime()),"yyyy-MM-dd HH:mm");
+										 if(ectivedate) {
+											 if(isdkjl) {
+												 bsz = 1;
+												 attschbefo.setIsdk(0);
+											 }
+											 
+										 }else {
+											 bc++;
+											 attschbefo.setIsdk(1);
+										 }
+									 }
+									 
+								 	Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(befo.getTime())));
+								 	
+								 	if(attschbefo.getIsdk() == 1 && b.after(tt)) {
+								 		dkjlbefo.setStatus(17);//缺卡
+								 		dkjlbefo.setSort(befo.getSort());
+								 		dkjlbefo.setId(888);
+										 //更新打卡关闭
+								 		attschbefo.setIsupdate(0);
+									 }
+								 	 
+								 	 attschbefo.setDajl(dkjlbefo);
+								 	 
+									 attsch.add(p,attschbefo);
+									 p++;
 								 }
-								 
-							 	Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(befo.getTime())));
-							 	
-							 	if(attschbefo.getIsdk() == 1 && b.after(tt)) {
-							 		dkjlbefo.setStatus(17);//缺卡
-							 		dkjlbefo.setSort(befo.getSort());
-							 		dkjlbefo.setId(888);
-									 //更新打卡关闭
-							 		attschbefo.setIsupdate(0);
-								 }
-							 	 
-							 	 attschbefo.setDajl(dkjlbefo);
-							 	 
-								 attsch.add(p,attschbefo);
-								 p++;
 							 }
 						 }
+						 
 					 }
 					 /****************次日结束***************/