不在根据中期申请时间和尾期申请时间判断是否发送邮件,根据中期结果和尾期结果判断。

chenhang4442024
1 parent 36c3c0bb
Showing 1 changed file with 14 additions and 8 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -1705,7 +1705,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                     .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
             OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
+            String midCheckResult=inspectionStageInfo.getMidCheckResult();
+            String endCheckResult=inspectionStageInfo.getEndCheckResult();
             if (Objects.nonNull(inspectionStageDO)) {
+               midCheckResult=inspectionStageDO.getMidCheckResult();
+               endCheckResult=inspectionStageDO.getEndCheckResult();
                 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {
                     inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime());
                 }
@@ -1750,7 +1754,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
                 if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                sendOrderInspectionStage(updateVO,inspectionStageInfo);
+                sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
                 }
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
@@ -1763,7 +1767,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
                 if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                    sendOrderInspectionStage(updateVO,inspectionStageInfo);
+                    midCheckResult="1";
+                    endCheckResult="1";
+                    sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
                 }
             }
@@ -2047,28 +2053,28 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return orderBaseInfoDOList;
     }
-    private void sendOrderInspectionStage(OrderUpdateVO updateVO, OrderInspectionStageVO inspectionStageInfo){
+    private void sendOrderInspectionStage(OrderUpdateVO updateVO,String midCheckResult,String endCheckResult){
         OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
         AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
         OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
-        orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
+        orderEventJobVO.setInspectionStageInfo(updateVO.getInspectionStageInfo());
         OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
         orderEventJobVO.setBaseInfo(orderBaseInfoVo);
             List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
                     .stream().map(String::trim)
                     .collect(Collectors.toList());
             //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
-            if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
-                String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
+            if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getEndCheckResult()) &&  !(updateVO.getInspectionStageInfo().getEndCheckResult().equals(endCheckResult))) {
+                String EndCheckApplyTime= updateVO.getInspectionStageInfo().getEndCheckApplyTime().substring(0, 10);
                 String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
                 orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApplyTime);
                 orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
                 //尾期验货报告。
                 emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
-            }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
-                String MidCheckApplyTime= inspectionStageInfo.getMidCheckApplyTime().substring(0, 10);
+            }else if(StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getMidCheckResult())  &&  !(updateVO.getInspectionStageInfo().getMidCheckResult().equals(midCheckResult))){
+                String MidCheckApplyTime= updateVO.getInspectionStageInfo().getMidCheckApplyTime().substring(0, 10);
                 String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
                 String MidCheckApply = DateUtils.format(DateUtils.parseDate(MidCheckApplyTime, DATE), DATE);
                 String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);