feat:1.把时间由yyyy-mm-dd hh：mm：ss改为yyyy-mm-dd

2.把邮件标头背景色改为白色,手机端黑色不显示

feat:1.把时间由yyyy-mm-dd hh：mm：ss改为yyyy-mm-dd
2.把邮件标头背景色改为白色,手机端黑色不显示
chenhang4442024
1 parent c1005400
Showing 2 changed files with 55 additions and 28 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/resources/templates/mail.ftl
@@ -28,6 +28,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import static com.order.erp.common.utils.DateUtils.DATE;
+import static com.order.erp.common.utils.DateUtils.DATE_TIME;
+
 /**
  * @author: xms
@@ -62,7 +65,7 @@ public class OrderOverTimeEventJob {
     /**
      * 凌晨1点执行，一天一次
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 * * * * *")
     //存储的日期都必须为yyyy-MM-dd HH:mm:ss。
     public void checkOverTimeExecuteV2() {
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList();
@@ -87,7 +90,6 @@ public class OrderOverTimeEventJob {
      */
     //发送邮件。
     private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) {
-
         HashSet<String> customerCodeList = new HashSet<>();
         for (OrderEventJobVO orderEventJob : eventJobVOS) {
             if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
@@ -117,21 +119,28 @@ public class OrderOverTimeEventJob {
                 }).filter(Objects::nonNull)
                 .collect(Collectors.toList());
         //如果为尾期验货事件的话,需要从订单中的生产科角色中得到邮箱。而不是从邮件配置中得到邮箱。
-        if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum)) {
+        if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum) ) {
             for (OrderEventJobVO orderEventJob : eventJobVOS) {
-                String productionDepartment = orderEventJob.getBaseInfo().getProductionDepartment();
-                //根据订单的生产科得到生产科用户信息。
-                AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
-                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                        .eq(AdminUserDO::getUserName, productionDepartment));
-                List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
-                        .stream().map(String::trim)
-                        .collect(Collectors.toList());
-                emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
-                        productionEmail, orderEventJob);
-                redisUtils.set(EmailTemplateEnum.byTemplate(
-                                eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
-                        orderEventJob, 90, TimeUnit.DAYS);
+                if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
+                        eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId())) {
+                    //转化一下日期格式,为yyyy-MM-dd。
+                    OrderBaseInfoVO orderBaseInfoFormat = getDateFormat(orderEventJob.getBaseInfo().getProductionDepartmentConsignTime(), orderEventJob.getBaseInfo().getOrderHodTime());
+                    orderEventJob.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoFormat.getProductionDepartmentConsignTime());
+                    orderEventJob.getBaseInfo().setOrderHodTime(orderBaseInfoFormat.getOrderHodTime());
+                    String productionDepartment = orderEventJob.getBaseInfo().getProductionDepartment();
+                    //根据订单的生产科得到生产科用户信息。
+                    AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                            .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                            .eq(AdminUserDO::getUserName, productionDepartment));
+                    List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
+                            .stream().map(String::trim)
+                            .collect(Collectors.toList());
+                    emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
+                            productionEmail, orderEventJob);
+                    redisUtils.set(EmailTemplateEnum.byTemplate(
+                                    eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
+                            orderEventJob, 90, TimeUnit.DAYS);
+                }
             }
         } else {
             Set<Map<String, List<String>>> set = receiveEmailMappingDOS.stream().map(x -> {
@@ -154,6 +163,10 @@ public class OrderOverTimeEventJob {
             for (OrderEventJobVO orderEventJob : eventJobVOS) {
                 for (Map<String, List<String>> map : set) {
                     if (orderEventJob.getBaseInfo().getCustomerCode().equals(map.keySet().iterator().next())) {
+                        //转化一下日期格式,为yyyy-MM-dd。
+                        OrderBaseInfoVO orderBaseInfoFormat = getDateFormat(orderEventJob.getBaseInfo().getProductionDepartmentConsignTime(), orderEventJob.getBaseInfo().getOrderHodTime());
+                        orderEventJob.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoFormat.getProductionDepartmentConsignTime());
+                        orderEventJob.getBaseInfo().setOrderHodTime(orderBaseInfoFormat.getOrderHodTime());
                         emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
                                 map.get(map.keySet().iterator().next()), orderEventJob);
                         redisUtils.set(EmailTemplateEnum.byTemplate(
@@ -277,7 +290,7 @@ public class OrderOverTimeEventJob {
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(esoSampleSendTime)) {
             LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
             LocalDate esoSampleSendTimelocalDate = DateUtils.parseDate(esoSampleSendTime);
-            if (ChronoUnit.DAYS.between(esoSampleSendTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) {
+            if (ChronoUnit.DAYS.between(esoSampleSendTimelocalDate, orderHodTimelocalDate) == Constant.FOURTEEN) {
                 return true;
             }
@@ -300,19 +313,21 @@ public class OrderOverTimeEventJob {
     private Boolean filterAITEXSGSTestEvent(OrderEventJobVO eventJobVO) {
+        int aitextestDaysBetween=0;
+        int sgstestDaysBetween=0;
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String aitexTestFinishResult = eventJobVO.getTrackStageInfo().getAitexTestFinishResult();
         String sgsTestFinishResult = eventJobVO.getTrackStageInfo().getSgsTestFinishResult();
         String sgsTestFinishTime = eventJobVO.getTrackStageInfo().getSgsTestFinishTime();
         String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime) ||
-                StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)) {
-            int aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
-            int sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
-            if (aitextestDaysBetween == Constant.THREE || sgstestDaysBetween == Constant.LOCK_ERROR_TIMES || aitextestDaysBetween == Constant.NEGATIVE_ONE || sgstestDaysBetween == Constant.NEGATIVE_ONE) {
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime)){
+             aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
+        } else if(StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)){
+             sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
+        }
+            if (aitextestDaysBetween == Constant.THREE || sgstestDaysBetween == Constant.THREE || aitextestDaysBetween == Constant.NEGATIVE_ONE || sgstestDaysBetween == Constant.NEGATIVE_ONE) {
                 return true;
             }
-        }
         return false;
     }
@@ -369,4 +384,15 @@ public class OrderOverTimeEventJob {
         }
         return Constant.ZERO;
     }
+
+    public OrderBaseInfoVO  getDateFormat(String productionDepartmentConsignTime,String orderHodTime){
+        String substring = productionDepartmentConsignTime.substring(0, 10);
+        String substring1 = orderHodTime.substring(0, 10);
+        String productionDepartmentConsignTimeFormat = DateUtils.format(DateUtils.parseDate(substring, DATE), DateUtils.DATE);
+        String orderHodTimeFormat = DateUtils.format(DateUtils.parseDate(substring1,DATE), DateUtils.DATE);
+        OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
+        orderBaseInfoVO.setProductionDepartmentConsignTime(productionDepartmentConsignTimeFormat);
+        orderBaseInfoVO.setOrderHodTime(orderHodTimeFormat);
+        return orderBaseInfoVO;
+    }
 }
@@ -4,13 +4,14 @@
     <meta charset="UTF-8">
     <title>通用邮件模板</title>
     <style>
-        #title1 {
-            background: black;
-        }
+        /*#title1 {*/
+        /*    background: black;*/
+        /*}*/
         #title1 > td {
-            color: aliceblue;
-            border-right: 1px solid white;
+            /*color: aliceblue;*/
+            /*border-right: 1px solid white;*/
+         border-right: 1px solid black;
         }
         #title2 td {