feat: 问题修复项

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

feat: 问题修复项
1、利润分析表提交的审核内容，管理员通过审核OK，系统放开后可以编辑，但是不能保存更改
谢茂盛
1 parent bf6639aa
Showing 4 changed files with 81 additions and 1 deletions
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/domain/vo/order/OrderInfoResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderUpdateInfoVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -13,6 +13,7 @@ import java.util.Objects;
  */
 public class OrderFieldUtils {
+
     /**
      * @param lockFieldEnum
      * @return
@@ -45,6 +45,11 @@ public class OrderInfoResultVO extends OrderBaseInfoVO implements Serializable {
     private OrderLockFieldVO lockFields;
     /**
+     * 修改未审核信息
+     */
+    private OrderLockFieldVO orderUpdateInfoVO;
+
+    /**
      * 进度条
      */
     private Double schedule;
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderUpdateInfoVO implements Serializable {
+
+
+    /**
+     * 利润分析字段
+     */
+    private OrderProfitAnalysisFieldVO profitAnalysisFields;
+
+    /**
+     * 项目报告书字段
+     */
+    private OrderCompletionReportFieldVO reportFields;
+
+    /**
+     * 跟单字段
+     */
+    private OrderTrackStageFieldVO trackStageFields;
+
+    /**
+     * 质检字段
+     */
+    private OrderInspectionStageFieldVO inspectionStageFields;
+
+}
@@ -179,6 +179,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             if (locked) {
                 // 填充字段锁定信息
                 fillLockFields(resultVOList);
+                // 查询是否编辑未生效字段
+                fillOrderUpdateInfos(resultVOList);
             }
             // 填充进度
@@ -815,7 +817,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (StringUtils.isBlank(inspectionStageInfo.getEndCheckResult())) {
             return false;
-        } else if ("FAIL".equals(inspectionStageInfo.getEndCheckResult())) {
+        } else if ("FAIL" .equals(inspectionStageInfo.getEndCheckResult())) {
             return false;
         }
         return true;
@@ -1004,6 +1006,37 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
+    private void fillOrderUpdateInfos(List<OrderInfoResultVO> orderInfoResultVOList) {
+        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
+            return;
+        }
+
+        Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+
+        List<OrderFieldLockApplyDO> fieldLockApplyDOList = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .in(OrderFieldLockApplyDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isNotEmpty(fieldLockApplyDOList)) {
+            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())) {
+                    String fields = applyDO.getFields();
+                    if (StringUtils.isNotBlank(fields)) {
+                        OrderLockFieldVO fieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
+                        x.setOrderUpdateInfoVO(fieldVO);
+                    }
+                }
+            });
+        }
+    }
+
+    /**
+     * @param orderInfoResultVOList
+     */
     private void fillLockFields(List<OrderInfoResultVO> orderInfoResultVOList) {
         if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
             return;