refactor(order): 优化项目基础信息和申请流程

- 移除 OrderProfitAnalysisDO 中未使用的字段 - 将 ProjectApplyDO 中的 projectId 改为 projectNoPrefix - 更新 ProjectBaseInfoServiceImpl 中的项目查询逻辑 -调整 ProjectFieldLockRecord 中的 projectId 为 projectNoPrefix

refactor(order): 优化项目基础信息和申请流程
- 移除 OrderProfitAnalysisDO 中未使用的字段 - 将 ProjectApplyDO 中的 projectId 改为 projectNoPrefix - 更新 ProjectBaseInfoServiceImpl 中的项目查询逻辑 -调整 ProjectFieldLockRecord 中的 projectId 为 projectNoPrefix
曾国涛
1 parent d6385255
Showing 4 changed files with 26 additions and 40 deletions
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java
src/main/java/com/order/erp/domain/model/ProjectApplyDO.java
src/main/java/com/order/erp/domain/model/ProjectFieldLockRecord.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -99,19 +99,5 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      */
     private int profitType;
-    /**
-     * 生产科预算金额
-     */
-    private BigDecimal productionDepartmentPredictPrice;
-
-    /**
-     * 实际发生费用
-     */
-    private BigDecimal productionActualPrice;
-
-    /**
-     * 包装费用实际金额
-     */
-    private BigDecimal packetActualRmbTotalPrice;
 }
@@ -38,8 +38,8 @@ public class ProjectApplyDO extends BaseDO implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @ApiModelProperty(value = "项目id")
-    private Long projectId;
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
     @ApiModelProperty(value = "申请用户id")
@@ -40,8 +40,9 @@ public class ProjectFieldLockRecord extends BaseDO implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    @ApiModelProperty(value = "项目id")
-    private Long projectId;
+
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
     @ApiModelProperty(value = "用户id")
     private Long userId;
@@ -77,29 +77,34 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public ServerResult edit(ProjectBaseInfoVO vo) {
-        Long id = vo.getId();
-        ProjectBaseInfoDO byId = this.getById(id);
-        if (Objects.isNull(byId)) {
-            byId = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
+        String projectNoPrefix = vo.getProjectNoPrefix();
+        Optional<ProjectBaseInfoDO> projectBaseInfoDOOpt = this.lambdaQuery()
+                .eq(ProjectBaseInfoDO::getProjectNoPrefix, projectNoPrefix)
+                .last(" limit 1 ")
+                .oneOpt();
+        ProjectBaseInfoDO projectBaseInfoDO = null;
+        if (projectBaseInfoDOOpt.isPresent()) {
+            projectBaseInfoDO = projectBaseInfoDOOpt.get();
+            BeanUtil.copyProperties(vo, projectBaseInfoDO,"id");
         }else {
-            BeanUtil.copyProperties(vo, byId);
+            projectBaseInfoDO = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
         }
-        return ServerResult.success(this.saveOrUpdate(byId));
+        return ServerResult.success(this.saveOrUpdate(projectBaseInfoDO));
     }
     @Override
     public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
         List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(ProjectApplyDO::getProjectId, vo.getProjectId())
+                .eq(ProjectApplyDO::getProjectNoPrefix, vo.getProjectNoPrefix())
                 .eq(ProjectApplyDO::getApplyUserId, dataScope.getLoginUserId())
                 .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
         if (CollectionUtils.isNotEmpty(applyDOS)) {
             throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
         }
-        Long projectId = vo.getProjectId();
-        vo.setProjectId(null);
+        String projectNoPrefix = vo.getProjectNoPrefix();
+        vo.setProjectNoPrefix(null);
         ProjectApplyDO build = ProjectApplyDO.builder()
-                .projectId(projectId)
+                .projectNoPrefix(projectNoPrefix)
                 .applyUserId(dataScope.getLoginUserId())
                 .fields(JSONObject.toJSONString(vo))
                 .type(ProjectApplyTypeEnum.FIELD_EDIT_APPLY)
@@ -124,12 +129,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         if(CollectionUtils.isEmpty(records)){
             return buildPageResult(page, Collections.emptyList());
         }
-        List<Long> projectIds = records.stream().map(ProjectApplyDO::getProjectId).collect(Collectors.toList());
-        List<ProjectBaseInfoDO> projectBaseInfoDOS = this.listByIds(projectIds);
-        Map<Long,String> projectId2ProjectNoPrefixMap = projectBaseInfoDOS.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getId, ProjectBaseInfoDO::getProjectNoPrefix));
         List<ProjectApplyVO> collect = records.stream().map(e -> {
             ProjectApplyVO projectApplyVO = BeanUtil.copyProperties(e, ProjectApplyVO.class);
-            projectApplyVO.setProjectNoPrefix(projectId2ProjectNoPrefixMap.get(e.getProjectId()));
             return projectApplyVO;
         }).collect(Collectors.toList());
         return ServerResult.success(buildPageResult(page, collect));
@@ -144,13 +145,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
              applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
              ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
                      .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                     .eq(ProjectFieldLockRecord::getProjectId, applyDO.getProjectId())
+                     .eq(ProjectFieldLockRecord::getProjectNoPrefix, applyDO.getProjectNoPrefix())
                      .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
                      .orderByDesc(ProjectFieldLockRecord::getId)
                      .last("limit 1"));
              if (Objects.isNull(recordDO)) {
                  recordDO = ProjectFieldLockRecord.builder()
-                         .projectId(applyDO.getProjectId())
+                         .projectNoPrefix(applyDO.getProjectNoPrefix())
                          .userId(applyDO.getApplyUserId())
                          .build();
              }
@@ -410,7 +411,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 })
                 .list();
         Map<String, ProjectBaseInfoDO> noPrefix2ProjectProfitAnalysisDOMap = list.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getProjectNoPrefix, Function.identity()));
-        Map<Long,String> projectId2ProjectNoPrefixMap = list.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getId, ProjectBaseInfoDO::getProjectNoPrefix));
         Set<String> collect = orderInfoResultVOS.stream()
                 .map(OrderBaseInfoVO::getCustomerCode)
                 .collect(Collectors.toSet());
@@ -426,9 +426,9 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
                 .lambdaQuery()
                 .func(query -> {
-                    Set<Long> projectIds =  list.stream().map(ProjectBaseInfoDO::getId).collect(Collectors.toSet());
-                    if(CollUtil.isNotEmpty(projectIds)){
-                        query.in(ProjectFieldLockRecord::getProjectId,projectIds);
+                    Set<String> projectNoPrefixs =  list.stream().map(ProjectBaseInfoDO::getProjectNoPrefix).collect(Collectors.toSet());
+                    if(CollUtil.isNotEmpty(projectNoPrefixs)){
+                        query.in(ProjectFieldLockRecord::getProjectNoPrefix,projectNoPrefixs);
                     }else {
                         query.apply("1!=1");
@@ -436,8 +436,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 })
                 .list();
         Map<String,ProjectBaseInfoLockFieldVO> prjectNo2LockRecordMap  = lockRecords.stream()
-                .filter(record -> projectId2ProjectNoPrefixMap.containsKey(record.getProjectId()))
-                .collect(Collectors.toMap(record -> projectId2ProjectNoPrefixMap.get(record.getProjectId()), record -> {
+                .collect(Collectors.toMap(ProjectFieldLockRecord::getProjectNoPrefix, record -> {
                     try {
                         return objectMapper.readValue(record.getFields(), ProjectBaseInfoLockFieldVO.class);
                     } catch (JsonProcessingException e) {