feat(order): 增加订单成本信息字段锁定功能

- 新增订单包装费用明细字段锁定和订单生产费用明细字段锁定类型- 实现订单成本信息字段锁定的申请、审核和展示功能- 优化项目基本信息字段锁定相关代码

feat(order): 增加订单成本信息字段锁定功能
- 新增订单包装费用明细字段锁定和订单生产费用明细字段锁定类型- 实现订单成本信息字段锁定的申请、审核和展示功能- 优化项目基本信息字段锁定相关代码
曾国涛
1 parent b0abec23
Showing 9 changed files with 181 additions and 96 deletions
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/vo/order/AuditVO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfolockFieldVO.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/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -25,9 +25,20 @@ public enum ApplyTypeEnum {
     DEPARTMENT_INVOICE_APPLY(50,"生产科发票申请"),
-    ORDER_COST_FIELD_EDIT_APPLY(60,"订单费用字段申请"),
+    ORDER_PACKET_COST_FIELD_EDIT_APPLY(60,"订单包装费用明细字段申请"),
+
+    ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY(70,"订单生产费用明细字段申请"),
     ;
     private Integer type;
     private String desc;
+
+    public static String getNameByType(Integer type) {
+        for (ApplyTypeEnum value : ApplyTypeEnum.values()) {
+            if (value.getType().equals(type)) {
+                return value.getDesc();
+            }
+        }
+        return null;
+    }
 }
@@ -18,7 +18,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @SuperBuilder
-public class AuditVO extends BasePageVO implements Serializable {
+public class AuditVO implements Serializable {
     /**
      * 申请id
@@ -134,5 +134,7 @@ public class InnerProfitInfoVO implements Serializable {
     @ApiModelProperty(value = "项目结束时间")
     private LocalDateTime produceEndTime;
+    private ProjectBaseInfoLockFieldVO lockFields;
+
 }
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
@@ -29,6 +30,9 @@ public class OrderCostInfolockFieldVO implements Serializable {
     private static final long serialVersionUID = 1L;
+    @NotNull
+    private Integer type;
+    @NotNull
     private Long orderId;
     private String productionDepartmentPredictPrice;
@@ -6,9 +6,12 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.order.erp.domain.dto.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -24,7 +27,9 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
 @ApiModel(value="ProjectFieldLockApply对象", description="项目-字段锁定申请表")
 public class ProjectBaseInfoLockFieldVO implements Serializable {
@@ -31,6 +31,16 @@ public class QueryProjectLockFieldVO extends BasePageVO implements Serializable 
     private static final long serialVersionUID = 1L;
     private Long orderId;
+    /**
+     *     NO_COMMIT(-1, "未提交审核"),
+     *
+     *     WAIT_AUDIT(0, "待审批"),
+     *
+     *     AUDIT_PASS(10, "已通过"),
+     *
+     *     AUDIT_REFUSE(20, "已驳回")
+     */
+    private String status;
     private String productionDepartmentPredictPrice;
@@ -16,6 +16,7 @@ import com.order.erp.common.exception.BusinessException;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.ApplyStatusEnum;
 import com.order.erp.domain.ApplyTypeEnum;
+import com.order.erp.domain.OrderLockFieldEnum;
 import com.order.erp.domain.ProjectApplyTypeEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.OrderCostInfoDO;
@@ -42,7 +43,7 @@ import java.util.stream.Collectors;
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -73,32 +74,36 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderCostInfoDO orderCostInfoDO = null;
         if (!orderCostInfoDOOpt.isPresent()) {
             orderCostInfoDO = BeanUtil.copyProperties(vo, OrderCostInfoDO.class);
-        }else {
+        } else {
             orderCostInfoDO = orderCostInfoDOOpt.get();
             BeanUtil.copyProperties(vo, orderCostInfoDO, CopyOptions.create().ignoreNullValue());
         }
         return ServerResult.success(this.saveOrUpdate(orderCostInfoDO));
     }
+
     @Override
     public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) {
         List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getOrderId, vo.getOrderId())
                 .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
-                .eq(OrderFieldLockApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getType, vo.getType())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
         if (CollectionUtils.isNotEmpty(applyDOS)) {
             throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
         }
-        Long orderId = vo.getOrderId();
-        vo.setOrderId(null);
+        OrderCostInfolockFieldVO lockField = OrderCostInfolockFieldVO.builder()
+                .packetActualRmbTotalPrice(vo.getPacketActualRmbTotalPrice())
+                .productionActualPrice(vo.getProductionActualPrice())
+                .productionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice())
+                .build();
         OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
-                .orderId(orderId)
+                .orderId(vo.getOrderId())
                 .applyUserId(dataScope.getLoginUserId())
-                .fields(JSONObject.toJSONString(vo))
+                .fields(JSONObject.toJSONString(lockField))
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .type(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType())
-                .remark(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getDesc())
+                .type(vo.getType())
+                .remark(ApplyTypeEnum.getNameByType(vo.getType()))
                 .build();
         orderFieldLockApplyService.save(build);
         return ServerResult.success();
@@ -113,16 +118,16 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .lambdaQuery()
                 .func(query -> {
                     Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
-                    if(CollUtil.isNotEmpty(collect)){
-                        query.in(OrderCostFieldLockRecord::getOrderId,collect);
+                    if (CollUtil.isNotEmpty(collect)) {
+                        query.in(OrderCostFieldLockRecord::getOrderId, collect);
-                    }else {
+                    } else {
                         query.apply("1!=1");
                     }
                 })
                 .list();
         ObjectMapper objectMapper = new ObjectMapper();
-        Map<Long,OrderCostInfolockFieldVO> orderId2fieldMapMap  = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId, record -> {
+        Map<Long, OrderCostInfolockFieldVO> orderId2fieldMapMap = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId, record -> {
             try {
                 return objectMapper.readValue(record.getFields(), OrderCostInfolockFieldVO.class);
             } catch (JsonProcessingException e) {
@@ -130,6 +135,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             }
         }));
         List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
+            OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
             InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
@@ -142,6 +148,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .productionDepartmentTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentTotalPrice())
                     .productionDepartmentPredictPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictPrice())
                     .productionActualPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionActualPrice())
+                    .lockFields(Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
+                            .orElse(OrderCostInfolockFieldVO
+                                    .builder()
+                                    .packetActualRmbTotalPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                                    .productionActualPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                                    .productionDepartmentPredictPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                                    .build()
+                            ))
                     .build();
             if (Objects.nonNull(vo.getProductionDepartmentPredictPrice())
@@ -190,16 +204,16 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .lambdaQuery()
                 .func(query -> {
                     Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
-                    if(CollUtil.isNotEmpty(collect)){
-                        query.in(OrderCostFieldLockRecord::getOrderId,collect);
+                    if (CollUtil.isNotEmpty(collect)) {
+                        query.in(OrderCostFieldLockRecord::getOrderId, collect);
-                    }else {
+                    } else {
                         query.apply("1!=1");
                     }
                 })
                 .list();
         ObjectMapper objectMapper = new ObjectMapper();
-        Map<Long,OrderCostInfolockFieldVO> orderId2fieldMapMap  = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId,record -> {
+        Map<Long, OrderCostInfolockFieldVO> orderId2fieldMapMap = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId, record -> {
             try {
                 return objectMapper.readValue(record.getFields(), OrderCostInfolockFieldVO.class);
             } catch (JsonProcessingException e) {
@@ -208,6 +222,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         }));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
+            OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
@@ -219,7 +234,12 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .packetPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketPrice())
                     .packetTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketTotalPrice())
                     .packetActualRmbTotalPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getPacketActualRmbTotalPrice())
-                    .lockFields(orderId2fieldMapMap.get(record.getId()))
+                    .lockFields(Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(OrderCostInfolockFieldVO.builder()
+                            .packetActualRmbTotalPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .productionActualPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .productionDepartmentPredictPrice(Objects.isNull(orderCostInfo)||Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .build()
+                    ))
                     .build();
             if (Objects.nonNull(vo.getPacketTotalPrice())) {
                 //包装费用合计 = 包装费合计*汇率
 package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -35,6 +36,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 /**
  * 用户订单-字段锁定申请表(OrderFieldLockApply)表服务实现类
@@ -117,7 +119,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     public ServerResult listByPage(OrderFieldLockApplyQueryVO queryVO) {
         RoleEnum roleEnum = dataScope.getRole();
         String loginUserName = dataScope.getLoginUserName();
-        LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = buildQueryByParam(queryVO,roleEnum);
+        LambdaQueryWrapper<OrderFieldLockApplyDO> queryWrapper = buildQueryByParam(queryVO, roleEnum);
         Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
         IPage<OrderFieldLockApplyDO> iPage = page(page, queryWrapper);
@@ -129,10 +131,13 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 BeanUtils.copyProperties(x, resultVO);
                 String fields = x.getFields();
                 if (StringUtils.isNotBlank(fields)) {
-                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() .equals(x.getType())) {
+                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(x.getType())) {
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
-                    if(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType().equals(x.getType())){
+                    if (Stream.of(ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
+                                    ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
+                            .map(ApplyTypeEnum::getType)
+                            .anyMatch(type -> type.equals(x.getType()))) {
                         OrderCostInfolockFieldVO orderCostInfolockFieldVO = JSONObject.parseObject(fields, OrderCostInfolockFieldVO.class);
                         resultVO.setFieldInfos(OrderLockFieldVO.builder().costInfolockFieldVO(orderCostInfolockFieldVO).build());
                     }
@@ -141,61 +146,61 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
-                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() .equals(x.getType())) {
+                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
                     if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
-                        if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
-                            if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getBusinesPerson().equals(loginUserName)){
+                        if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
+                            if (Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getBusinesPerson().equals(loginUserName)) {
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getTrackerUser().equals(loginUserName)){
+                            if (Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getTrackerUser().equals(loginUserName)) {
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
-                        } else{
+                        } else {
                             resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                         }
-                        if(Objects.isNull(resultVO.getFieldInfos())){
-                           resultVO=null;
+                        if (Objects.isNull(resultVO.getFieldInfos())) {
+                            resultVO = null;
                         }
                     }
                     if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(x.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
                         // 解决待审批列表中的应付款要显示内部编码。 这里开始
                         //对于生产科发票特殊处理。
-                        if(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())){
-                        if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getCheckBillOrderDO().getCheckNo())){
-                            Long orderId = orderLockFieldVO.getCheckBillOrderDO().getOrderId();
-                            if(Objects.nonNull(orderId)){
+                        if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())) {
+                            if (Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getCheckBillOrderDO().getCheckNo())) {
+                                Long orderId = orderLockFieldVO.getCheckBillOrderDO().getOrderId();
+                                if (Objects.nonNull(orderId)) {
                                     OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(orderId);
-                                    if(Objects.nonNull(orderBaseInfoDO)){
-                                        if(StringUtils.isNotBlank(orderBaseInfoDO.getInnerNo())){
+                                    if (Objects.nonNull(orderBaseInfoDO)) {
+                                        if (StringUtils.isNotBlank(orderBaseInfoDO.getInnerNo())) {
                                             OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
                                             resultVO.setOrderBaseInfo(orderBaseInfoVO);
                                             orderBaseInfoVO.setInnerNo(orderBaseInfoDO.getInnerNo());
                                         }
                                     }
                                 }
-                        }
+                            }
                         }//这里结束  上述为待审核列表中应收款要显示内部编码。   //这部分不需要了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
-                        if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
-                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName))){
+                        if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
+                            if ((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getBusinesPerson().equals(loginUserName)) || (Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName))) {
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName))||(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName))){
+                            if ((Objects.nonNull(orderLockFieldVO.getProducePaymentCheckBillFieldVO()) && orderLockFieldVO.getProducePaymentCheckBillFieldVO().getTrackerUser().equals(loginUserName)) || (Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getTrackerUser().equals(loginUserName))) {
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
-                        } else{
+                        } else {
                             resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                         }
-                        if(Objects.isNull(resultVO.getFieldInfos())){
-                            resultVO=null;
+                        if (Objects.isNull(resultVO.getFieldInfos())) {
+                            resultVO = null;
                         }
                     }
                 }
@@ -369,7 +374,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
      * @param queryVO
      * @return
      */
-    private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO,RoleEnum roleEnum) {
+    private LambdaQueryWrapper<OrderFieldLockApplyDO> buildQueryByParam(OrderFieldLockApplyQueryVO queryVO, RoleEnum roleEnum) {
         RoleEnum roleSelect = null;
         if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())) {
             queryVO.setBusinessPerson(dataScope.getLoginUserName());
@@ -384,9 +389,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         }
         Set<Long> orderIds = new HashSet<>();
         //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。   限制情况为跟单业务,对应收款,应付款,发票审核请求时。
-        if(Constant.THIRTY.equals(queryVO.getType()) ||Integer.valueOf(4050).equals(queryVO.getType())){
+        if (Constant.THIRTY.equals(queryVO.getType()) || Integer.valueOf(4050).equals(queryVO.getType())) {
-        }else{
+        } else {
             /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
             //这里是否还u需要添加财务角色权限的逻辑。
             if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
@@ -412,26 +417,26 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
         //这里应该加上应收款待审核,应付款待审核,应付款已审核,应收款已审核已审核的一个条件。  目前只支持单个字符串搜索,不支持多个。
-        if(Objects.nonNull(queryVO.getType())){
+        if (Objects.nonNull(queryVO.getType())) {
             //发票,应付款审核。
-            if(Constant.FOUR == String.valueOf(queryVO.getType()).length()){
+            if (Constant.FOUR == String.valueOf(queryVO.getType()).length()) {
                 int firstTwoDigits = queryVO.getType() / 100;
                 int lastTwoDigits = queryVO.getType() % 100;
-                queryWrapper.in(OrderFieldLockApplyDO::getType,firstTwoDigits,lastTwoDigits);
+                queryWrapper.in(OrderFieldLockApplyDO::getType, firstTwoDigits, lastTwoDigits);
                 //目前是只能通过内部编号查询出应付款审核,无法查询出发票信息。
-                if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                     String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                     queryWrapper.apply(
                             "JSON_CONTAINS(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo'), JSON_QUOTE({0}))",
                             queryInnerNo
                     );
                 }
-            }else{
+            } else {
                 //应收款审核。
-                if(Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())){
+                if (Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())) {
                     queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
                     //这个内部编号单独针对于应付款申请设置的。
-                    if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                    if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                         String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                         queryWrapper.apply(
                                 "JSON_CONTAINS(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo'), JSON_QUOTE({0}))",
@@ -451,7 +456,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (!invoiceNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-                         "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.invoiceNo')) = {0}",
+                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.invoiceNo')) = {0}",
                         invoiceNos
                 );
             }
@@ -472,23 +477,23 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
         }
         //由于不懂下面的代码,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。
-        if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+        if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType() == Constant.THIRTY || queryVO.getType() == 4050)) {
-        }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
+        } else if (RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType() == Constant.THIRTY || queryVO.getType() == 4050)) {
-        }else{
+        } else {
             if (Objects.isNull(roleSelect)) {
                 queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
-            }else {
+            } else {
                 queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
             }
         }
         return queryWrapper
-                .func(Objects.nonNull(queryVO.getTypeIn()),query-> {
-                    if(CollUtil.isNotEmpty(queryVO.getTypeIn())){
+                .func(Objects.nonNull(queryVO.getTypeIn()), query -> {
+                    if (CollUtil.isNotEmpty(queryVO.getTypeIn())) {
                         query.in(OrderFieldLockApplyDO::getType, queryVO.getTypeIn());
-                    }else {
+                    } else {
                         query.apply("1!=1");
                     }
                 });
@@ -537,21 +542,21 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         applyDO.setRefuseRemark(refuseRemark);
         //应收款和应付款的申请,没有把orderId作为OrderFieldLockApplyDO的orderId,而是把InvoiceBillOrdeDO.getId()作为orderId来存储的。所以肯定查找不到。
         OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(applyDO.getOrderId());
-        if(!ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
+        if (!ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             if (Objects.isNull(orderBaseInfoDO)) {
                 throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
             }
         }
-        if(ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())){
-            InvoiceBillOrderDO invoiceBillOrderDO= invoiceBillOrderService.getById(applyDO.getOrderId());
-            if(Objects.isNull(invoiceBillOrderDO)){
-                throw new BusinessException(ServerResultCode. APPLY_NOT_EXIST);
+        if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
+            InvoiceBillOrderDO invoiceBillOrderDO = invoiceBillOrderService.getById(applyDO.getOrderId());
+            if (Objects.isNull(invoiceBillOrderDO)) {
+                throw new BusinessException(ServerResultCode.APPLY_NOT_EXIST);
             }
         }
-        if(ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
-            ProducePaymentCheckBillOrderDO checkBillOrderDO= checkBillOrderService.getById(applyDO.getOrderId());
-            if(Objects.isNull(checkBillOrderDO)){
-                throw new BusinessException(ServerResultCode. APPLY_NOT_EXIST);
+        if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = checkBillOrderService.getById(applyDO.getOrderId());
+            if (Objects.isNull(checkBillOrderDO)) {
+                throw new BusinessException(ServerResultCode.APPLY_NOT_EXIST);
             }
         }
         if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(applyDO.getType())) {
@@ -562,10 +567,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
         } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
-            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
             InvoiceFieldVO invoiceBillOrderDO = lockFieldVO.getInvoiceFieldVO();
             List<InvoiceBillOrderDO> invoiceBillOrderDOList = invoiceBillOrderService.listByIds(invoiceBillOrderDO.getInvoiceId());
-            if(CollectionUtils.isNotEmpty(invoiceBillOrderDOList)){
+            if (CollectionUtils.isNotEmpty(invoiceBillOrderDOList)) {
                 List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderDOList.stream().filter(Objects::nonNull).map(x -> {
                     x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
                     return x;
@@ -590,8 +595,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             ProducePaymentCheckBillFieldVO checkBillOrderDO = lockFieldVO.getProducePaymentCheckBillFieldVO();
             List<Long> producePaymentCheckBillId = checkBillOrderDO.getProducePaymentCheckBillId();
             List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = checkBillOrderService.listByIds(producePaymentCheckBillId);
-            if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
-                List<ProducePaymentCheckBillOrderDO>  producePaymentCheckBillOrderDOS= producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).map(x -> {
+            if (CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)) {
+                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).map(x -> {
                     x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
                     return x;
                 }).collect(Collectors.toList());
@@ -610,7 +615,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 });
             }
-        } else if(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
+        } else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
             ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
@@ -618,9 +623,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
             invoiceInfoDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
             //传递给审核一直都是最新的发票。
-            if(com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())){
+            if (com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())) {
                 log.info("checkBillOrderDO.getInvoiceUrl() 极有可能为空: {}", checkBillOrderDO.getInvoiceUrl());
-                if(Arrays.stream(invoiceInfoDO.getInvoiceUrl().split(",")).anyMatch(item->item.equals(checkBillOrderDO.getInvoiceUrl()))){
+                if (Arrays.stream(invoiceInfoDO.getInvoiceUrl().split(",")).anyMatch(item -> item.equals(checkBillOrderDO.getInvoiceUrl()))) {
                     // 将 invoiceUrls 分割成 List 并删除相同项
                     List<String> urlList = new ArrayList<>(Arrays.asList(invoiceInfoDO.getInvoiceUrl().split(",")));
                     urlList.removeIf(url -> url.equals(checkBillOrderDO.getInvoiceUrl()));
@@ -629,7 +634,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     String updatedInvoiceUrls = String.join(",", urlList);
                     invoiceInfoDO.setInvoiceUrl(updatedInvoiceUrls);
                 }
-            }else{
+            } else {
                 invoiceInfoDO.setInvoiceUrl(null);
             }
             checkBillOrderService.updateById(invoiceInfoDO);
@@ -758,11 +763,11 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
-            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
             InvoiceFieldVO invoiceBillOrderDO = lockFieldVO.getInvoiceFieldVO();
             List<Long> invoiceId = invoiceBillOrderDO.getInvoiceId();
             List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderService.listByIds(invoiceId);
-            if(CollectionUtils.isNotEmpty(invoiceBillOrderDOS)){
+            if (CollectionUtils.isNotEmpty(invoiceBillOrderDOS)) {
                 List<InvoiceBillOrderDO> invoiceeBillOrderDOs = invoiceBillOrderDOS.stream().filter(Objects::nonNull).map(x -> {
                     x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
                     return x;
@@ -788,7 +793,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             ProducePaymentCheckBillFieldVO checkBillOrderDO = lockFieldVO.getProducePaymentCheckBillFieldVO();
             List<Long> producePaymentCheckBillId = checkBillOrderDO.getProducePaymentCheckBillId();
             List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = checkBillOrderService.listByIds(producePaymentCheckBillId);
-            if(CollectionUtils.isNotEmpty(checkBillOrderDOS)){
+            if (CollectionUtils.isNotEmpty(checkBillOrderDOS)) {
                 List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = checkBillOrderDOS.stream().filter(Objects::nonNull).map(x -> {
                     x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
                     return x;
@@ -802,12 +807,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     x.setCheckStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
                     return x;
                 }).collect(Collectors.toList());
-                transactionHelper.run(() ->{
+                transactionHelper.run(() -> {
                     orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
                     checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
                 });
             }
-        }  else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
+        } else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
@@ -816,23 +821,26 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
             invoiceInfoDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
             //传递给审核一直都是最新的发票。
-            if(com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())){
-                if(com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
+            if (com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())) {
+                if (com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())) {
                     Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
                             org.apache.commons.lang3.StringUtils.defaultString(invoiceInfoDO.getInvoiceUrl()).split(",")));
-                    if(!deductUrlSet.contains(checkBillOrderDO.getInvoiceUrl())){
+                    if (!deductUrlSet.contains(checkBillOrderDO.getInvoiceUrl())) {
                         deductUrlSet.add(checkBillOrderDO.getInvoiceUrl());
-                        String updateDeductUrl=String.join(",",deductUrlSet);
+                        String updateDeductUrl = String.join(",", deductUrlSet);
                         invoiceInfoDO.setInvoiceUrl(updateDeductUrl);
                     }
                 }
-            }else{
-                if(com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
+            } else {
+                if (com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())) {
                     invoiceInfoDO.setInvoiceUrl(checkBillOrderDO.getInvoiceUrl());
                 }
             }
             checkBillOrderService.updateById(invoiceInfoDO);
-        } else if (ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType().equals(applyDO.getType())){
+        } else if (Stream.of(ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
+                        ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
+                .map(ApplyTypeEnum::getType)
+                .anyMatch(x -> x.equals(applyDO.getType()))) {
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
@@ -846,9 +854,16 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 recordDO = OrderCostFieldLockRecord.builder()
                         .orderId(applyDO.getOrderId())
                         .userId(applyDO.getApplyUserId())
+                        .fields(applyDO.getFields())
                         .build();
+            } else {
+                String originFields = recordDO.getFields();
+                OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(originFields, OrderCostInfolockFieldVO.class);
+                String fields = applyDO.getFields();
+                OrderCostInfolockFieldVO orderCostInfolockFieldVO = JSONObject.parseObject(fields, OrderCostInfolockFieldVO.class);
+                BeanUtil.copyProperties(orderCostInfolockFieldVO, originOrderCostInfolockFieldVO, CopyOptions.create().ignoreNullValue());
+                recordDO.setFields(JSONObject.toJSONString(originOrderCostInfolockFieldVO));
             }
-            recordDO.setFields(applyDO.getFields());
             if (Objects.isNull(recordDO.getId())) {
                 orderCostFieldLockRecordService.save(recordDO);
             } else {
@@ -15,6 +15,7 @@ import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.OrderLockFieldEnum;
 import com.order.erp.domain.ProjectApplyTypeEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
@@ -32,6 +33,7 @@ import com.order.erp.service.order.IProjectBaseInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.service.order.OrderBaseInfoService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFFont;
@@ -122,7 +124,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(ProjectApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
-                .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .eq(ProjectApplyDO::getStatus, StringUtils.isNotBlank(vo.getStatus())? ApplyStatusEnum.WAIT_AUDIT.getStatus():vo.getStatus())
                 .orderByDesc(ProjectApplyDO::getCreateTime)
                 .page(new Page<>(vo.getPage(), vo.getPageSize()));
         List<ProjectApplyDO> records = page.getRecords();
@@ -237,6 +239,9 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     }
     private List<InnerProfitInfoVO> buildInnerProfitInfos(List<OrderInfoResultVO> orderInfoResultVOS) {
+        if(CollUtil.isEmpty(orderInfoResultVOS)){
+            return Collections.emptyList();
+        }
         Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
                 .collect(Collectors.groupingBy(
                         order -> order.getProjectNo().substring(0, 8)
@@ -417,7 +422,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         List<SystemSettingDO> systemSettingDOS = systemSettingService.lambdaQuery()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(SystemSettingDO::getRelationCode, "costSettingItem")
-                .in(SystemSettingDO::getSettingValue, collect)
+                .func(query -> {
+                    if (CollUtil.isNotEmpty(collect)) {
+                        query.in(SystemSettingDO::getSettingValue, collect);
+                    } else {
+                        query.apply("1!=1");
+                    }
+                })
                 .list();
         Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
                 .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
@@ -446,10 +457,18 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
         List<BusinessProfitInfoVO> businessProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
+            ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
             BusinessProfitInfoVO businessProfitInfoVO = BusinessProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
-                    .lockFields(prjectNo2LockRecordMap.get(entry.getKey()))
+                    .lockFields(Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(ProjectBaseInfoLockFieldVO.builder()
+                            .actualExchangeRate( Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getActualExchangeRate()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .developmentCopyRmbTotalPrice(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .paidRmbCommission(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .projectEndTime(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getProjectEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .projectStartTime(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getProjectStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .spainPaidRmbCommission(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getSpainPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .build()))
                     .build();
             //客户总金额￥
@@ -540,7 +559,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             businessProfitInfoVO.setProduceEndTime(latest);
             //研发复制费合计￥  固定成本￥ 西班牙已发提成￥ 已发提成￥  实际汇率￥
             if (Objects.nonNull(noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey()))) {
-                ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
                 //研发复制费用
                 businessProfitInfoVO.setDevelopmentCopyRmbTotalPrice(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice());
                 //西班牙已付提成