Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!318

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

@@ -1321,7 +1321,10 @@ public class ClockInController {
 //			 pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 //			 pbfs;// 排班方式 1：固定排班；2：自由排班；3：自由工时
 			 
 			 
 		     long time_ = DateUtil.getStringTime(clock.getPunchtime(), "yyyy-MM-dd HH:mm:ss");//打卡时间戳
 		     long time_ = DateUtil.getStringTime(clock.getPunchtime(), "yyyy-MM-dd HH:mm:ss");//打卡时间戳
-		     String putime = new SimpleDateFormat("yyyy-MM-dd").format(Double.valueOf(clock.getPunchtime()));//转换打卡时间格式
+		     
+				
+			String putime = sStdIoTime.substring(0, 10);////转换打卡时间格式 yyyy-MM-dd
+//		     String putime = new SimpleDateFormat("yyyy-MM-dd").format(Double.valueOf(clock.getPunchtime()));//转换打卡时间格式
 		     
 		     
 			 Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();//打卡当天开始时间
 			 Long startDate = DateUtil.getStartTime(0,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();//打卡当天开始时间
 		     Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();//打卡当天结束时间
 		     Long endDate = DateUtil.getnowEndTime(23,DateUtil.getStringTime(putime,"yyyy-MM-dd")).getTime();//打卡当天结束时间
@@ -2195,7 +2198,12 @@ public class ClockInController {
 						 ash.setIsdk(1);
 						 ash.setIsdk(1);
 					 }
 					 }
 				 }
 				 }
+				 //自由工时
+				 if(attdate.getAttgrouptype() == 3) {
+					 
 					 
 					 
+					 
+				 }else {
 					 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
 					 List<KqglAssoDkjl> dajllist_ = kqglassodkjlmapper.getDetailedRecordClock(startDate,endDate,userBean.getEmpNum());
 					 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 					 KqglAssoDkjl dkjl = KqglAssoDkjl.builder().build();
 					 for(KqglAssoDkjl daj : dajllist_) {
 					 for(KqglAssoDkjl daj : dajllist_) {
@@ -2206,6 +2214,7 @@ public class ClockInController {
 					 }
 					 }
 					 ash.setDajl(dkjl);
 					 ash.setDajl(dkjl);
 				 }
 				 }
+			 }
 			 
 			 
 			 
 			 
 			   //外勤   true:开   false:关
 			   //外勤   true:开   false:关