feat(order): 增加内部利润字段锁定申请功能

- 新增内部利润字段编辑申请类型- 实现内部利润字段锁定申请的提交和审核功能 -优化项目基础信息页面，支持显示锁定字段信息 - 重构项目锁定记录查询逻辑，提高查询效率

feat(order): 增加内部利润字段锁定申请功能
- 新增内部利润字段编辑申请类型- 实现内部利润字段锁定申请的提交和审核功能 -优化项目基础信息页面，支持显示锁定字段信息 - 重构项目锁定记录查询逻辑，提高查询效率
曾国涛
1 parent 637c27de
Showing 7 changed files with 58 additions and 8 deletions
src/main/java/com/order/erp/config/MybatisPlusConfig.java
src/main/java/com/order/erp/domain/ProjectApplyTypeEnum.java
src/main/java/com/order/erp/domain/model/ProjectApplyDO.java
src/main/java/com/order/erp/domain/vo/order/ProjectBaseInfoLockFieldVO.java
src/main/java/com/order/erp/domain/vo/order/QueryProjectLockFieldVO.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
src/main/resources/application.yml
 package com.order.erp.config;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,9 +16,9 @@ import lombok.Getter;
 public enum ProjectApplyTypeEnum {
     FIELD_EDIT_APPLY(0, "字段编辑申请"),
+    INNER_PROFIT_FIELD_EDIT_APPLY(1, "内部利润字段编辑申请"),
     ;
-    @EnumValue
-    @JsonValue
+
     private Integer type;
     private String desc;
@@ -52,7 +52,7 @@ public class ProjectApplyDO extends BaseDO implements Serializable {
     private String fields;
     @ApiModelProperty(value = "锁定字段 json字符串")
-    private ProjectApplyTypeEnum type;
+    private String type;
     @ApiModelProperty(value = "状态：0 待审批，1 通过，2 拒绝")
     private Integer status;
@@ -67,4 +67,5 @@ public class ProjectApplyDO extends BaseDO implements Serializable {
     private String applyRemark;
+
 }
@@ -53,5 +53,10 @@ public class ProjectBaseInfoLockFieldVO implements Serializable {
     private String actualExchangeRate;
+    private String projectInnerProfitInfoStartTime;
+
+    private String projectInnerProfitInfoEndTime;
+
+    private String type;
 }
@@ -48,5 +48,7 @@ public class QueryProjectLockFieldVO extends BasePageVO implements Serializable 
     private String packetActualRmbTotalPrice;
+    private Integer type;
+
 }
@@ -98,6 +98,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
         List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectApplyDO::getType,vo.getType())
                 .eq(ProjectApplyDO::getProjectNoPrefix, vo.getProjectNoPrefix())
                 .eq(ProjectApplyDO::getApplyUserId, dataScope.getLoginUserId())
                 .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
@@ -111,13 +112,15 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .spainPaidRmbCommission(vo.getSpainPaidRmbCommission())
                 .paidRmbCommission(vo.getPaidRmbCommission())
                 .actualExchangeRate(vo.getActualExchangeRate())
+                .projectInnerProfitInfoEndTime(vo.getProjectInnerProfitInfoEndTime())
+                .projectInnerProfitInfoStartTime(vo.getProjectInnerProfitInfoStartTime())
                 .build();
         ProjectApplyDO build = ProjectApplyDO.builder()
                 .projectNoPrefix(vo.getProjectNoPrefix())
                 .applyUserId(dataScope.getLoginUserId())
                 .applyRemark(vo.getApplyRemark())
                 .fields(JSONObject.toJSONString(projectBaseInfoLockFieldVO))
-                .type(ProjectApplyTypeEnum.FIELD_EDIT_APPLY)
+                .type(vo.getType())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .build();
         projectFieldLockApplyService.save(build);
@@ -129,7 +132,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) {
         Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(ProjectApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
+                .eq(ProjectApplyDO::getType, vo.getType())
                 .eq(ProjectApplyDO::getStatus, StringUtils.isBlank(vo.getStatus()) ? ApplyStatusEnum.WAIT_AUDIT.getStatus() : vo.getStatus())
                 .orderByDesc(ProjectApplyDO::getCreateTime)
                 .page(new Page<>(vo.getPage(), vo.getPageSize()));
@@ -163,7 +166,17 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         .userId(applyDO.getApplyUserId())
                         .build();
             }
-            recordDO.setFields(applyDO.getFields());
+            ProjectBaseInfoLockFieldVO applyLockFieldVO = JSONObject.parseObject(applyDO.getFields(), ProjectBaseInfoLockFieldVO.class);
+            ProjectBaseInfoLockFieldVO recordLockFieldVO = JSONObject.parseObject(recordDO.getFields(), ProjectBaseInfoLockFieldVO.class);
+            if(ProjectApplyTypeEnum.FIELD_EDIT_APPLY.name().equals(applyDO.getType())){
+                ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = Optional.ofNullable(recordLockFieldVO).orElse(new ProjectBaseInfoLockFieldVO());
+                BeanUtil.copyProperties(applyLockFieldVO, projectBaseInfoLockFieldVO, CopyOptions.create().setIgnoreProperties("projectInnerProfitInfoStartTime","projectInnerProfitInfoEndTime").ignoreNullValue());
+                recordLockFieldVO = projectBaseInfoLockFieldVO;
+            }else if(ProjectApplyTypeEnum.INNER_PROFIT_FIELD_EDIT_APPLY.name().equals(applyDO.getType())){
+                recordLockFieldVO.setProjectInnerProfitInfoStartTime(applyLockFieldVO.getProjectInnerProfitInfoStartTime());
+                recordLockFieldVO.setProjectInnerProfitInfoEndTime(applyLockFieldVO.getProjectInnerProfitInfoEndTime());
+            }
+            recordDO.setFields(JSONObject.toJSONString(recordLockFieldVO));
             if (Objects.isNull(recordDO.getId())) {
                 projectionFieldLockRecordService.save(recordDO);
             } else {
@@ -319,12 +332,39 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .list();
         Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
                 .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
+        List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
+                .lambdaQuery()
+                .func(query -> {
+                    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");
+                    }
+                })
+                .list();
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<String, ProjectBaseInfoLockFieldVO> prjectNo2LockRecordMap = lockRecords.stream()
+                .collect(Collectors.toMap(ProjectFieldLockRecord::getProjectNoPrefix, record -> {
+                    try {
+                        return objectMapper.readValue(record.getFields(), ProjectBaseInfoLockFieldVO.class);
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                }));
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
+            ProjectBaseInfoDO projectBaseInfoDO = no2ProjectInfoMap.get(entry.getKey());
             List<OrderInfoResultVO> details = entry.getValue();
             InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
                     .productionDepartment(details.get(0).getProductionDepartment())
+                    .lockFields(Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(
+                            ProjectBaseInfoLockFieldVO.builder()
+                            .projectInnerProfitInfoStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .projectInnerProfitInfoEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .build()))
                     .build();
             //数量
@@ -411,7 +451,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             SystemSettingDO systemSettingDO = systemSettingDOSMap.get(innerProfitInfoVO.getCustomerCode());
             if (Objects.nonNull(systemSettingDO)) {
                 String relationValue = systemSettingDO.getRelationValue();
-                ObjectMapper objectMapper = new ObjectMapper();
                 try {
                     // 将 JSON 字符串解析为 List<Map<String, String>>
                     List<Map<String, String>> relations = objectMapper.readValue(relationValue, objectMapper.getTypeFactory().constructCollectionType(List.class, Map.class));
@@ -3,4 +3,4 @@ server:
 spring:
   profiles:
-    active: test
 \ No newline at end of file
+    active: test