feat:修复AITEX/SGS一个满足,另一个不执行的情况。

chenhang4442024
1 parent 3efd19ba
Showing 1 changed file with 4 additions and 3 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
@@ -138,7 +138,7 @@ public class OrderOverTimeEventJob {
                     emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
                             productionEmail, orderEventJob);
                     redisUtils.set(EmailTemplateEnum.byTemplate(
-                                    eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
+                                    eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),
                             orderEventJob, 90, TimeUnit.DAYS);
                 }
             }
@@ -322,10 +322,11 @@ public class OrderOverTimeEventJob {
         String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
         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)){
+        }
+        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) {
+            if (Constant.THREE == aitextestDaysBetween  || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween   || Constant.NEGATIVE_ONE == sgstestDaysBetween  ) {
                 return true;
             }
         return false;