canrd-outside / order-erp · Commits

Commit 86764c08821bd464b4888956a0675564178c763e

Authored by 谢茂盛
1 parent 9d73d4da
build: skipped

feat: 问题修复项 

1、利润分析表提交的审核内容，管理员通过审核OK，系统放开后可以编辑，但是不能保存更改
Inline Side-by-side
Showing 2 changed files with 10 additions and 3 deletions
src/main/java/com/order/erp/domain/vo/order/OrderInfoResultVO.java
  View file @86764c0
... ... @@ -47,7 +47,7 @@ public class OrderInfoResultVO extends OrderBaseInfoVO implements Serializable {
47 47 /**
48 48 * 修改未审核信息
49 49 */
50   - private OrderLockFieldVO orderUpdateInfoVO;
  50 + private OrderUpdateInfoVO orderUpdateInfoVO;
51 51  
52 52 /**
53 53 * 进度条
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @86764c0
... ... @@ -1023,10 +1023,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1023 1023 Map<Long, OrderFieldLockApplyDO> applyDOMap = fieldLockApplyDOList.stream().collect(Collectors.toMap(OrderFieldLockApplyDO::getOrderId, Function.identity()));
1024 1024 orderInfoResultVOList.forEach(x -> {
1025 1025 OrderFieldLockApplyDO applyDO = applyDOMap.get(x.getId());
1026   - if (!ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(applyDO.getType())) {
  1026 + if (Objects.nonNull(applyDO) && ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(applyDO.getType())) {
1027 1027 String fields = applyDO.getFields();
1028 1028 if (StringUtils.isNotBlank(fields)) {
1029   - OrderLockFieldVO fieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
  1029 + OrderUpdateInfoVO fieldVO = OrderUpdateInfoVO.builder().reportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class)).build();
  1030 + x.setOrderUpdateInfoVO(fieldVO);
  1031 + }
  1032 + }
  1033 + if (Objects.nonNull(applyDO) && ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(applyDO.getType())) {
  1034 + String fields = applyDO.getFields();
  1035 + if (StringUtils.isNotBlank(fields)) {
  1036 + OrderUpdateInfoVO fieldVO = OrderUpdateInfoVO.builder().profitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class)).build();
1030 1037 x.setOrderUpdateInfoVO(fieldVO);
1031 1038 }
1032 1039 }
... ...