Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!382

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

@@ -2326,6 +2326,8 @@ public class ClockInController {
 		 
 		 String now = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 		 
+		 String nowtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+		 
 		 KqglMainKqz attgro = kqglmainkqzmapper.getAttendanceGroupInformationByUserid(userBean.getEmpNum(),userBean.getOrgCode()); //考勤组信息
 		 
 		 if(attgro != null) {
@@ -2486,14 +2488,16 @@ public class ClockInController {
 						 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.getId()));
 						 if(shif.getIsXbdk() == 1 && (ash.getSort())%2 == 0) { 
 							 
-							 if(dkjl.getDktime() == null) {
+							 Timestamp tt = Timestamp.valueOf(ClockInTool.stampToDate(String.valueOf(ash.getTime())));
+							 
+							 if(dkjl.getDktime() == null && b.after(tt)) {
 								 KqglAssoDkjl dkjl_ = KqglAssoDkjl.builder().build();
 								 dkjl_.setDktime(ash.getTime());
 								 dkjl_.setStatus(1);
 								 dkjl_.setSort(ash.getSort());
 								 dkjl_.setId(999);
 								 BeanUtil.copyProperties(dkjl_, dkjl);
-							 }else {
+							 }else if(dkjl.getDktime() != null){
 								 dkjl.setStatus(1);
 							 }
 						 }

src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java

@@ -119,7 +119,7 @@ public class SpmkServiceImpl implements SpmkService{
 					.selectOne(new QueryWrapper<SpmkApproveExecuteRecord>().lambda().select(SpmkApproveExecuteRecord::getId).eq(SpmkApproveExecuteRecord::getApproveSummaryId , sum.getId())
 							.eq(SpmkApproveExecuteRecord::getSts, 1));
 			if(exere != null) {
-				exe = SpmkExecutor.builder().build().selectOne(new QueryWrapper<SpmkExecutor>().lambda().eq(SpmkExecutor::getApproveExecuteRecordId, exere.getId()));
+				exe = SpmkExecutor.builder().build().selectOne(new QueryWrapper<SpmkExecutor>().lambda().eq(SpmkExecutor::getApproveExecuteRecordId, exere.getId()).orderByDesc(SpmkExecutor::getId));
 			}
 			
 			if(exe != null) {