canrd-outside / order-erp · Commits

Commit b416f3e5bf78a12df6beb2d493894b4efb4e998c

Authored by chenhang4442024
1 parent 3efd19ba
build: skipped

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

Inline Side-by-side
Showing 1 changed file with 4 additions and 3 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @b416f3e
... ... @@ -138,7 +138,7 @@ public class OrderOverTimeEventJob {
138 138 emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
139 139 productionEmail, orderEventJob);
140 140 redisUtils.set(EmailTemplateEnum.byTemplate(
141   - eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
  141 + eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),
142 142 orderEventJob, 90, TimeUnit.DAYS);
143 143 }
144 144 }
... ... @@ -322,10 +322,11 @@ public class OrderOverTimeEventJob {
322 322 String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
323 323 if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime)){
324 324 aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
325   - } else if(StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)){
  325 + }
  326 + if(StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)){
326 327 sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
327 328 }
328   - if (aitextestDaysBetween == Constant.THREE || sgstestDaysBetween == Constant.THREE || aitextestDaysBetween == Constant.NEGATIVE_ONE || sgstestDaysBetween == Constant.NEGATIVE_ONE) {
  329 + if (Constant.THREE == aitextestDaysBetween || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween || Constant.NEGATIVE_ONE == sgstestDaysBetween ) {
329 330 return true;
330 331 }
331 332 return false;
... ...