feat: 问题修复项

1、1225问题项修复

feat: 问题修复项
1、1225问题项修复
谢茂盛
1 parent 91b15549
Showing 1 changed file with 54 additions and 26 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -18,6 +18,7 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
 import com.order.erp.common.utils.FileUtil;
 import com.order.erp.common.utils.OrderFieldUtils;
 import com.order.erp.common.utils.ProfitUtils;
@@ -293,6 +294,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPoColor())) {
                     map.put("PO COLOR", orderInfoResultVO.getPoColor());
                 }
+                if (StringUtils.isNotBlank(baseFields.getPicUrl()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPicUrl())) {
+                    if (StringUtils.isNotBlank(orderInfoResultVO.getSmallPicUrl())) {
+                        URL url = new URL(orderInfoResultVO.getSmallPicUrl());
+                        InputStream inputStream = url.openStream();
+                        map.put("订单图片", FileUtil.imageParseBytes(inputStream));
+                    } else {
+                        map.put("订单图片", "");
+                    }
+                }
                 if (StringUtils.isNotBlank(baseFields.getCnColor()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCnColor())) {
                     map.put("颜色中文", orderInfoResultVO.getCnColor());
@@ -315,11 +326,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
-                    map.put("生成科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
+                    map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
+                            orderInfoResultVO.getProductionDepartmentConsignTime() :
+                            DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
-                    map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
+                    map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
+                            orderInfoResultVO.getOrderHodTime() :
+                            DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
@@ -329,16 +344,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPacketType())) {
                     map.put("包装类型", orderInfoResultVO.getPacketType());
                 }
-                if (StringUtils.isNotBlank(baseFields.getPicUrl()) &&
-                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPicUrl())) {
-                    if (StringUtils.isNotBlank(orderInfoResultVO.getSmallPicUrl())) {
-                        URL url = new URL(orderInfoResultVO.getSmallPicUrl());
-                        InputStream inputStream = url.openStream();
-                        map.put("订单图片", FileUtil.imageParseBytes(inputStream));
-                    } else {
-                        map.put("订单图片", "");
-                    }
-                }
             }
             OrderProfitAnalysisVO profitAnalysisVO = Objects.nonNull(orderInfoResultVO.getProfitAnalysisInfo()) ?
                     orderInfoResultVO.getProfitAnalysisInfo() : new OrderProfitAnalysisVO();
@@ -361,11 +366,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentPrice())) {
-                    map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
+                    map.put("生产科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
                 }
                 if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
-                    map.put("生成科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
+                    map.put("生产科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
                 }
                 if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) {
@@ -418,7 +423,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
                 if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
-                    map.put("pp date", trackStageInfo.getPpTime());
+                    map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
+                            trackStageInfo.getPpTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
@@ -426,11 +433,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
-                    map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
+                    map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
+                            trackStageInfo.getEsoSampleSendTime() :
+                                    DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
-                    map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
+                    map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
+                            trackStageInfo.getShippmentSampleSendTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
@@ -438,15 +449,22 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
-                    map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
+                    map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
+                            trackStageInfo.getSelfTestPassTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
-                    map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
+                    map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
+                            trackStageInfo.getAitexTestSendTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
-                    map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
+                    map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
+                            trackStageInfo.getSgsTestSendTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
@@ -454,15 +472,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
-                    map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
+                    map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
+                            trackStageInfo.getBarcodeStickerArrivalTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
-                    map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
+                    map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
+                            trackStageInfo.getLatestArrivalTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
-                    map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
+                    map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
+                            trackStageInfo.getLatestBkTime() :
+                            DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
             }
             OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
@@ -470,7 +494,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
                 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
-                    map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
+                    map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
+                            inspectionStageInfo.getMidCheckApplyTime() :
+                            DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
@@ -482,7 +508,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
-                    map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
+                    map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
+                            inspectionStageInfo.getEndCheckApplyTime() :
+                            DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
@@ -513,7 +541,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     map.put("包装：卡片、条码、箱贴，箱单", inspectionStageInfo.getBoxPacket());
                 }
                 if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult()) &&
-                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageInfo.getEndCheckResult())) {
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckResult())) {
                     map.put("尾期验货结果PASS / FAIL", inspectionStageInfo.getEndCheckResult());
                 }
             }