feat:1.对于提成配置添加年份,为每一年的客户编码都添加配置,不再采用之前的,每一年的客户编码都采用同一个,例如:A06-2403,A06-2303以前都是…

…采用A06的提成配置,现在给每一个年份都有各自的提成配置,通过项目号A06-2303的第五位和第六位共同决定是属于哪一年,确定年之后再去查找对应的客户编码的提成配置。而在系统配置中,systemSettingDO表中是relationName来存储年份。 fix:1.业务研发净利润计算不正确的问题 1.1综合收益不再需要汇率收益计算。 1.2不在需要实际汇率参与计算

feat:1.对于提成配置添加年份,为每一年的客户编码都添加配置,不再采用之前的,每一年的客户编码都采用同一个,例如:A06-2403,A06-2303以前都是…
…采用A06的提成配置,现在给每一个年份都有各自的提成配置,通过项目号A06-2303的第五位和第六位共同决定是属于哪一年,确定年之后再去查找对应的客户编码的提成配置。而在系统配置中,systemSettingDO表中是relationName来存储年份。 fix:1.业务研发净利润计算不正确的问题 1.1综合收益不再需要汇率收益计算。 1.2不在需要实际汇率参与计算
chenhang4442024
1 parent 5c716366
Showing 22 changed files with 328 additions and 183 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/controller/ProjectController.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/OrderOptTypeEnum.java
src/main/java/com/order/erp/domain/ProjectApplyTypeEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderCostInfoDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseAfterReviewSettingDO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostDetailedOptedLogQueryVO.java
src/main/java/com/order/erp/domain/vo/order/ProjectApplyVO.java
src/main/java/com/order/erp/domain/vo/order/ProjectOptLogQueryVO.java
src/main/java/com/order/erp/service/impl/SystemSettingServiceImpl.java
src/main/java/com/order/erp/service/order/IOrderCostInfoService.java
src/main/java/com/order/erp/service/order/IProjectBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCostDetailedOptLogServiceImpl.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/ProjectBaseDevelopOptLogServiceImpl.java
@@ -163,7 +163,7 @@ public class Constant {
     public static final int FOURTEEN= 14;
     public static final Integer THIRTY = 30;
-    public static final int SIXTY = 60;
+    public static final Integer SIXTY = 60;
     public static final int TWENTY_FIRST = 21;
@@ -73,15 +73,15 @@ public class OrderCostController {
     @PostMapping("/setPackStatus")
     @ApiOperation("设置包装费用明细表的状态")
-    public void setPackStatus(@RequestBody OrderCostInfoVO vo) {
-        orderCostInfoService.setPackStatus(vo);
+    public ServerResult setPackStatus(@RequestBody OrderCostInfoVO vo) {
+       return orderCostInfoService.setPackStatus(vo);
     }
     @PostMapping("/setInnerStatus")
     @ApiOperation("设置内部生产明细表的状态")
-    public void setInnerProduceStatus(@RequestBody OrderCostInfoVO vo) {
-        orderCostInfoService.setInnerProduceStatus(vo);
+    public ServerResult setInnerProduceStatus(@RequestBody OrderCostInfoVO vo) {
+        return orderCostInfoService.setInnerProduceStatus(vo);
     }
 }
@@ -9,6 +9,7 @@ import com.order.erp.service.order.IProjectBaseInfoService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.Server;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -96,14 +97,14 @@ public class ProjectController {
     @PostMapping("/businessProfit/setStatus")
     @ApiOperation("业务研发净利润分析表审核状态设置")
-    public void setProjectBaseInfoDevelopmentStatus(@RequestBody OrderBaseInfoVO vo)  {
-        projectBaseInfoService.setProjectBaseInfoDevelopmentStatus(vo);
+    public ServerResult setProjectBaseInfoDevelopmentStatus(@RequestBody OrderBaseInfoVO vo)  {
+      return  projectBaseInfoService.setProjectBaseInfoDevelopmentStatus(vo);
     }
     //直接通过查询传递多个projectNo去查询。
     @PostMapping("/innerProfitInfo/setStatus")
     @ApiOperation("内部生产净利润分析表审核状态设置")
-    public void setInnerProductionStatus(@RequestBody OrderBaseInfoVO vo)  {
-        projectBaseInfoService.setInnerProductionStatus(vo);
+    public ServerResult setInnerProductionStatus(@RequestBody OrderBaseInfoVO vo)  {
+      return   projectBaseInfoService.setInnerProductionStatus(vo);
     }
 }
@@ -28,6 +28,11 @@ public enum ApplyTypeEnum {
     INVOICE_DEDUCT_URL(60,"INVOICE扣款单申请"),
     CHECK_DEDUCT_URL(70,"CHECK扣款单申请"),
+
+    ORDER_PACKET_COST_FIELD_EDIT_APPLY(80,"订单包装费用明细字段申请"),
+    ORDER_PACKET_COST_PASS(81,"订单包装费用明细表申请通过"),
+    ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY(90,"订单生产费用明细字段申请"),
+    ORDER_PRODUCTION_COST_APPLY(91,"订单生产费用明细申请通过"),
     ;
     private Integer type;
@@ -35,12 +35,14 @@ public enum OrderOptTypeEnum {
 //    PROJECT_DEVELOPMENT_FIELD_EDIT_APPLY(77,"业务研发净利润字段编辑申请"),
     PROJECT_COST_EDIT(80,"包装费用明细编辑"),
     PROJECT_COST_ADD(85,"包装费用明细创建"),
+    PROJECT_COST_PASS(87,"包装费用明细表审核通过"),
 //    PROJECT_COST_FIELD_EDIT_APPLY(87,"包装费用明细表字段编辑申请"),
     PROJECT_INNER_PRODUCE_EDIT(90,"内部生产净利润编辑"),
     PROJECT_INNER_PRODUCE_ADD(95,"内部生产净利润创建"),
 //    PROJECT_INNER_PRODUCE_FIELD_EDIT_APPLY(97,"内部生产净利润字段编辑申请"),
     PROJECT_INNER_PRODUCE_PROFIT_EDIT(100,"内部生产明细表编辑"),
     PROJECT_INNER_PRODUCE_PROFIT_ADD(105,"内部生产明细表创建"),
+    PROJECT_INNER_PRODUCE_PROFIT_PASS(107,"内部生产明细表审核通过"),
 //    PROJECT_INNER_PRODUCE_PROFIT_FIELD_EDIT_APPLY(107,"内部研发净明细表字段编辑申请"),
 package com.order.erp.domain;
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.fasterxml.jackson.annotation.JsonValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -17,6 +16,8 @@ public enum ProjectApplyTypeEnum {
     FIELD_EDIT_APPLY(0, "业务利润字段编辑申请"),
     INNER_PROFIT_FIELD_EDIT_APPLY(1, "内部利润字段编辑申请"),
+    PROJECT_APPLY_PASS(2, "业务研发净利润申请通过"),
+    INNER_PROJECT_APPLY_PASS(3, "内部研发净利润申请通过"),
     ;
     private Integer type;
@@ -43,6 +43,8 @@ public class OrderCostInfoDO extends BaseDO implements Serializable {
     private BigDecimal productionActualPrice;
     private BigDecimal packetActualRmbTotalPrice;
+    //生产科预算单价
+    private BigDecimal productionDepartmentPredictUnitPrice;
     //包装费用明细表状态。
     private Integer packStatus;
     //内部生产明细表状态。
@@ -22,6 +22,10 @@ public class ProjectBaseAfterReviewSettingDO {
      * */
     private String projectNoPrefix;
     /**
+     * 存储年份
+     * */
+    private String year;
+    /**
      * type=1代表为提成成本配置,type=2代表为生产科固定成本配置
      * */
     private Integer type;
@@ -68,7 +68,7 @@ public class InnerProfitDetailVO implements Serializable {
      * 生产科预算单价,由生产科预算金额/数量。
      */
     @ApiModelProperty(value = "生产科预算金额")
-    private BigDecimal productionDepartmentPredictUnitprice;
+    private BigDecimal productionDepartmentPredictUnitPrice;
     /**
@@ -26,5 +26,5 @@ public class OrderCostDetailedOptedLogQueryVO  extends BasePageVO implements Ser
     /**
      * 业务类型  20:包装费用明细表创建/编辑   40:对应内部生产明细表创建/编辑
      * */
-    private Integer type;
+    private List<Integer> type;
 }
@@ -52,7 +52,7 @@ public class ProjectApplyVO extends BaseDO implements Serializable {
     private String type;
     @ApiModelProperty(value = "锁定字段 json字符串")
-    private String fields;
+    private ProjectBaseInfoLockFieldVO fields;
     @ApiModelProperty(value = "状态：0 待审批，1 通过，2 拒绝")
     private Integer status;
@@ -26,5 +26,5 @@ public class ProjectOptLogQueryVO extends BasePageVO implements Serializable {
     /**
      * 业务类型  10:对应业务研发净利润创建/编辑   30:对应内部生产净利润创建/编辑
      * */
-    private Integer type;
+    private List<Integer> type;
 }
@@ -105,11 +105,16 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
      * @return
      */
     private LambdaQueryWrapper<SystemSettingDO> buildQueryByParam(SystemSettingQueryVO queryVO) {
-        return new LambdaQueryWrapper<SystemSettingDO>()
+        LambdaQueryWrapper<SystemSettingDO> settingDOLambdaQueryWrapper = new LambdaQueryWrapper<SystemSettingDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(StringUtils.isNotBlank(queryVO.getSettingCode()), SystemSettingDO::getSettingCode, queryVO.getSettingCode())
                 .eq(Objects.nonNull(queryVO.getSettingType()), SystemSettingDO::getSettingType, queryVO.getSettingType())
                 .eq(StringUtils.isNotBlank(queryVO.getRelationCode()), SystemSettingDO::getRelationCode, queryVO.getRelationCode());
+        //针对于客户提成配置和生产科固定成本单独进行筛选,因为需要年份筛选。
+        if(StringUtils.isNotBlank(queryVO.getRelationCode()) && (queryVO.getRelationCode().equals("costSettingItem") || queryVO.getRelationCode().equals("ProduceSettingItem"))){
+            settingDOLambdaQueryWrapper.eq(StringUtils.isNotBlank(queryVO.getRelationName()), SystemSettingDO::getRelationName, queryVO.getRelationName());
+        }
+        return settingDOLambdaQueryWrapper;
     }
     @Override
@@ -143,9 +148,10 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
                 SystemSettingDO systemSettingDO = getOne(new LambdaQueryWrapper<SystemSettingDO>()
                         .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(SystemSettingDO::getSettingValue, systemSettingVO.getSettingValue())
-                        .eq(SystemSettingDO::getSettingType,systemSettingVO.getSettingType()));
+                        .eq(SystemSettingDO::getSettingType,systemSettingVO.getSettingType())
+                        .eq(SystemSettingDO::getRelationName,systemSettingVO.getRelationName()));
                 if(Objects.nonNull(systemSettingDO)){
-                    throw new BusinessException("已配置"+systemSettingVO.getSettingValue()+"的提成数据！");
+                    throw new BusinessException("已配置"+systemSettingVO.getSettingValue()+"对应"+systemSettingDO.getRelationName()+"年份的提成数据！");
                 }
             }
 //            systemSettingVO.setRelationCode("costSettingItem");
@@ -30,6 +30,6 @@ public interface IOrderCostInfoService extends IService&lt;OrderCostInfoDO&gt; {
     ServerResult listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO);
     void exportBusinessProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception;
     void exportInnerProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception;
-    void setPackStatus(OrderCostInfoVO vo);
-    void setInnerProduceStatus(OrderCostInfoVO vo);
+    ServerResult setPackStatus(OrderCostInfoVO vo);
+    ServerResult setInnerProduceStatus(OrderCostInfoVO vo);
 }
@@ -36,6 +36,6 @@ public interface IProjectBaseInfoService extends IService&lt;ProjectBaseInfoDO&gt; {
     void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
     void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
-    void setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo);
-    void setInnerProductionStatus(OrderBaseInfoVO vo);
+    ServerResult setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo);
+    ServerResult setInnerProductionStatus(OrderBaseInfoVO vo);
 }
@@ -41,6 +41,7 @@ import com.order.erp.service.admin.AdminUserRoleService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
 import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,7 +68,7 @@ public class OrderCostDetailedOptLogServiceImpl extends ServiceImpl&lt;OrderCostDet
         return new LambdaQueryWrapper<OrderCostDetailedOptLogDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getOrderId()), OrderCostDetailedOptLogDO::getOrderId, queryVO.getOrderId())
-                .eq(Objects.nonNull(queryVO.getType()), OrderCostDetailedOptLogDO::getType, queryVO.getType())
+                .in(CollectionUtils.isNotEmpty(queryVO.getType()), OrderCostDetailedOptLogDO::getType, queryVO.getType())
                 .orderByDesc(OrderCostDetailedOptLogDO::getId);
     }
@@ -17,6 +17,7 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.*;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
@@ -31,6 +32,7 @@ import com.order.erp.service.IOrderCostFieldLockRecordService;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.order.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,9 +41,14 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 /**
@@ -66,6 +73,10 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     private SystemSettingService systemSettingService;
     @Autowired
     private OrderCostDetailedOptLogService orderCostDetailedOptLogService;
+    @Autowired
+    private RedisUtils redisUtils;
+    @Autowired
+    private TransactionHelper transactionHelper;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -111,16 +122,14 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             //编辑包装费用实际金额之后状态为待审核
             /*需要考虑一个问题,假如状态为已通过,但是没有进行任何的修改而点击了确认,那么它的状态会由已审核变为待审核,所以需要进行判断一下,此次传递来的数据是否与上一次的数据一致,如果不一致则需要进行状态设置*/
             if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
-                    && oldOrderCostInfoDO.getPacketActualRmbTotalPrice().compareTo(vo.getPacketActualRmbTotalPrice()) == 0){
+                    && vo.getPacketActualRmbTotalPrice().compareTo(oldOrderCostInfoDO.getPacketActualRmbTotalPrice()) == 0){
             }else{
                 orderCostInfoDO.setPackStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
-        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictUnitPrice())) {
-            //todo 以前是直接填写总价,现在是填写单价,然后乘以数量自动计算总价,需要前端传递一个数量参数过来。
-            vo.setProductionDepartmentPredictPrice(vo.getProductionDepartmentPredictUnitPrice().multiply(BigDecimal.valueOf(vo.getOrderCount())));
-            orderCostInfoDO.setProductionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice());
+        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictPrice()) || Objects.nonNull(vo.getProductionDepartmentPredictUnitPrice())) {
             originOrderCostInfolockFieldVO.setProductionActualPrice(OrderLockFieldEnum.LOCKED.name());
             originOrderCostInfolockFieldVO.setProductionDepartmentPredictPrice(OrderLockFieldEnum.LOCKED.name());
+            originOrderCostInfolockFieldVO.setProductionDepartmentPredictUnitPrice(OrderLockFieldEnum.LOCKED.name());
             type=ProjectOptTypeEnum.INTERNAL_PRODUCE_DETAILS_TYPE.getType();
             operationDesc = isUpdate
                     ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_EDIT.getDesc()
@@ -128,9 +137,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             //编辑生产科预算金额和实际发生费用之后状态为待审核
             /*也需要考虑问题,假如状态为已通过,但是没有进行任何修改二点击了确认,那么它的状态会由已审核变为待审核*/
             if(isUpdate &&  ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getInnerProduceStatus()) &&
-                    oldOrderCostInfoDO.getProductionActualPrice().compareTo(vo.getProductionActualPrice()) ==0 &&
-                    //前端传递的是单价和数量,但是后端只是保存了总价,所以需要进行判断一下,此次传递来的数据和上一次的数据是否一致,如果不一致则需要进行状态设置
-                    oldOrderCostInfoDO.getProductionDepartmentPredictPrice().compareTo(vo.getProductionDepartmentPredictUnitPrice().multiply(BigDecimal.valueOf(vo.getOrderCount()))) ==0){
+                    vo.getProductionActualPrice().compareTo(oldOrderCostInfoDO.getProductionActualPrice()) ==0 &&
+                    vo.getProductionDepartmentPredictPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictPrice()) ==0 &&
+            vo.getProductionDepartmentPredictUnitPrice().compareTo(oldOrderCostInfoDO.getProductionDepartmentPredictUnitPrice()) == 0){
             }else{
                 orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
@@ -165,20 +174,22 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
                 .orderId(vo.getOrderId())
                 .applyUserId(dataScope.getLoginUserId())
+                //无论是订单生产费用明细字段申请还是订单生产费用明细字段申请,都是管理员审批,但是这里加上财务人员的目的是为财务人员能够在待审核列表中查看到申请,而不是给财务人员审批的。
+                .auditRoleCodes(RoleEnum.ADMIN.getCode()+Constant.COMMA_CHARACTER+RoleEnum.FINANCE_USER.getCode())
                 .applyRemark(vo.getApplyRemark())
                 .fields(JSONObject.toJSONString(lockField))
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .type(vo.getType())
-                .remark(OrderCostApplyTpeEnum.getNameByType(vo.getType()))
+                .remark(ApplyTypeEnum.getNameByType(vo.getType()))
                 .build();
         orderFieldLockApplyService.save(build);
         //进行审批记录的保存。需要前端在申请字段申请时传递这条数据的id。
-        if(OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType().equals(vo.getType())){
-         applyType=OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType();
+        if(ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType().equals(vo.getType())){
+         applyType=ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType();
         }else{
-         applyType=OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
+         applyType=ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
         }
-        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(),applyType,OrderCostApplyTpeEnum.getNameByType(applyType),JSONObject.toJSONString(lockField)));
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(),applyType,ApplyTypeEnum.getNameByType(applyType),JSONObject.toJSONString(lockField)));
         return ServerResult.success();
     }
@@ -212,17 +223,25 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId()))
                     .orElse(new OrderCostInfolockFieldVO()
                     );
-            if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
-                lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProductionActualPrice())){
-                lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
-                lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProductionDepartmentPredictUnitPrice())){
-                lockFields.setProductionDepartmentPredictUnitPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictUnitPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            if(Objects.nonNull(orderCostInfo)&& ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getInnerProduceStatus())){
+                if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+                    lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProductionActualPrice())){
+                    lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                    lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProductionDepartmentPredictUnitPrice())){
+                    lockFields.setProductionDepartmentPredictUnitPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictUnitPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+            }else{
+                lockFields.setPacketActualRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProductionActualPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProductionDepartmentPredictPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProductionDepartmentPredictUnitPrice(OrderLockFieldEnum.UN_LOCKED.name());
+
             }
             InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
                     .orderId(record.getId())
@@ -235,6 +254,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .productionDepartmentPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentPrice())
                     .productionDepartmentTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentTotalPrice())
                     .productionDepartmentPredictPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictPrice())
+                    .productionDepartmentPredictUnitPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictUnitPrice())
                     .productionActualPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionActualPrice())
                     .innerProduceStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getInnerProduceStatus()))  ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getInnerProduceStatus())
                     .lockFields(lockFields)
@@ -268,9 +288,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     vo.setGrossProfitRate(vo.getGrossProfit().divide(BigDecimal.valueOf(vo.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
                 }
             }
-            if(Objects.nonNull(vo.getProductionDepartmentPredictPrice())){
-                vo.setProductionDepartmentPredictUnitprice(vo.getProductionDepartmentPredictPrice().divide(BigDecimal.valueOf(record.getOrderCount()), 2, RoundingMode.HALF_UP));
-            }
+//            if(Objects.nonNull(vo.getProductionDepartmentPredictPrice())){
+//                vo.setProductionDepartmentPredictUnitPrice(vo.getProductionDepartmentPredictPrice().divide(BigDecimal.valueOf(record.getOrderCount()), 2, RoundingMode.HALF_UP));
+//            }
             return vo;
         }).collect(Collectors.toList());
         Page<InnerProfitDetailVO> webVOPage = new Page<>();
@@ -312,14 +332,20 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             OrderCostInfolockFieldVO lockFields = Optional.ofNullable(orderId2fieldMapMap.get(record.getId())).orElse(
                     new OrderCostInfolockFieldVO()
             );
-            if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
-                lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProductionActualPrice())){
-                lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
-                lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            if(Objects.nonNull(orderCostInfo) && ProfitStatusEnum.APPROVED.getStatus().equals(orderCostInfo.getPackStatus())){
+                if(Objects.isNull(lockFields.getPacketActualRmbTotalPrice())){
+                    lockFields.setPacketActualRmbTotalPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getPacketActualRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProductionActualPrice())){
+                    lockFields.setProductionActualPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionActualPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
+                    lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+            }else{
+                lockFields.setPacketActualRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProductionActualPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProductionDepartmentPredictPrice(OrderLockFieldEnum.UN_LOCKED.name());
             }
             BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
                     .orderId(record.getId())
@@ -423,6 +449,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
         OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
+                .productionDepartment(Collections.singletonList("内部"))
                 .page(1)
                 .pageSize(200); //设置大一点，确保导出数据不遗漏
         if(CollectionUtils.isNotEmpty(queryVO.getOrderIds())){
@@ -464,7 +491,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     }
     @Override
-    public void setPackStatus(OrderCostInfoVO vo) {
+    public ServerResult setPackStatus(OrderCostInfoVO vo) {
         //首先判断orderId是否为空。
         if(Objects.isNull(vo.getOrderId())){
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
@@ -477,11 +504,21 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             throw new BusinessException(ServerResultCode.EMPTY_LIST);
         }
         orderCostInfoDO.setPackStatus(ProfitStatusEnum.APPROVED.getStatus());
-        updateById(orderCostInfoDO);
+        //还需要对审核通过也进行记录  81  91
+        OrderCostInfoVO orderCostInfoVO=new OrderCostInfoVO();
+        BeanUtils.copyProperties(orderCostInfoDO,orderCostInfoVO);
+        transactionHelper.run(() -> {
+            orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()),dataScope.getLoginUserId()
+                    ,ApplyTypeEnum.ORDER_PACKET_COST_PASS.getType()
+                    ,ApplyTypeEnum.ORDER_PACKET_COST_PASS.getDesc()
+                    ,JSONObject.toJSONString(orderCostInfoVO)));
+            updateById(orderCostInfoDO);
+        });
+        return ServerResult.success();
     }
     @Override
-    public void setInnerProduceStatus(OrderCostInfoVO vo) {
+    public ServerResult setInnerProduceStatus(OrderCostInfoVO vo) {
         if(Objects.isNull(vo.getOrderId())){
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
@@ -493,7 +530,15 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             throw new BusinessException(ServerResultCode.EMPTY_LIST);
         }
        orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.APPROVED.getStatus());
+        OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
+        BeanUtils.copyProperties(orderCostInfoDO, orderCostInfoVO);
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo((vo.getOrderId()),dataScope.getLoginUserId()
+                ,ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getType()
+                ,ApplyTypeEnum.ORDER_PRODUCTION_COST_APPLY.getDesc()
+                ,JSONObject.toJSONString(orderCostInfoVO)));
+        updateById(orderCostInfoDO);
         updateById(orderCostInfoDO);
+        return ServerResult.success();
     }
@@ -513,7 +558,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         return orderCostInfoVO;
     }
-    private List<Map<String,Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS,ProjectBaseInfoQueryVO queryVO){
+    private List<Map<String,Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS,ProjectBaseInfoQueryVO queryVO) throws IOException {
         List<Map<String,Object>> list= new ArrayList<>();
         for(BusinessProfitDetailVO vo:businessProfitDetailVOS){
             Map<String, Object> map = new LinkedHashMap<>();
@@ -521,7 +566,13 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             map.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
             map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
             map.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
-            map.put("图片地址",Objects.nonNull(vo.getPicUrl()) ? vo.getPicUrl() : "");
+            if(StringUtils.isNotBlank(vo.getPicUrl())){
+                URL url = new URL(vo.getPicUrl());
+                InputStream inputStream = url.openStream();
+                map.put("订单图片", FileUtil.imageParseBytes(inputStream));
+            }else{
+                map.put("订单图片", "");
+            }
             map.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
             map.put("包装费用$",Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f",vo.getPacketPrice()) : "");
             map.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : "");
@@ -539,7 +590,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         return list;
     }
-    private List<Map<String,Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO){
+    private List<Map<String,Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO) throws IOException {
         List<Map<String,Object>> list = new ArrayList<>();
         for (InnerProfitDetailVO vo:innerProfitDetailVOS){
             Map<String, Object> hashMap = new LinkedHashMap<>();
@@ -547,7 +598,13 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             hashMap.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
             hashMap.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
             hashMap.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
-            hashMap.put("图片地址",Objects.nonNull(vo.getPicUrl()) ? vo.getPicUrl() : "");
+            if(StringUtils.isNotBlank(vo.getPicUrl())){
+                URL url = new URL(vo.getPicUrl());
+                InputStream inputStream = url.openStream();
+                hashMap.put("订单图片", FileUtil.imageParseBytes(inputStream));
+            }else{
+                hashMap.put("订单图片", "");
+            }
             hashMap.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
             hashMap.put("生产科单价￥",Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f",vo.getProductionDepartmentPrice()) : "");
             hashMap.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");
@@ -133,9 +133,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
                     // todo
-                    if (Stream.of(OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
-                                    OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
-                            .map(OrderCostApplyTpeEnum::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());
@@ -436,9 +436,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
         }
         Set<Long> orderIds = new HashSet<>();
+//        List<Integer> typeIn = Arrays.asList(ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType(), ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType());
         //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。   限制情况为跟单业务,对应收款,应付款,发票审核请求时。
 //        queryVO.getType==Constant.SIXTY完全是为了跟单和业务对于应收账单类型请求时,屏蔽掉应收账单,只展示invoice扣款单申请数据。
-        if(queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050 || queryVO.getType()==Constant.SIXTY){
+        if(Constant.THIRTY.equals(queryVO.getType()) || Integer.valueOf(4050).equals(queryVO.getType()) || Constant.SIXTY.equals(queryVO.getType()) ){
         } else {
             /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
@@ -1190,9 +1191,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             invoiceAndCheckBillSendEmailVO.setDeductionUrlFieldVO(deductionUrlFieldVO);
             emailSendUtils.sendInvoiceAndCheckEmail(FinanceOverEnum.CHECK_DEDUCTURL_PASS,invoiceAndCheckBillSendEmailVO,true);
             //todo
-        } else if (Stream.of(OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
-                        OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
-                .map(OrderCostApplyTpeEnum::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());
@@ -66,7 +66,7 @@ public class ProjectBaseDevelopOptLogServiceImpl extends ServiceImpl&lt;ProjectBase
         return new LambdaQueryWrapper<ProjectBaseDevelopOptLogDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getProjectNoPrefix()), ProjectBaseDevelopOptLogDO::getProjectNoPrefix, queryVO.getProjectNoPrefix())
-                .eq(Objects.nonNull(queryVO.getType()), ProjectBaseDevelopOptLogDO::getType, queryVO.getType())
+                .in(CollectionUtils.isNotEmpty(queryVO.getType()), ProjectBaseDevelopOptLogDO::getType, queryVO.getType())
                 .orderByDesc(ProjectBaseDevelopOptLogDO::getId);
     }
 }
 \ No newline at end of file
@@ -139,14 +139,14 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     ? OrderOptTypeEnum.PROJECT_DEVELOPMENT_PROFIT_EDIT.getDesc()
                     : OrderOptTypeEnum.PROJECT_DEVELOPMENT_PROFIT_ADD.getDesc();
             /*这里还需要考虑一下,对于状态已经是已审批的状态,但是在编辑数据时没有发生任何改变,也需要重新设置为待审核状态吗？不需要,这里处理一下,对于这种情况就不需要重新设置状态*/
-            if(isUpdate && oldProjectBaseInfoDO.getDevelopmentStatus().equals(ProfitStatusEnum.APPROVED.getStatus()) &&
-                    oldProjectBaseInfoDO.getProjectStartTime().isEqual(vo.getProjectStartTime()) &&
-                    oldProjectBaseInfoDO.getProjectEndTime().isEqual(vo.getProjectEndTime()) &&
-                    oldProjectBaseInfoDO.getDevelopmentCopyRmbTotalPrice().compareTo(vo.getDevelopmentCopyRmbTotalPrice()) == 0 &&
-                    oldProjectBaseInfoDO.getSpainPaidRmbCommission().compareTo(vo.getSpainPaidRmbCommission()) == 0 &&
-                    oldProjectBaseInfoDO.getPaidRmbCommission().compareTo(vo.getPaidRmbCommission()) == 0 &&
+            if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldProjectBaseInfoDO.getDevelopmentStatus()) &&
+                    vo.getProjectStartTime().toLocalDate().isEqual(oldProjectBaseInfoDO.getProjectStartTime().toLocalDate()) &&
+                    vo.getProjectEndTime().toLocalDate().isEqual(oldProjectBaseInfoDO.getProjectEndTime().toLocalDate()) &&
+                    vo.getDevelopmentCopyRmbTotalPrice().compareTo(oldProjectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) == 0 &&
+                    vo.getSpainPaidRmbCommission().compareTo(oldProjectBaseInfoDO.getSpainPaidRmbCommission()) == 0 &&
+                    vo.getPaidRmbCommission().compareTo(oldProjectBaseInfoDO.getPaidRmbCommission()) == 0
                     //todo 这个实际汇率是否需要,需要讨论。
-                    oldProjectBaseInfoDO.getActualExchangeRate().compareTo(vo.getActualExchangeRate()) == 0
+//                    vo.getActualExchangeRate().compareTo(oldProjectBaseInfoDO.getActualExchangeRate()) == 0
             ){
             }else{
                 projectBaseInfoDO.setDevelopmentStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
@@ -158,9 +158,9 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             operationDesc = isUpdate
                     ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_EDIT.getDesc()
                     : OrderOptTypeEnum.PROJECT_INNER_PRODUCE_ADD.getDesc();
-            if(isUpdate && oldProjectBaseInfoDO.getInnerProductionStatus().equals(ProfitStatusEnum.APPROVED.getStatus()) &&
-                    oldProjectBaseInfoDO.getProjectInnerProfitInfoStartTime().isEqual(vo.getProjectInnerProfitInfoStartTime()) &&
-                    oldProjectBaseInfoDO.getProjectInnerProfitInfoEndTime().isEqual(vo.getProjectInnerProfitInfoEndTime())){
+            if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldProjectBaseInfoDO.getInnerProductionStatus()) &&
+                    vo.getProjectInnerProfitInfoStartTime().toLocalDate().isEqual(oldProjectBaseInfoDO.getProjectInnerProfitInfoStartTime().toLocalDate()) &&
+                    vo.getProjectInnerProfitInfoEndTime().toLocalDate().isEqual(oldProjectBaseInfoDO.getProjectInnerProfitInfoEndTime().toLocalDate())){
             }else{
                 projectBaseInfoDO.setInnerProductionStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
             }
@@ -215,7 +215,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         }else{
             applyType=ProjectApplyTypeEnum.INNER_PROFIT_FIELD_EDIT_APPLY.getType();
         }
-        String descByName = ProjectApplyTypeEnum.getDescByName(vo.getType());
 //        ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = buildProjectBaseInfoLockFieldVO(vo);
         projectBaseDevelopOptLogService.save(buildProjectOptLogDo(vo.getProjectNoPrefix(), dataScope.getLoginUserId(),applyType,ProjectApplyTypeEnum.getDescByName(vo.getType()),JSONObject.toJSONString(projectBaseInfoLockFieldVO)));
         return ServerResult.success();
@@ -235,7 +234,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             return buildPageResult(page, Collections.emptyList());
         }
         List<ProjectApplyVO> collect = records.stream().map(e -> {
-            ProjectApplyVO projectApplyVO = BeanUtil.copyProperties(e, ProjectApplyVO.class);
+            ProjectApplyVO projectApplyVO = BeanUtil.copyProperties(e, ProjectApplyVO.class,"fields");
+            projectApplyVO.setFields(JSON.parseObject(e.getFields(), ProjectBaseInfoLockFieldVO.class));
             return projectApplyVO;
         }).collect(Collectors.toList());
         return ServerResult.success(buildPageResult(page, collect));
@@ -423,8 +423,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .eq(SystemSettingDO::getRelationCode, "ProduceSettingItem")
                 .in(SystemSettingDO::getSettingValue, collect)
                 .list();
-        Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
-                .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
+        Map<String, List<SystemSettingDO>> systemSettingDOSMap = systemSettingDOS.stream()
+                .collect(Collectors.groupingBy(SystemSettingDO::getSettingValue));
         List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
                 .lambdaQuery()
                 .func(query -> {
@@ -452,20 +452,27 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .in(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, orderInfoResultVOS.stream()
                         .map(OrderBaseInfoVO::getProjectNo)
                         .collect(Collectors.toSet())));
-        Map<String, ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS
+        Map<String, List<ProjectBaseAfterReviewSettingDO>> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS
                 .stream()
-                .collect(Collectors.toMap(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, Function.identity(), (x, y) -> x));
+                .collect(Collectors.groupingBy(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix));
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             ProjectBaseInfoDO projectBaseInfoDO = no2ProjectInfoMap.get(entry.getKey());
             List<OrderInfoResultVO> details = entry.getValue();
+            //当状态为未审批时,就一直为UNLOCKED,能够一直修改。当通过之后就需要进行申请了。
             ProjectBaseInfoLockFieldVO lockFields = Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(
                     new ProjectBaseInfoLockFieldVO());
-            if(Objects.isNull(lockFields.getProjectInnerProfitInfoStartTime())){
-                lockFields.setProjectInnerProfitInfoStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
-            }
-            if(Objects.isNull(lockFields.getProjectInnerProfitInfoEndTime())){
-                lockFields.setProjectInnerProfitInfoEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            if(Objects.nonNull(projectBaseInfoDO) && ProfitStatusEnum.APPROVED.getStatus().equals(projectBaseInfoDO.getInnerProductionStatus())){
+                if(Objects.isNull(lockFields.getProjectInnerProfitInfoStartTime())){
+                    lockFields.setProjectInnerProfitInfoStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProjectInnerProfitInfoEndTime())){
+                    lockFields.setProjectInnerProfitInfoEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectInnerProfitInfoEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+            }else{
+                lockFields.setProjectInnerProfitInfoStartTime( OrderLockFieldEnum.UN_LOCKED.name() );
+                lockFields.setProjectInnerProfitInfoEndTime( OrderLockFieldEnum.UN_LOCKED.name());
             }
+
             InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
@@ -556,9 +563,14 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             ;
             innerProfitInfoVO.setProduceStartTime(earliest);
             innerProfitInfoVO.setProduceEndTime(latest);
-            SystemSettingDO systemSettingDO = systemSettingDOSMap.get(innerProfitInfoVO.getCustomerCode());
-            if (Objects.nonNull(systemSettingDO)) {
-                String relationValue = systemSettingDO.getRelationValue();
+            Optional<SystemSettingDO> systemSettingDO = systemSettingDOSMap.values().stream()
+                    .flatMap(List::stream)
+                    .filter(setting -> setting.getSettingValue().equals(details.get(0).getCustomerCode()))
+                    .filter(setting -> setting.getRelationName().substring(2, 4).equals(entry.getKey().substring(4, 6)))
+                    .findFirst();
+
+            if (systemSettingDO.isPresent()) {
+                String relationValue = systemSettingDO.get().getRelationValue();
                 try {
                     // 将 JSON 字符串解析为 List<Map<String, String>>
                     List<Map<String, String>> relations = objectMapper.readValue(relationValue, objectMapper.getTypeFactory().constructCollectionType(List.class, Map.class));
@@ -573,10 +585,15 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             ratioValue = relation.get("relationValue");
                         }
                     }
-                    //在这里进行覆盖
-                    if(Objects.nonNull(projectBaseAfterReviewSettingDOMap.get(entry.getKey()))){
-                        fixCostValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getFixedCost().toString();
-                        ratioValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getCommissionUnitPrice().toString();
+//                    在这里进行覆盖
+                    Optional<ProjectBaseAfterReviewSettingDO> first = projectBaseAfterReviewSettingDOMap.values().stream()
+                            .flatMap(List::stream)
+                            .filter(item -> item.getProjectNoPrefix().equals(entry.getKey()))
+                            .filter(item -> item.getYear().equals("20" + entry.getKey().substring(4, 6)))
+                            .findFirst();
+                    if(first.isPresent()){
+                        fixCostValue=first.get().getFixedCost().toString();
+                        ratioValue=first.get().getCommissionUnitPrice().toString();
                     }
                     if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(fixCostValue)
                             && Objects.nonNull(earliest)
@@ -585,6 +602,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         //内部生产固定成本￥
                         innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf((duration.toDays() + 1) * Double.parseDouble(fixCostValue)));
                     }
+                    //如果超出预算5%就没有提成,就需要设置为0
+                    innerProfitInfoVO.setInnerProductionCommission(BigDecimal.ZERO);
                     if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(ratioValue)
                             && Objects.nonNull(innerProfitInfoVO.getPredictRatio())
                             && innerProfitInfoVO.getPredictRatio().compareTo(BigDecimal.valueOf(1.05)) < 0) {
@@ -661,8 +680,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     }
                 })
                 .list();
-        Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
-                .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
+        Map<String, List<SystemSettingDO>> systemSettingDOSMap = systemSettingDOS.stream()
+                .collect(Collectors.groupingBy(SystemSettingDO::getSettingValue));
         ObjectMapper objectMapper = new ObjectMapper();
         BigDecimal systemExchangeRate = systemSettingService.getExchangeRate();
         List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
@@ -686,11 +705,12 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     }
                 }));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
-        //查询永久已保存的配置。
+        //查询永久已保存的配置。 如果永久保存配置没有,就去查询系统配置进行显示。
         List<ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOS = projectBaseAfterReviewSettingService.list(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
                 .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
                 .in(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix,projectNoPrefix));
-        Map<String, ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS.stream().collect(Collectors.toMap(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, Function.identity(), (x, y) -> x));
+        Map<String, List<ProjectBaseAfterReviewSettingDO>> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS.stream()
+                .collect(Collectors.groupingBy(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix));
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
             ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
@@ -701,16 +721,36 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     .detailProjectNo(detailProjectNoMap.get(entry.getKey()))
                     //返回状态。
                     .developmentStatus((Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getDevelopmentStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : projectBaseInfoDO.getDevelopmentStatus())
-                    .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();
-
+            ProjectBaseInfoLockFieldVO lockFields = Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(new ProjectBaseInfoLockFieldVO());
+            if(Objects.nonNull(projectBaseInfoDO) && ProfitStatusEnum.APPROVED.getStatus().equals(projectBaseInfoDO.getDevelopmentStatus())){
+                if(Objects.isNull(lockFields.getActualExchangeRate())){
+                    lockFields.setActualExchangeRate(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getActualExchangeRate()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getDevelopmentCopyRmbTotalPrice())){
+                    lockFields.setDevelopmentCopyRmbTotalPrice(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() :OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getPaidRmbCommission())){
+                    lockFields.setPaidRmbCommission(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProjectEndTime())){
+                    lockFields.setProjectEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getProjectStartTime())){
+                    lockFields.setProjectStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+                if(Objects.isNull(lockFields.getSpainPaidRmbCommission())){
+                    lockFields.setSpainPaidRmbCommission(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getSpainPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+                }
+            }else{
+                lockFields.setActualExchangeRate(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setDevelopmentCopyRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setPaidRmbCommission(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProjectEndTime(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setProjectStartTime(OrderLockFieldEnum.UN_LOCKED.name());
+                lockFields.setSpainPaidRmbCommission(OrderLockFieldEnum.UN_LOCKED.name());
+            }
+            businessProfitInfoVO.setLockFields(lockFields);
             //客户总金额￥
             details.stream()
                     .map(OrderInfoResultVO::getProfitAnalysisInfo)
@@ -806,19 +846,23 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 //已付提成
                 businessProfitInfoVO.setPaidRmbCommission(projectBaseInfoDO.getPaidRmbCommission());
                 //实际汇率
-                businessProfitInfoVO.setActualExchangeRate(projectBaseInfoDO.getActualExchangeRate());
+//                businessProfitInfoVO.setActualExchangeRate(projectBaseInfoDO.getActualExchangeRate());
                 //项目开始时间
                 businessProfitInfoVO.setProjectStartTime(projectBaseInfoDO.getProjectStartTime());
                 //项目结束时间
                 businessProfitInfoVO.setProjectEndTime(projectBaseInfoDO.getProjectEndTime());
                 //生产开始时间
+                Optional<SystemSettingDO> optionalSetting = systemSettingDOSMap.values().stream()
+                        .flatMap(List::stream)
+                        .filter(setting -> setting.getSettingValue().equals(details.get(0).getCustomerCode()))
+                        .filter(setting -> setting.getRelationName().substring(2, 4).equals(entry.getKey().substring(4, 6)))
+                        .findFirst();
                 if (Objects.nonNull(projectBaseInfoDO.getProjectStartTime())
-                        && Objects.nonNull(projectBaseInfoDO.getProjectEndTime())
-                        && Objects.nonNull(systemSettingDOSMap.get(details.get(0).getCustomerCode()))) {
-
+                        && Objects.nonNull(projectBaseInfoDO.getProjectEndTime()) &&
+                        optionalSetting.isPresent()){
                     //获取固定成本、提成比率、西班牙提成比例
                     long between = ChronoUnit.DAYS.between(projectBaseInfoDO.getProjectStartTime(), projectBaseInfoDO.getProjectEndTime());
-                    SystemSettingDO systemSettingDO = systemSettingDOSMap.get(details.get(0).getCustomerCode());
+                    SystemSettingDO systemSettingDO = optionalSetting.get();
                     String relationValue = systemSettingDO.getRelationValue();
                     List<Map<String, String>> relations = null;
                     try {
@@ -839,11 +883,20 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         }
                     }
                     //在这里进行判断,能够对上述的配置进行覆盖,如果永久已保存的配置中包含这个项目号的数据,则采用永久已保存的配置中,否则采用当前配置(对于已审核的数据,如果采用当前配置肯定会出错。)。
-                    if(Objects.nonNull(projectBaseAfterReviewSettingDOMap.get(entry.getKey()))){
-                      fixCostValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getFixedCost().toString();
-                      ratio=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getCommissionRate().toString();
-                      spainRatio=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getSpainCommissionRate().toString();
+                    Optional<ProjectBaseAfterReviewSettingDO> first = projectBaseAfterReviewSettingDOMap.values().stream()
+                            .flatMap(List::stream)
+                            .filter(item -> item.getProjectNoPrefix().equals(entry.getKey()))
+                            .filter(item -> item.getYear().equals("20" + entry.getKey().substring(4, 6)))
+                            .findFirst();
+
+                    if(first.isPresent()){
+                      fixCostValue=first.get().getFixedCost().toString();
+                      ratio=first.get().getCommissionRate().toString();
+                      spainRatio=first.get().getSpainCommissionRate().toString();
                     }
+                    //上述代码不确定对不对。
+
+
                     //固定成本
                     businessProfitInfoVO.setFixedCost(BigDecimal.valueOf((between + 1) * Double.parseDouble(fixCostValue)).setScale(2, RoundingMode.HALF_UP));
                     if (Objects.nonNull(spainRatio)
@@ -868,15 +921,16 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         businessProfitInfoVO.setUnpaidRmbCommission(businessProfitInfoVO.getRmbCommission().subtract(projectBaseInfoDO.getPaidRmbCommission()).setScale(2, RoundingMode.HALF_UP));
                     }
                 }
-                if (Objects.nonNull(businessProfitInfoVO.getActualExchangeRate())
+                //不需要汇率收益参与计算了。
+              /*  if (Objects.nonNull(businessProfitInfoVO.getActualExchangeRate())
                         && Objects.nonNull(businessProfitInfoVO.getCustomerTotalPrice())) {
                     businessProfitInfoVO.setExchangeRateProfit(BigDecimal.valueOf(businessProfitInfoVO.getCustomerTotalPrice())
                             .multiply(businessProfitInfoVO.getActualExchangeRate().subtract(systemExchangeRate)));
-                }
+                }*/
             }
             //支出合计
-            businessProfitInfoVO.setRmbTotalExpense(Optional.ofNullable(businessProfitInfoVO.getSpainPaidRmbCommission()).orElse(BigDecimal.ZERO)
-                    .add(Optional.ofNullable(businessProfitInfoVO.getPaidRmbCommission()).orElse(BigDecimal.ZERO))
+            businessProfitInfoVO.setRmbTotalExpense(Optional.ofNullable(businessProfitInfoVO.getSpainRmbCommission()).orElse(BigDecimal.ZERO)
+                    .add(Optional.ofNullable(businessProfitInfoVO.getRmbCommission()).orElse(BigDecimal.ZERO))
                     .add(Optional.ofNullable(businessProfitInfoVO.getFixedCost()).orElse(BigDecimal.ZERO))
                     .add(Optional.ofNullable(businessProfitInfoVO.getDevelopmentCopyRmbTotalPrice()).orElse(BigDecimal.ZERO))
                     .add(BigDecimal.valueOf(Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).orElse(0.0)))
@@ -909,7 +963,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             businessProfitInfoVO.setComprehensiveProfit(Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).orElse(BigDecimal.ZERO)
                     //综合收益不需要汇率收益计算。
 //                    .add(Optional.ofNullable(businessProfitInfoVO.getExchangeRateProfit()).orElse(BigDecimal.ZERO))
-                    .add(Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).orElse(BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));
+                    .add(Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice()).orElse(BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));
             return businessProfitInfoVO;
         }).collect(Collectors.toList());
     }
@@ -988,13 +1042,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 28, 29, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfit()).map(price -> "￥" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 28, 29, 7, 9, "");
         createMergedRow(sheet, cellStyle, 30, 31, 0, 4, "毛利率");
-        createMergedRow(sheet, cellStyle, 30, 31, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 30, 31, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 30, 31, 7, 9, "");
         createMergedRow(sheet, cellStyle, 32, 33, 0, 4, "研发贸易净利润");
         createMergedRow(sheet, cellStyle, 32, 33, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).map(price -> "￥" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 32, 33, 7, 9, "");
         createMergedRow(sheet, cellStyle, 34, 35, 0, 4, "研发贸易净利润率");
-        createMergedRow(sheet, cellStyle, 34, 35, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 34, 35, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 34, 35, 7, 9, "");
         createMergedRow(sheet, cellStyle, 36, 37, 0, 4, "包装费用合计金额");
         createMergedRow(sheet, cellStyle, 36, 37, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
@@ -1019,7 +1073,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice())
                         .map(totalPrice -> Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice())
                                 .orElse(BigDecimal.valueOf(0))
-                                .divide(BigDecimal.valueOf(totalPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+                                .divide(BigDecimal.valueOf(totalPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 48, 49, 7, 9, "");
            //导出不再需要实际汇率和汇率收益
 //        createMergedRow(sheet, cellStyle, 50, 51, 0, 4, "实际汇率");
@@ -1094,7 +1148,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     }
     @Override
-    public void setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo) {
+    public ServerResult setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo) {
     //中国团队提成比例。
         String chainRatio = null;
@@ -1114,18 +1168,24 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
          throw new BusinessException(ServerResultCode.EMPTY_LIST);
      }
      projectBaseInfoDO.setDevelopmentStatus(ProfitStatusEnum.APPROVED.getStatus());
-     //把审核通过时的计算数据时的系统配置保存到永久配置中。防止后续更改系统配置后,正确的数据会被更新掉。
+    //把审核通过时的计算数据时的系统配置保存到永久配置中。防止后续更改系统配置后,正确的数据会被更新掉。
         //获取当前的系统配置。
         ProjectBaseAfterReviewSettingDO projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingService.getOne(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
                 .eq(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, vo.getProjectNo())
+                //根据年份查询。
+                .eq(ProjectBaseAfterReviewSettingDO::getYear,"20"+vo.getProjectNo().substring(4, 6))
                 .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
                 .last("limit 1"));
-        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
-                .eq(SystemSettingDO::getRelationCode, "costSettingItem"));
-        if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
-            throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
-        }
+        //如果projectBaseAfterReviewSettingDowSettingDO为空,则说明没有设置过。则去设置当前系统配置中的提成设置到projectBaseAfterReviewSettingDo表中。
+        if(Objects.isNull(projectBaseAfterReviewSettingDO)){
+            SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
+                    .eq(SystemSettingDO::getRelationCode, "costSettingItem")
+            //这里还需要进行年份判断。
+            .eq(SystemSettingDO::getRelationName, "20" + vo.getProjectNo().substring(4, 6)));
+            if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
+                throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
+            }
             //json反序列化。
             List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingDO.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
             if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
@@ -1138,29 +1198,32 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         dailyCost=relation.getRelationValue();
                     }
                 }
-    }
-            if(Objects.isNull(projectBaseAfterReviewSettingDO)){
-                projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO.builder().projectNoPrefix(vo.getProjectNo())
-                        .type(ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
-                        .fixedCost(new BigDecimal(dailyCost))
-                        .commissionRate(new BigDecimal(chainRatio))
-                        .spainCommissionRate(new BigDecimal(spainRatio)).build();
-            }else{
-                projectBaseAfterReviewSettingDO.setProjectNoPrefix(vo.getProjectNo());
-                projectBaseAfterReviewSettingDO.setType(ProjectBaseSettingTypeEnum.COMMISSION_COST.getType());
-                projectBaseAfterReviewSettingDO.setFixedCost(new BigDecimal(dailyCost));
-                projectBaseAfterReviewSettingDO.setCommissionRate(new BigDecimal(chainRatio));
-                projectBaseAfterReviewSettingDO.setSpainCommissionRate(new BigDecimal(spainRatio));
             }
+            projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO.builder().projectNoPrefix(vo.getProjectNo())
+                    .year(systemSettingDO.getRelationName())
+                    .type(ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
+                    .fixedCost(new BigDecimal(dailyCost))
+                    .commissionRate(new BigDecimal(chainRatio))
+                    .spainCommissionRate(new BigDecimal(spainRatio)).build();
+        }
         ProjectBaseAfterReviewSettingDO finalProjectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO;
+            //创建审批记录对象  对于通过之后也需要对记录进行记录。
+        ProjectBaseInfoVO projectBaseInfoVO =new ProjectBaseInfoVO();
+       BeanUtils.copyProperties(projectBaseInfoDO, projectBaseInfoVO);
         transactionHelper.run(() -> {
             projectBaseAfterReviewSettingService.saveOrUpdate(finalProjectBaseAfterReviewSettingDO);
             updateById(projectBaseInfoDO);
+            //添加审核记录。
+            projectBaseDevelopOptLogService.save(buildProjectOptLogDo(vo.getProjectNo(),dataScope.getLoginUserId(),
+                    ProjectApplyTypeEnum.PROJECT_APPLY_PASS.getType(),
+                    ProjectApplyTypeEnum.PROJECT_APPLY_PASS.getDesc(),
+                    JSONObject.toJSONString(projectBaseInfoVO)));
         });
+        return ServerResult.success();
     }
     @Override
-    public void setInnerProductionStatus(OrderBaseInfoVO vo) {
+    public ServerResult setInnerProductionStatus(OrderBaseInfoVO vo) {
         String dailyCost = null;
         String price = null;
         //去表中设置状态,然后记录数据到永久配置中。
@@ -1178,44 +1241,46 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         //获取当前的系统配置。
         ProjectBaseAfterReviewSettingDO projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingService.getOne(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
                 .eq(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, vo.getProjectNo())
+                .eq(ProjectBaseAfterReviewSettingDO::getYear,"20"+vo.getProjectNo().substring(4, 6))
                 .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
                 .last("limit 1"));
-        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
-                .eq(SystemSettingDO::getRelationCode, "ProduceSettingItem"));
-        if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
-            throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
-        }
-        //json反序列化。
-        List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingDO.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
-        if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
-            for (CostSettingItemVO relation : costSettingItemVOList) {
-                //这里是系统配置中的得到的,应该是从系统配置中的生产科中得到。  固定成本。
-                if("fixCost".equals(relation.getRelationCode())){
-                    dailyCost=relation.getRelationValue();
-                }
-                //生产提成单价
-                if("ratio".equals(relation.getRelationCode())){
-                    price=relation.getRelationValue();
+        if(Objects.isNull(projectBaseAfterReviewSettingDO)){
+            SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
+                    .eq(SystemSettingDO::getRelationName, "20" + vo.getProjectNo().substring(4, 6))
+                    .eq(SystemSettingDO::getRelationCode, "ProduceSettingItem"));
+            if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
+                throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
+            }
+            //json反序列化。
+            List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingDO.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
+            if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
+                for (CostSettingItemVO relation : costSettingItemVOList) {
+                    //这里是系统配置中的得到的,应该是从系统配置中的生产科中得到。  固定成本。
+                    if("fixCost".equals(relation.getRelationCode())){
+                        dailyCost=relation.getRelationValue();
+                    }
+                    //生产提成单价
+                    if("ratio".equals(relation.getRelationCode())){
+                        price=relation.getRelationValue();
+                    }
                 }
             }
-        }
-        if(Objects.isNull(projectBaseAfterReviewSettingDO)){
             projectBaseAfterReviewSettingDO= projectBaseAfterReviewSettingDO.builder().projectNoPrefix(vo.getProjectNo())
+                    .year(systemSettingDO.getRelationName())
                     .type(ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
                     .fixedCost(new BigDecimal(dailyCost))
                     .commissionUnitPrice(new BigDecimal(price)).build();
-        }else{
-            projectBaseAfterReviewSettingDO.setProjectNoPrefix(vo.getProjectNo());
-            projectBaseAfterReviewSettingDO.setType(ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType());
-            projectBaseAfterReviewSettingDO.setFixedCost(new BigDecimal(dailyCost));
-            projectBaseAfterReviewSettingDO.setCommissionUnitPrice(new BigDecimal(price));
         }
         ProjectBaseAfterReviewSettingDO finalProjectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO;
+        ProjectBaseInfoVO projectBaseInfoVO =new ProjectBaseInfoVO();
+        BeanUtils.copyProperties(projectBaseInfoDO, projectBaseInfoVO);
         transactionHelper.run(() -> {
             projectBaseAfterReviewSettingService.saveOrUpdate(finalProjectBaseAfterReviewSettingDO);
             updateById(projectBaseInfoDO);
+            projectBaseDevelopOptLogService.save(buildProjectOptLogDo(vo.getProjectNo(),dataScope.getLoginUserId(),ProjectApplyTypeEnum.INNER_PROJECT_APPLY_PASS.getType(),ProjectApplyTypeEnum.INNER_PROJECT_APPLY_PASS.getDesc(),JSONObject.toJSONString(projectBaseInfoVO)));
         });
+        return ServerResult.success();
     }
     public void exportInnerProfitExcel(HttpServletResponse response, InnerProfitInfoVO vo) throws Exception {
@@ -1277,8 +1342,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 14, 15, 0, 3, "生产科实际花费总金额");
         createMergedRow(sheet, cellStyle, 14, 15, 4, 5, "￥" + Optional.ofNullable(vo.getProductionActualPrice()).orElse(BigDecimal.ZERO));
-        createMergedRow(sheet, cellStyle, 14, 15, 6, 7, Optional.ofNullable(vo.getPredictRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
-        createMergedRow(sheet, cellStyle, 14, 15, 8, 9, Optional.ofNullable(vo.getPredictAndActualRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 14, 15, 6, 7, Optional.ofNullable(vo.getPredictRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 14, 15, 8, 9, Optional.ofNullable(vo.getPredictAndActualRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         // 第六部分：毛利润
         createMergedRow(sheet, cellStyle, 16, 17, 0, 3, "内部生产毛利润");
@@ -1286,7 +1351,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 16, 16, 6, 7, "事前毛利润");
         createMergedRow(sheet, cellStyle, 16, 16, 8, 9, "事前毛利率");
         createMergedRow(sheet, cellStyle, 17, 17, 6, 7, Optional.ofNullable(vo.getBeforeGrossProfit()).orElse(BigDecimal.ZERO).toString());
-        createMergedRow(sheet, cellStyle, 17, 17, 8, 9, Optional.ofNullable(vo.getBeforeGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 17, 17, 8, 9, Optional.ofNullable(vo.getBeforeGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         // 第七部分：固定成本与净利润
         createMergedRow(sheet, cellStyle, 18, 19, 0, 3, "内部生产固定成本");
@@ -1294,7 +1359,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 18, 18, 6, 7, "事后毛利润");
         createMergedRow(sheet, cellStyle, 18, 18, 8, 9, "事后毛利率");
         createMergedRow(sheet, cellStyle, 19, 19, 6, 7, Optional.ofNullable(vo.getGrossProfit()).orElse(BigDecimal.ZERO).toString());
-        createMergedRow(sheet, cellStyle, 19, 19, 8, 9, Optional.ofNullable(vo.getGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 19, 19, 8, 9, Optional.ofNullable(vo.getGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         // 第八部分：提成与净利润
         createMergedRow(sheet, cellStyle, 20, 21, 0, 3, "内部生产提成");
@@ -1304,7 +1369,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 22, 23, 0, 3, "内部生产净利润");
         createMergedRow(sheet, cellStyle, 22, 23, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionProfit()).orElse(BigDecimal.ZERO));
-        createMergedRow(sheet, cellStyle, 22, 23, 6, 7, Optional.ofNullable(vo.getInnerProductionProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 22, 23, 6, 7, Optional.ofNullable(vo.getInnerProductionProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%").orElse("-"));
         createMergedRow(sheet, cellStyle, 22, 23, 8, 9, "");
         // 设置响应头
@@ -76,7 +76,7 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-#    host: smtp.mxhichina.com
+    #    host: smtp.mxhichina.com
     host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
     username: chenhang4442024@163.com