feat:更新邮件编辑配置

chenhang4442024
1 parent 30ec44cd
Showing 3 changed files with 32 additions and 25 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ReceiveEmailMappingServiceImpl.java
src/main/resources/templates/mail.ftl
@@ -27,6 +27,7 @@ import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.order.*;
+import com.order.erp.job.OrderOverTimeEventJob;
 import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.admin.AdminUserService;
@@ -53,6 +54,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import static com.order.erp.common.utils.DateUtils.DATE;
+
 /**
  * 订单基础信息表(OrderBaseInfo)表服务实现类
  *
@@ -364,7 +367,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
                                 orderInfoResultVO.getProductionDepartmentConsignTime() :
-                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("生产科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
                     }
@@ -374,7 +377,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
                                 orderInfoResultVO.getOrderHodTime() :
-                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
                     }
@@ -469,7 +472,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
                                 trackStageInfo.getPpTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("pp date", trackStageInfo.getPpTime());
                     }
@@ -483,7 +486,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
                                 trackStageInfo.getEsoSampleSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
                     }
@@ -493,7 +496,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
                                 trackStageInfo.getShippmentSampleSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
@@ -509,7 +512,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
                                 trackStageInfo.getSelfTestPassTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
                     }
@@ -519,7 +522,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
                                 trackStageInfo.getAitexTestSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
                     }
@@ -533,7 +536,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
                                 trackStageInfo.getSgsTestSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
                     }
@@ -547,7 +550,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
                                 trackStageInfo.getBarcodeStickerArrivalTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
                     }
@@ -557,7 +560,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
                                 trackStageInfo.getLatestArrivalTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
                     }
@@ -567,7 +570,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
                                 trackStageInfo.getLatestBkTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
@@ -582,7 +585,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
                                 inspectionStageInfo.getMidCheckApplyTime() :
-                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
                     }
@@ -600,7 +603,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
                                 inspectionStageInfo.getEndCheckApplyTime() :
-                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
                     }
@@ -1666,7 +1669,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
-                    //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况不计算到跟单记录中去。
+                    //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况要计算到跟单记录中去。
                     if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult())) &&
                             StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult()) ){
                         //用于在跟单记录中展示。
@@ -1807,9 +1810,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         .collect(Collectors.toList());
                 //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
                 if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
+                      String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
+                      String ProductionDepartmentConsignTime =orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10);
+                      String EndCheckApply = DateUtils.format(DateUtils.parseDate(EndCheckApplyTime, DATE), DATE);
+                      String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
+                      orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApply);
+                      orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
                     //尾期验货报告。
                     emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
                 }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
+                    String MidCheckApplyTime= inspectionStageInfo.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);
+                    orderEventJobVO.getInspectionStageInfo().setMidCheckApplyTime(MidCheckApply);
+                    orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
                     //中期验货报告。
                     emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
                 }
 package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
-import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
 import com.order.erp.domain.vo.order.ReceiveEmailMappingQueryVO;
 import com.order.erp.domain.vo.order.ReceiveEmailMappingVO;
@@ -100,10 +96,6 @@ public class ReceiveEmailMappingServiceImpl extends ServiceImpl&lt;ReceiveEmailMapp
         if (Objects.isNull(receiveEmailMappingVO.getId())) {
             return ServerResult.fail("id 不能为空");
         }
-        List<ReceiveEmailMappingDO> ReceiveEmailMappingDoList = baseMapper.byTypeValueReceiveEmailMappingDO(receiveEmailMappingVO.getTypeValue());
-        if(CollectionUtils.isNotEmpty(ReceiveEmailMappingDoList)){
-            return ServerResult.fail("已存在"+receiveEmailMappingVO.getTypeValue()+"客户");
-        }
         ReceiveEmailMappingDO receiveEmailMappingDo = BeanUtil.copyProperties(receiveEmailMappingVO, ReceiveEmailMappingDO.class);
         receiveEmailMappingDo.setConfigInfos(JSONObject.toJSONString(receiveEmailMappingVO.getConfigInfos()));
         updateById(receiveEmailMappingDo);
@@ -103,7 +103,7 @@
         <#if title=="中期验货报告" >
             <td>${data.baseInfo.projectNo! " "}</td>
             <td>${data.baseInfo.productionDepartment! " "}</td>
-            <td>${data.baseInfo.internalNo! " "}</td>
+            <td>${data.baseInfo.innerNo! " "}</td>
             <td>${data.baseInfo.customerPo! " "}</td>
             <td>${data.baseInfo.customerStyle! " "}</td>
             <td>${data.baseInfo.poColor! " "}</td>
@@ -118,7 +118,7 @@
         <#elseif title=="尾期验货报告">
             <td>${data.baseInfo.projectNo! " "}</td>
             <td>${data.baseInfo.productionDepartment! " "}</td>
-            <td>${data.baseInfo.internalNo! " "}</td>
+            <td>${data.baseInfo.innerNo! " "}</td>
             <td>${data.baseInfo.customerPo! " "}</td>
             <td>${data.baseInfo.customerStyle! " "}</td>
             <td>${data.baseInfo.poColor! " "}</td>