canrd-outside / order-erp · Commits

Commit d2ff4271ab1d2ca55fe9a23f252683bdb773ddae

Authored by chwork
2 parents c73377ab 74490ef0
build: skipped

Merge branch 'fix-main-ch' into 'main' 

定时任务改为每天凌晨五点执行



See merge request !11
Inline Side-by-side
Showing 2 changed files with 9 additions and 6 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @d2ff427
@@ -63,9 +63,10 @@ public class OrderOverTimeEventJob { @@ -63,9 +63,10 @@ public class OrderOverTimeEventJob {
63 private AdminUserService adminUserService; 63 private AdminUserService adminUserService;
64 64
65 /** 65 /**
66 - * 凌晨1点执行，一天一次 66 + * 凌晨5点执行，一天一次
67 */ 67 */
68 - @Scheduled(cron = "0 * * * * *") 68 +
  69 + @Scheduled(cron = "0 0 5 * * ?")
69 //存储的日期都必须为yyyy-MM-dd HH:mm:ss。 70 //存储的日期都必须为yyyy-MM-dd HH:mm:ss。
70 public void checkOverTimeExecuteV2() { 71 public void checkOverTimeExecuteV2() {
71 List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList(); 72 List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList();
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @d2ff427
@@ -2058,10 +2058,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -2058,10 +2058,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
2058 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>() 2058 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
2059 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 2059 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
2060 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment())); 2060 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
2061 - OrderEventJobVO orderEventJobVO = new OrderEventJobVO();  
2062 - orderEventJobVO.setInspectionStageInfo(updateVO.getInspectionStageInfo());  
2063 - OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);  
2064 - orderEventJobVO.setBaseInfo(orderBaseInfoVo); 2061 + if(Objects.nonNull(ProductionDepartmentUserDO)){
  2062 + OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
  2063 + orderEventJobVO.setInspectionStageInfo(updateVO.getInspectionStageInfo());
  2064 + OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
  2065 + orderEventJobVO.setBaseInfo(orderBaseInfoVo);
2065 List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+")) 2066 List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
2066 .stream().map(String::trim) 2067 .stream().map(String::trim)
2067 .collect(Collectors.toList()); 2068 .collect(Collectors.toList());
@@ -2083,5 +2084,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O @@ -2083,5 +2084,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
2083 //中期验货报告。 2084 //中期验货报告。
2084 emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO); 2085 emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
2085 } 2086 }
  2087 + }
2086 } 2088 }
2087 } 2089 }