fix: 利润率计算公式修复/导出勾选项修复

谢茂盛
1 parent 3164be45
Showing 4 changed files with 114 additions and 57 deletions
src/main/java/com/order/erp/domain/OrderLockFieldEnum.java
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
@@ -16,6 +16,8 @@ public enum OrderLockFieldEnum {
     LOCKED("LOCKED", "锁定"),
     UN_LOCKED("UN_LOCKED", "解锁"),
+
+    SELECTED("selected", "勾选"),
     ;
     private String status;
@@ -28,7 +28,7 @@ public class OrderProfitAnalysisVo implements Serializable {
     /**
      * 默认 0 公式1，1 公式2
      */
-    private int profitType;
+    private String profitType;
     /**
      * 汇率
@@ -250,61 +250,80 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             OrderTrackStageFieldVO trackStageFields = lockFieldVO.getTrackStageFields();
             OrderInspectionStageFieldVO inspectionStageFields = lockFieldVO.getInspectionStageFields();
             if (Objects.nonNull(baseFields)) {
-                if (StringUtils.isNotBlank(baseFields.getCustomerCode())) {
+                if (StringUtils.isNotBlank(baseFields.getCustomerCode()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerCode())) {
                     map.put("客户编码", orderInfoResultVO.getCustomerCode());
                 }
-                if (StringUtils.isNotBlank(baseFields.getProjectNo())) {
-                    map.put("项目号", orderInfoResultVO.getCustomerCode());
+                if (StringUtils.isNotBlank(baseFields.getProjectNo()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProjectNo())) {
+                    map.put("项目号", orderInfoResultVO.getProjectNo());
                 }
-                if (StringUtils.isNotBlank(baseFields.getProductionDepartment())) {
+                if (StringUtils.isNotBlank(baseFields.getProductionDepartment()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartment())) {
                     map.put("生产科", orderInfoResultVO.getProductionDepartment());
                 }
-                if (StringUtils.isNotBlank(baseFields.getInnerNo())) {
+                if (StringUtils.isNotBlank(baseFields.getInnerNo()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getInnerNo())) {
                     map.put("内部编号", orderInfoResultVO.getInnerNo());
                 }
-                if (StringUtils.isNotBlank(baseFields.getCustomerPo())) {
+                if (StringUtils.isNotBlank(baseFields.getCustomerPo()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerPo())) {
                     map.put("客户po号", orderInfoResultVO.getCustomerPo());
                 }
-                if (StringUtils.isNotBlank(baseFields.getCustomerStyle())) {
+                if (StringUtils.isNotBlank(baseFields.getCustomerStyle()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCustomerStyle())) {
                     map.put("客户STYLE#", orderInfoResultVO.getCustomerStyle());
                 }
-                if (StringUtils.isNotBlank(baseFields.getModeleLo())) {
+                if (StringUtils.isNotBlank(baseFields.getModeleLo()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getModeleLo())) {
                     map.put("Modelo(REFERENCE)", orderInfoResultVO.getModeleLo());
                 }
-                if (StringUtils.isNotBlank(baseFields.getCollection())) {
+                if (StringUtils.isNotBlank(baseFields.getCollection()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCollection())) {
                     map.put("COLLECTION (style description)", orderInfoResultVO.getCollection());
                 }
-                if (StringUtils.isNotBlank(baseFields.getPoColor())) {
+                if (StringUtils.isNotBlank(baseFields.getPoColor()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPoColor())) {
                     map.put("PO COLOR", orderInfoResultVO.getPoColor());
                 }
-                if (StringUtils.isNotBlank(baseFields.getCnColor())) {
+                if (StringUtils.isNotBlank(baseFields.getCnColor()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getCnColor())) {
                     map.put("颜色中文", orderInfoResultVO.getCnColor());
                 }
-                if (StringUtils.isNotBlank(baseFields.getProductionComment())) {
+                if (StringUtils.isNotBlank(baseFields.getProductionComment()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionComment())) {
                     map.put("生产要求", orderInfoResultVO.getProductionComment());
                 }
-                if (StringUtils.isNotBlank(baseFields.getOrderCount())) {
+                if (StringUtils.isNotBlank(baseFields.getOrderCount()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderCount())) {
                     map.put("数量", orderInfoResultVO.getOrderCount());
                 }
-                if (StringUtils.isNotBlank(baseFields.getOrderComposition())) {
+                if (StringUtils.isNotBlank(baseFields.getOrderComposition()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderComposition())) {
                     map.put("订单成分", orderInfoResultVO.getOrderComposition());
                 }
-                if (StringUtils.isNotBlank(baseFields.getProductStyle())) {
+                if (StringUtils.isNotBlank(baseFields.getProductStyle()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductStyle())) {
                     map.put("款式类型", orderInfoResultVO.getProductStyle());
                 }
-                if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime())) {
+                if (StringUtils.isNotBlank(baseFields.getProductionDepartmentConsignTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionDepartmentConsignTime())) {
                     map.put("生成科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
                 }
-                if (StringUtils.isNotBlank(baseFields.getOrderHodTime())) {
+                if (StringUtils.isNotBlank(baseFields.getOrderHodTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderHodTime())) {
                     map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
                 }
-                if (StringUtils.isNotBlank(baseFields.getOutboundType())) {
+                if (StringUtils.isNotBlank(baseFields.getOutboundType()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOutboundType())) {
                     map.put("出库类型", orderInfoResultVO.getOutboundType());
                 }
-                if (StringUtils.isNotBlank(baseFields.getPacketType())) {
+                if (StringUtils.isNotBlank(baseFields.getPacketType()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getPacketType())) {
                     map.put("包装类型", orderInfoResultVO.getPacketType());
                 }
-                if (StringUtils.isNotBlank(baseFields.getPicUrl())) {
+                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();
@@ -317,121 +336,156 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             OrderProfitAnalysisVO profitAnalysisVO = Objects.nonNull(orderInfoResultVO.getProfitAnalysisInfo()) ?
                     orderInfoResultVO.getProfitAnalysisInfo() : new OrderProfitAnalysisVO();
             if (Objects.nonNull(profitAnalysisFields)) {
-                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerPrice())) {
                     map.put("客户单价$", profitAnalysisVO.getCustomerPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerTotalPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getCustomerTotalPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getCustomerTotalPrice())) {
                     map.put("客户总价$", profitAnalysisVO.getCustomerTotalPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentPrice())) {
                     map.put("生成科单价￥", profitAnalysisVO.getProductionDepartmentPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProductionDepartmentTotalPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProductionDepartmentTotalPrice())) {
                     map.put("生成科总价￥", profitAnalysisVO.getProductionDepartmentTotalPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketPrice())) {
                     map.put("包装费用￥", profitAnalysisVO.getPacketPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getPacketTotalPrice()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getPacketTotalPrice())) {
                     map.put("包装费用合计￥", profitAnalysisVO.getPacketTotalPrice());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getExchangeRate()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getExchangeRate())) {
                     map.put("汇率", profitAnalysisVO.getExchangeRate());
                 }
-                if (StringUtils.isNotBlank(profitAnalysisFields.getProfitRate())) {
+                if (StringUtils.isNotBlank(profitAnalysisFields.getProfitRate()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(profitAnalysisFields.getProfitRate())) {
                     map.put("利润率", profitAnalysisVO.getProfitRate());
                 }
             }
             OrderCompletionReportVO reportInfo = Objects.nonNull(orderInfoResultVO.getReportInfo()) ?
                     orderInfoResultVO.getReportInfo() : new OrderCompletionReportVO();
             if (Objects.nonNull(reportFields) && Objects.nonNull(reportInfo)) {
-                if (StringUtils.isNotBlank(reportFields.getIdeaSource())) {
+                if (StringUtils.isNotBlank(reportFields.getIdeaSource()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getIdeaSource())) {
                     map.put("想法来源", reportInfo.getIdeaSource());
                 }
-                if (StringUtils.isNotBlank(reportFields.getManualPreform())) {
+                if (StringUtils.isNotBlank(reportFields.getManualPreform()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getManualPreform())) {
                     map.put("手工初型", reportInfo.getManualPreform());
                 }
-                if (StringUtils.isNotBlank(reportFields.getIdeaManualRate())) {
+                if (StringUtils.isNotBlank(reportFields.getIdeaManualRate()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(reportFields.getIdeaManualRate())) {
                     map.put("想法和手工比例分配", reportInfo.getIdeaManualRate());
                 }
             }
             OrderTrackStageVO trackStageInfo = Objects.nonNull(orderInfoResultVO.getTrackStageInfo()) ?
                     orderInfoResultVO.getTrackStageInfo() : new OrderTrackStageVO();
             if (Objects.nonNull(trackStageFields) && Objects.nonNull(trackStageInfo)) {
-                if (StringUtils.isNotBlank(trackStageFields.getPpTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getPpTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpTime())) {
                     map.put("pp date", trackStageInfo.getPpTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult())) {
+                if (StringUtils.isNotBlank(trackStageFields.getPpConfirmResult()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getPpConfirmResult())) {
                     map.put("pp样品确认意见", trackStageInfo.getPpConfirmResult());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getEsoSampleSendTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getEsoSampleSendTime())) {
                     map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleSendTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleSendTime())) {
                     map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult())) {
+                if (StringUtils.isNotBlank(trackStageFields.getShippmentSampleConfirmResult()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getShippmentSampleConfirmResult())) {
                     map.put("shipment sample确认意见", trackStageInfo.getShippmentSampleConfirmResult());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getSelfTestPassTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSelfTestPassTime())) {
                     map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getAitexTestSendTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getAitexTestSendTime())) {
                     map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getSgsTestSendTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestSendTime())) {
                     map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult())) {
+                if (StringUtils.isNotBlank(trackStageFields.getSgsTestFinishResult()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getSgsTestFinishResult())) {
                     map.put("SGS测试结果", trackStageInfo.getSgsTestFinishResult());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getBarcodeStickerArrivalTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getBarcodeStickerArrivalTime())) {
                     map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getLatestArrivalTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestArrivalTime())) {
                     map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
                 }
-                if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime())) {
+                if (StringUtils.isNotBlank(trackStageFields.getLatestBkTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(trackStageFields.getLatestBkTime())) {
                     map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
                 }
             }
             OrderInspectionStageVO inspectionStageInfo = Objects.nonNull(orderInfoResultVO.getInspectionStageInfo()) ?
                     orderInfoResultVO.getInspectionStageInfo() : new OrderInspectionStageVO();
             if (Objects.nonNull(inspectionStageFields) && Objects.nonNull(inspectionStageInfo)) {
-                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckApplyTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckApplyTime())) {
                     map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckComment()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckComment())) {
                     map.put("中期验货（功能性-拉力/跌落等、外观性-颜色/规格等、耐久性-烤厅等）", inspectionStageInfo.getMidCheckComment());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckResult())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getMidCheckResult()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getMidCheckResult())) {
                     map.put("中期验货结果PASS / FAIL", inspectionStageInfo.getMidCheckResult());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckApplyTime()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getEndCheckApplyTime())) {
                     map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getSpecification())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getSpecification()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getSpecification())) {
                     map.put("长度/规格", inspectionStageInfo.getSpecification());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getFunctionality())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getFunctionality()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getFunctionality())) {
                     map.put("功能性不良", inspectionStageInfo.getFunctionality());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getElectroplate())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getElectroplate()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getElectroplate())) {
                     map.put("电镀不良", inspectionStageInfo.getElectroplate());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getValue1())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue1()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue1())) {
                     map.put("不良1", inspectionStageInfo.getValue1());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getValue2())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue2()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue2())) {
                     map.put("不良2", inspectionStageInfo.getValue2());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getValue3())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getValue3()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getValue3())) {
                     map.put("不良3", inspectionStageInfo.getValue3());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getBoxPacket())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getBoxPacket()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageFields.getBoxPacket())) {
                     map.put("包装：卡片、条码、箱贴，箱单", inspectionStageInfo.getBoxPacket());
                 }
-                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult())) {
+                if (StringUtils.isNotBlank(inspectionStageFields.getEndCheckResult()) &&
+                        OrderLockFieldEnum.SELECTED.getStatus().equals(inspectionStageInfo.getEndCheckResult())) {
                     map.put("尾期验货结果PASS / FAIL", inspectionStageInfo.getEndCheckResult());
                 }
             }
@@ -10,6 +10,7 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ProfitUtils;
+import com.order.erp.common.utils.StringUtils;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
@@ -178,7 +179,7 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
         profitAnalysisVO.setCustomerTotalPrice(customerTotalPrice.doubleValue());
         profitAnalysisVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue());
         profitAnalysisVO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
-                .profitType(profitAnalysisVo.getProfitType())
+                .profitType(StringUtils.isBlank(profitAnalysisVo.getProfitType()) ? Constant.ZERO : Integer.parseInt(profitAnalysisVO.getProfitType()))
                 .exchangeRate(profitAnalysisVo.getExchangeRate())
                 .productionDepartmentTotalPrice(productionDepartmentTotalPrice.doubleValue())
                 .packetTotalPrice(packetTotalPrice.doubleValue())