feat: 问题修复项

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

feat: 问题修复项
1、利润分析表提交的审核内容，管理员通过审核OK，系统放开后可以编辑，但是不能保存更改
谢茂盛
1 parent 7e45e7e4
Showing 1 changed file with 9 additions and 9 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -547,12 +547,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * @param orderId
      * @param userId
      */
-    private void checkApply(Long orderId, Long userId) {
+    private void checkApply(Long orderId, Long userId, ApplyTypeEnum applyTypeEnum) {
         List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getOrderId, orderId)
                 .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
-                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.FIELD_EDIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getType, applyTypeEnum.getType())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
         if (CollectionUtils.isNotEmpty(applyDOS)) {
             throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
@@ -688,7 +688,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .in(OrderProfitAnalysisDO::getOrderId, orderIds));
         if (CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)) {
-            Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = orderProfitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity()));
+            Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = orderProfitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (v1, v2) -> v1));
             orderInfoResultVOList.forEach(result -> {
                 if (profitAnalysisDOMap.containsKey(result.getId())) {
                     OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(result.getId());
@@ -717,7 +717,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollectionUtils.isEmpty(orderCompletionReportDOS)) {
             return;
         }
-        Map<Long, OrderCompletionReportDO> completionReportDOMap = orderCompletionReportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity()));
+        Map<Long, OrderCompletionReportDO> completionReportDOMap = orderCompletionReportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (v1, v2) -> v1));
         orderInfoResultVOList.forEach(result -> {
             if (completionReportDOMap.containsKey(result.getId())) {
                 OrderCompletionReportDO completionReportDO = completionReportDOMap.get(result.getId());
@@ -1017,10 +1017,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .in(OrderFieldLockApplyDO::getOrderId, orderIds));
+                .in(OrderFieldLockApplyDO::getOrderId, orderIds).orderByAsc(OrderFieldLockApplyDO::getId));
         if (CollectionUtils.isNotEmpty(fieldLockApplyDOList)) {
-            Map<Long, OrderFieldLockApplyDO> applyDOMap = fieldLockApplyDOList.stream().collect(Collectors.toMap(OrderFieldLockApplyDO::getOrderId, Function.identity()));
+            Map<Long, OrderFieldLockApplyDO> applyDOMap = fieldLockApplyDOList.stream().collect(Collectors.toMap(OrderFieldLockApplyDO::getOrderId, Function.identity(), (v1, v2) -> v1));
             orderInfoResultVOList.forEach(x -> {
                 OrderFieldLockApplyDO applyDO = applyDOMap.get(x.getId());
                 if (Objects.nonNull(applyDO) && ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(applyDO.getType())) {
@@ -1242,7 +1242,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .eq(StringUtils.isNotBlank(queryVO.getOrderStatus()), OrderBaseInfoDO::getOrderStatus, queryVO.getOrderStatus())
                 .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
                 .in(CollectionUtils.isNotEmpty(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
-                .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()),OrderBaseInfoDO::getInnerNo,queryVO.getInnerNo())
+                .in(CollectionUtils.isNotEmpty(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
                 .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
                 .eq(StringUtils.isNotBlank(queryVO.getCreateBy()), OrderBaseInfoDO::getCreateBy, queryVO.getCreateBy())
                 .eq(StringUtils.isNotBlank(queryVO.getBusinessPerson()), OrderBaseInfoDO::getBusinessPerson, queryVO.getBusinessPerson())
@@ -1373,7 +1373,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .eq(SystemSettingDO::getRelationCode, "profitRate").last("limit 1"));
         double profitRate = Objects.nonNull(systemSettingDO) ? Double.parseDouble(systemSettingDO.getRelationValue()) : 0.3;
-        checkApply(profitAnalysisVO.getOrderId(), userId);
         OrderFieldLockApplyDO orderFieldLockApplyDO = buildProfitFieldLockApplyDO(profitAnalysisFieldVO, userId);
         orderFieldLockApplyService.save(orderFieldLockApplyDO);
@@ -1415,6 +1414,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
+            checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_PROFIT_APPLY);
             OrderFieldLockApplyDO orderFieldLockApplyDO = handlerProfitRate(updateVO.getProfitAnalysisInfo(), orderBaseInfoDo, userId);
             orderBaseInfoDo.setOrderStatus(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(orderFieldLockApplyDO.getStatus()) ? OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus()
@@ -1423,7 +1423,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (Objects.nonNull(updateVO.getReportInfo())) {
-            checkApply(updateVO.getOrderId(), userId);
+            checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_REPORT_APPLY);
             OrderFieldLockApplyDO orderFieldLockApplyDO = buildReportFieldLockApplyDO(updateVO.getReportInfo(), userId);
             orderFieldLockApplyService.save(orderFieldLockApplyDO);