feat: 问题修复项

1、利润分析表提交的审核内容，管理员通过审核OK，系统放开后可以编辑，但是不能保存更改

feat: 问题修复项
1、利润分析表提交的审核内容，管理员通过审核OK，系统放开后可以编辑，但是不能保存更改
谢茂盛
1 parent 9d73d4da
Showing 2 changed files with 10 additions and 3 deletions
src/main/java/com/order/erp/domain/vo/order/OrderInfoResultVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -47,7 +47,7 @@ public class OrderInfoResultVO extends OrderBaseInfoVO implements Serializable {
     /**
      * 修改未审核信息
      */
-    private OrderLockFieldVO orderUpdateInfoVO;
+    private OrderUpdateInfoVO orderUpdateInfoVO;
     /**
      * 进度条
@@ -1023,10 +1023,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             Map<Long, OrderFieldLockApplyDO> applyDOMap = fieldLockApplyDOList.stream().collect(Collectors.toMap(OrderFieldLockApplyDO::getOrderId, Function.identity()));
             orderInfoResultVOList.forEach(x -> {
                 OrderFieldLockApplyDO applyDO = applyDOMap.get(x.getId());
-                if (!ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(applyDO.getType())) {
+                if (Objects.nonNull(applyDO) && ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(applyDO.getType())) {
                     String fields = applyDO.getFields();
                     if (StringUtils.isNotBlank(fields)) {
-                        OrderLockFieldVO fieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
+                        OrderUpdateInfoVO fieldVO = OrderUpdateInfoVO.builder().reportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class)).build();
+                        x.setOrderUpdateInfoVO(fieldVO);
+                    }
+                }
+                if (Objects.nonNull(applyDO) && ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(applyDO.getType())) {
+                    String fields = applyDO.getFields();
+                    if (StringUtils.isNotBlank(fields)) {
+                        OrderUpdateInfoVO fieldVO = OrderUpdateInfoVO.builder().profitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class)).build();
                         x.setOrderUpdateInfoVO(fieldVO);
                     }
                 }