canrd-outside / order-erp · Commits

Commit 326fd5286cd67c06fa1db7d9e8d615cc50b53015

Authored by 谢茂盛
1 parent ec4074f5
build: skipped

feat: 问题修复项 

1、1225问题项修复
Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @326fd52
@@ -458,7 +458,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -458,7 +458,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
458 map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ? 458 map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
459 trackStageInfo.getAitexTestSendTime() : 459 trackStageInfo.getAitexTestSendTime() :
460 DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE)); 460 DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
461 - 461 + }
  462 + if (StringUtils.isNotBlank(trackStageFields.getAitexTestFinishResult()) &&
  463 + OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestFinishResult())) {
  464 + map.put("Aitex测试结果", StringUtils.isBlank(trackStageInfo.getAitexTestFinishResult()) ?
  465 + trackStageInfo.getAitexTestFinishResult() :
  466 + DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
462 } 467 }
463 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) && 468 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
464 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) { 469 OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {