sucheng пре 3 месеци
родитељ
комит
da79ea9667

+ 25 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -4676,7 +4676,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             DateTime nowDate = DateUtil.date();
             String time1 = DateUtil.format(nowDate, "yyyy-MM-dd 00:00:00");
             String time2 = DateUtil.format(nowDate, "yyyy-MM-dd 04:00:00");
-            String time3 = DateUtil.format(nowDate, "yyyy-MM-dd 19:00:00");
+            String time3 = DateUtil.format(nowDate, "yyyy-MM-dd 18:30:00");
             String time4 = DateUtil.format(nowDate, "yyyy-MM-dd 23:59:59");
             String now = DateUtil.format(nowDate, "yyyy-MM-dd HH:mm:ss");
 
@@ -4687,6 +4687,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 needScheduleStartDate = DateUtil.format(DateUtil.offsetDay(nowDate, 1), "yyyy-MM-dd 12:00:00");
                 needScheduleEndDate = DateUtil.format(DateUtil.offsetDay(nowDate, 2), "yyyy-MM-dd 12:00:00");
             } else {
+                ApsScheduleLogDo apsScheduleLogDo = new ApsScheduleLogDo();
+                apsScheduleLogDo.setId(SecurityUtil.getUUID());
+                apsScheduleLogDo.setScheduleuserid(currentUser.getId());
+                apsScheduleLogDo.setScheduleusername(currentUser.getName());
+                apsScheduleLogDo.setStarttime(DateUtil.date());
+                apsScheduleLogDo.setTenantid(tenantId);
+                apsScheduleLogDo.setScheduletype("调度排程");
+                apsScheduleLogDo.setSchedulestarttime(DateUtil.parse(needScheduleStartDate));
+                apsScheduleLogDo.setScheduleendtime(DateUtil.parse(needScheduleEndDate));
+                apsScheduleLogDo.setSucess("否");
+                apsScheduleLogDo.setError("不在调度时间段中,不调度排程");
+                apsScheduleLogService.save(apsScheduleLogDo);
                 log.info("{}不在调度时间段中,不调度排程", tenantId);
                 return "notNeedWait";
             }
@@ -4698,6 +4710,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .eq(ApsScheduleLogDo::getSchedulestarttime, needScheduleStartDate)
                     .eq(ApsScheduleLogDo::getScheduleendtime, needScheduleEndDate));
             if (count > 0) {
+                ApsScheduleLogDo apsScheduleLogDo = new ApsScheduleLogDo();
+                apsScheduleLogDo.setId(SecurityUtil.getUUID());
+                apsScheduleLogDo.setScheduleuserid(currentUser.getId());
+                apsScheduleLogDo.setScheduleusername(currentUser.getName());
+                apsScheduleLogDo.setStarttime(DateUtil.date());
+                apsScheduleLogDo.setTenantid(tenantId);
+                apsScheduleLogDo.setScheduletype("调度排程");
+                apsScheduleLogDo.setSchedulestarttime(DateUtil.parse(needScheduleStartDate));
+                apsScheduleLogDo.setScheduleendtime(DateUtil.parse(needScheduleEndDate));
+                apsScheduleLogDo.setSucess("否");
+                apsScheduleLogDo.setError("已调度排程,无需调度排程,直接预排程");
+                apsScheduleLogService.save(apsScheduleLogDo);
                 log.info("{}已调度排程,无需调度排程,直接预排程", tenantId);
                 return "sucess";
             }