Merge branch 'develop-test' into develop

# Conflicts: # src/main/java/com/order/erp/common/constant/Constant.java # src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java # src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java # src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java # src/main/resources/application.yml

Merge branch 'develop-test' into develop
# Conflicts: # src/main/java/com/order/erp/common/constant/Constant.java # src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java # src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java # src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java # src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java # src/main/resources/application.yml
chenhang4442024
2 parents a12271e6 5985ab52
Showing 82 changed files with 4062 additions and 86 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/config/MybatisPlusConfig.java
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/controller/OrderCostDetailedOptLogController.java
src/main/java/com/order/erp/controller/OrderProfitController.java
src/main/java/com/order/erp/controller/ProjectBaseDevelopOptLogController.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/OrderCostApplyTpeEnum.java
src/main/java/com/order/erp/domain/OrderOptTypeEnum.java
src/main/java/com/order/erp/domain/ProfitStatusEnum.java
src/main/java/com/order/erp/domain/ProjectApplyTypeEnum.java
src/main/java/com/order/erp/domain/ProjectBaseSettingTypeEnum.java
src/main/java/com/order/erp/domain/ProjectFieldEditType.java
src/main/java/com/order/erp/domain/ProjectOptTypeEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderCostDetailedOptLogDO.java
src/main/java/com/order/erp/domain/dto/order/OrderCostInfoDO.java
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseAfterReviewSettingDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseDevelopOptLogDO.java
@@ -162,6 +162,7 @@ public class Constant {
     public static final int SEVEN = 7;
     public static final int FOURTEEN= 14;
     public static final Integer THIRTY = 30;
+
     public static final int SIXTY = 60;
     public static final int TWENTY_FIRST = 21;
 package com.order.erp.config;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+package com.order.erp.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.OrderProfitAnalysisVo;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.IOrderCostInfoService;
+import com.order.erp.service.order.OrderProfitAnalysisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
+
+/**
+ * @author zhongnanhuang
+ * @version 1.0
+ * @project order-erp
+ * @description 订单利润表控制层
+ * @date 2023/10/23 11:48:36
+ */
+@RestController
+@RequestMapping("/order/cost")
+@Api(tags = "订单费用表")
+public class OrderCostController {
+
+    @Resource
+    OrderProfitAnalysisService orderProfitAnalysisService;
+    @Autowired
+    IOrderCostInfoService orderCostInfoService;
+
+
+    @PostMapping("/InnerProfitDetail/listByPage")
+    @ApiOperation("内部生产费用明细表")
+    public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        queryVO.setProductionDepartment(Collections.singletonList("内部"));
+        return orderCostInfoService.listInnerProfitDetailByPage(queryVO);
+    }
+
+    @PostMapping("/BusinessProfitDetail/listByPage")
+    @ApiOperation("包装费用明细表")
+    public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailsByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        return orderCostInfoService.listBusinessProfitDetailByPage(queryVO);
+    }
+
+    @PostMapping("/edit")
+    @ApiOperation("编辑")
+    public ServerResult edit(@RequestBody OrderCostInfoVO vo) throws Exception {
+        return orderCostInfoService.edit(vo);
+    }
+
+    @PostMapping("/applyEditFileds")
+    @ApiOperation("申请编辑字段")
+    public ServerResult applyEditFileds(@RequestBody OrderCostInfolockFieldVO vo) {
+        return orderCostInfoService.applyEditFileds(vo);
+    }
+
+    @PostMapping("/businessProfitDetail/exportExcel")
+    @ApiOperation("包装费用明细表多个导出")
+    public void exportBusinessProfitDetailExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        orderCostInfoService.exportBusinessProfitDetailExcel(response, queryVO);
+    }
+
+    @PostMapping("/innerProfitDetail/exportExcel")
+    @ApiOperation("内部生产费用明细表多个导出")
+    public void exportInnerProfitDetailExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        orderCostInfoService.exportInnerProfitDetailExcel(response, queryVO);
+    }
+
+    @PostMapping("/setPackStatus")
+    @ApiOperation("设置包装费用明细表的状态")
+    public void setPackStatus(@RequestBody OrderCostInfoVO vo) {
+        orderCostInfoService.setPackStatus(vo);
+    }
+
+
+    @PostMapping("/setInnerStatus")
+    @ApiOperation("设置内部生产明细表的状态")
+    public void setInnerProduceStatus(@RequestBody OrderCostInfoVO vo) {
+        orderCostInfoService.setInnerProduceStatus(vo);
+    }
+
+}
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+import com.order.erp.service.order.OrderCostDetailedOptLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 净利润分析板块(包装费用明细表/内部生产明细表)--用户操作日志记录
+ * */
+@RestController
+@RequestMapping("/orderCostDetailedOptLog")
+public class OrderCostDetailedOptLogController {
+    @Autowired
+    private OrderCostDetailedOptLogService orderCostDetailedOptLogService;
+    @PostMapping("/listByPage")
+    public ServerResult listByPage(@RequestBody OrderCostDetailedOptedLogQueryVO queryVO){
+       return orderCostDetailedOptLogService.listByPage(queryVO);
+    }
+}
@@ -2,16 +2,20 @@ package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
-import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
-import com.order.erp.domain.vo.order.ProfitCalculateVO;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.IOrderCostInfoService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
 /**
  * @author zhongnanhuang
@@ -36,4 +40,5 @@ public class OrderProfitController {
     public ServerResult calculate(@RequestBody @Validated ProfitCalculateVO calculateVO) {
         return orderProfitAnalysisService.calculate(calculateVO);
     }
+
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+
+import com.order.erp.service.order.ProjectBaseDevelopOptLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 净利润分析板块(业务研发净利润/内部生产净利润)--用户操作日志记录
+ * */
+@RestController
+@RequestMapping("/projectOptLog")
+public class ProjectBaseDevelopOptLogController {
+    @Autowired
+    private ProjectBaseDevelopOptLogService projectBaseDevelopOptLogService;
+    /**
+    * 分页查询
+     * */
+    @PostMapping("/listByPage")
+    public ServerResult listByPage(@RequestBody ProjectOptLogQueryVO queryVO){
+        return projectBaseDevelopOptLogService.listByPage(queryVO);
+    }
+
+}
+package com.order.erp.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.OrderProfitAnalysisVo;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.IOrderCostInfoService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
+
+/**
+ * @author zhongnanhuang
+ * @version 1.0
+ * @project order-erp
+ * @description 订单利润表控制层
+ * @date 2023/10/23 11:48:36
+ */
+@RestController
+@RequestMapping("/project")
+@Api(tags = "项目信息")
+public class ProjectController {
+    @Autowired
+    IOrderCostInfoService orderCostInfoService;
+    @Autowired
+    IProjectBaseInfoService projectBaseInfoService;
+
+    @PostMapping("/edit")
+    @ApiOperation("编辑")
+    public ServerResult<OrderProfitAnalysisVO> edit(@RequestBody @Validated ProjectBaseInfoVO vo) {
+        return projectBaseInfoService.edit(vo);
+    }
+
+    @PostMapping("/applyEditFileds")
+    @ApiOperation("申请修改")
+    public ServerResult<OrderProfitAnalysisVO> applyEditFileds(@RequestBody @Validated ProjectBaseInfoLockFieldVO vo) {
+        return projectBaseInfoService.applyEditFileds(vo);
+    }
+
+    @PostMapping("/pageProjectLockFieldApply")
+    @ApiOperation("分页查询项目字段申请记录")
+    public ServerResult<OrderProfitAnalysisVO> pageProjectLockFieldApply(@RequestBody @Validated QueryProjectLockFieldVO vo) {
+        return projectBaseInfoService.pageProjectLockFieldApply(vo);
+    }
+
+    @PostMapping("/audit")
+    @ApiOperation("审核")
+    public ServerResult<OrderProfitAnalysisVO> audit(@RequestBody @Validated AuditVO vo) {
+        return projectBaseInfoService.audit(vo);
+    }
+    @PostMapping("/InnerProfitInfo/listByPage")
+    @ApiOperation("内部生产利润分析表")
+    public ServerResult<Page<InnerProfitInfoVO>> listInnerProfitInfoByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        queryVO.setProductionDepartment(Collections.singletonList("内部"));
+        return projectBaseInfoService.listInnerProfitInfoByPage(queryVO);
+    }
+
+    @PostMapping("/BusinessProfitInfo/listByPage")
+    @ApiOperation("业务研发净利润分析表")
+    public ServerResult<Page<BusinessProfitInfoVO>> listBusinessProfitInfosByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        return projectBaseInfoService.listBusinessProfitInfoByPage(queryVO);
+    }
+
+    @PostMapping("/businessProfit/export")
+    @ApiOperation("业务研发净利润分析表单个导出")
+    public void exportBusinessProfitInfo(HttpServletResponse response, @RequestParam("projectNoPrefix") String projectNoPrefix) throws Exception {
+        projectBaseInfoService.exportBusinessProfitInfo(response, projectNoPrefix);
+    }
+
+    @PostMapping("/innerProfit/export")
+    @ApiOperation("内部研发净利润分析表导出")
+    public void exportInnerProfitInfo(HttpServletResponse response, @RequestParam("projectNoPrefix") String projectNoPrefix) throws Exception {
+        projectBaseInfoService.exportInnerProfitInfo(response, projectNoPrefix);
+    }
+
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/businessProfit/exportExcel")
+    @ApiOperation("业务研发净利润分析表多个导出")
+    public void exportBusinessProfitExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        projectBaseInfoService.exportBusinessProfitExcel(response, queryVO);
+    }
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/innerProfitInfo/exportExcel")
+    @ApiOperation("内部生产净利润分析表多个导出")
+    public void exportInnerProfitInfoExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        projectBaseInfoService.exportInnerProfitInfoExcel(response, queryVO);
+    }
+
+    @PostMapping("/businessProfit/setStatus")
+    @ApiOperation("业务研发净利润分析表审核状态设置")
+    public void setProjectBaseInfoDevelopmentStatus(@RequestBody OrderBaseInfoVO vo)  {
+        projectBaseInfoService.setProjectBaseInfoDevelopmentStatus(vo);
+    }
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/innerProfitInfo/setStatus")
+    @ApiOperation("内部生产净利润分析表审核状态设置")
+    public void setInnerProductionStatus(@RequestBody OrderBaseInfoVO vo)  {
+        projectBaseInfoService.setInnerProductionStatus(vo);
+    }
+
+}
@@ -32,4 +32,13 @@ public enum ApplyTypeEnum {
     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;
+    }
 }
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum OrderCostApplyTpeEnum {
+
+    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 (OrderCostApplyTpeEnum e : OrderCostApplyTpeEnum.values()) {
+            if (e.getType().equals(type)) {
+                return e.getDesc();
+            }
+        }
+        return null;
+    }
+}
@@ -29,6 +29,21 @@ public enum OrderOptTypeEnum {
     ORDER_INSPECT_EDIT_APPLY(60, "质检信息编辑"),
+    //后续添加部分(净利润分析板块)
+    PROJECT_DEVELOPMENT_PROFIT_EDIT(70,"业务研发净利润编辑"),
+    PROJECT_DEVELOPMENT_PROFIT_ADD(75,"业务研发净利润创建"),
+//    PROJECT_DEVELOPMENT_FIELD_EDIT_APPLY(77,"业务研发净利润字段编辑申请"),
+    PROJECT_COST_EDIT(80,"包装费用明细编辑"),
+    PROJECT_COST_ADD(85,"包装费用明细创建"),
+//    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_FIELD_EDIT_APPLY(107,"内部研发净明细表字段编辑申请"),
+
+
     ;
     private Integer type;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+/**
+ * 净利润板块的各个表的状态字段。
+ * */
+@Getter
+@AllArgsConstructor
+public enum ProfitStatusEnum {
+     Not_COMPLETED(-1, "未完成"),
+    PENDING_APPROVAL(0, "待审核"),
+    APPROVED(1, "已审核"),
+    ;
+    private Integer status;
+    private String desc;
+}
+package com.order.erp.domain;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/9/13 18:05
+ * @version: 1.0
+ */
+@Getter
+@AllArgsConstructor
+public enum ProjectApplyTypeEnum {
+
+    FIELD_EDIT_APPLY(0, "业务利润字段编辑申请"),
+    INNER_PROFIT_FIELD_EDIT_APPLY(1, "内部利润字段编辑申请"),
+    ;
+
+    private Integer type;
+
+    private String desc;
+    public static String getDescByName(String type) {
+        for (ProjectApplyTypeEnum value : ProjectApplyTypeEnum.values()) {
+            if (value.name().equals(type)) {
+                return value.getDesc();
+            }
+        }
+        return null;
+    }
+}
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ProjectBaseSettingTypeEnum {
+    COMMISSION_COST(1, "提成成本配置"),
+    FIXED_COST_OF_PRODUCTION_DEPARTMENT(2, "生产科固定成本配置"),
+    ;
+    private Integer type;
+
+    private String desc;
+}
+package com.order.erp.domain;
+
+import com.order.erp.domain.vo.order.BusinessProfitInfoVO;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author zgt
+ * @project order-erp
+ * @description
+ * @date 2025/3/27
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum ProjectFieldEditType {
+    InnerProfitInfo("内部表编辑"),
+    BusinessProfitInfo("业务利润表编辑");
+    private String Text;
+}
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+/**
+ * 净利润分析板块下的项目类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum ProjectOptTypeEnum {
+    BUSINESS_NET_PROFIT_TYPE(10, "业务研发净利润类型"),
+
+    PACKAGING_COST_TYPE(20, "包装费用类型"),
+
+    INTERNAL_BUSINESS_NET_PROFIT_TYPE(30, "内部生产净利润类型"),
+
+    INTERNAL_PRODUCE_DETAILS_TYPE(40, "内部生产明细表类型"),
+    ;
+
+    private Integer type;
+
+    private String desc;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 包装费用,内部生产明细操作日志表(OrderCostDetailedOptLogDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:14:46
+ */
+@TableName("order_cost_detailed_opt_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostDetailedOptLogDO  extends BaseDO implements Serializable {
+       private Long id;
+       private Long orderId;
+       /**
+       * 用户id
+       */
+       private Long userId;
+       /**
+        * 操作类型
+        */
+       private Integer type;
+
+       /**
+        * 操作类型描述
+        */
+       private String optType;
+       /**
+       * 操作字段 json字符串
+       */
+       private String fields;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import com.order.erp.domain.dto.BaseDO;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("order_cost_info")
+@ApiModel(value="OrderCostinfo对象", description="")
+public class OrderCostInfoDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long orderId;
+
+    private BigDecimal productionDepartmentPredictPrice;
+
+    private BigDecimal productionActualPrice;
+
+    private BigDecimal packetActualRmbTotalPrice;
+    //包装费用明细表状态。
+    private Integer packStatus;
+    //内部生产明细表状态。
+    private Integer innerProduceStatus;
+
+}
@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.math.BigDecimal;
 /**
  * 订单利润分析表(OrderProfitAnalysis)实体类
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+/**
+ * 存储,内部业务研发净利润审核通过的配置,以及内部生产净利润审核通过的配置      因为这个配置是每年都会改变,所以需要保存当时审核年份的配置,防止切换到其他年份配置更改之后,之前的数据又会被重新计算。
+ * */
+@TableName("project_base_after_review_setting")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseAfterReviewSettingDO {
+    private Long id;
+    /**
+     * 存储项目号,可能存储项目号的前八位(业务研发净利润专属),也可能存储完整的项目号(内部生产净利润)
+     * */
+    private String projectNoPrefix;
+    /**
+     * type=1代表为提成成本配置,type=2代表为生产科固定成本配置
+     * */
+    private Integer type;
+
+    /**
+     * 审核通过时的配置数据。 --提成成本配置或者生产科固定成本中的固定成本。 type=1代表为提成成本配置,type=2代表为生产科固定成本配置
+     * */
+    private BigDecimal fixedCost;
+    /**
+     * 审核通过时的配置数据。 --提成成本配置中的提成比例。
+     * */
+    private BigDecimal commissionRate;
+
+    /**
+     * 审核通过时的配置数据。 --提成成本配置中的西班牙提成比例。
+     * */
+    private BigDecimal spainCommissionRate;
+
+    /**
+     * 审核通过时的配置数据。 --生产科固定成本配置中的提成单价。
+     * */
+    private BigDecimal commissionUnitPrice;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 用户业务研发,内部生产操作日志表(ProjectBaseDevelopOptLogDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:14:46
+ */
+@TableName("project_base_develop_opt_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseDevelopOptLogDO extends BaseDO implements Serializable {
+    private static final long serialVersionUID = -79481441736960701L;
+
+    private Long id;
+    /**
+     * 项目号前八位前缀 或者前十位前缀
+     */
+    private String projectNoPrefix;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 操作类型
+     */
+    private Integer type;
+
+    /**
+     * 操作类型描述
+     */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     */
+    private String fields;
+
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import com.order.erp.domain.dto.BaseDO;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("project_base_info")
+@ApiModel(value="ProjectBaseInfoDO", description="")
+public class ProjectBaseInfoDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+   /**
+    * 项目号的前缀  例如:A05-2303-2391,projectNoPrefix就是A05-2303。
+    * */
+    private String projectNoPrefix;
+   /**
+    * 研发复制费合计￥
+    * */
+    private BigDecimal developmentCopyRmbTotalPrice;
+    /**
+     * 项目开始时间
+     * */
+    private LocalDateTime projectStartTime;
+    /**
+     * 项目结束时间
+     * */
+    private LocalDateTime projectEndTime;
+
+    private LocalDateTime projectInnerProfitInfoStartTime;
+
+    private LocalDateTime projectInnerProfitInfoEndTime;
+
+    /**
+     * 西班牙已发提成
+     * */
+    private BigDecimal spainPaidRmbCommission;
+    /**
+     * 中国团队已发提成
+     * */
+    private BigDecimal paidRmbCommission;
+    /**
+     * 实际汇率
+     * */
+    private BigDecimal actualExchangeRate;
+
+    /**
+     * 业务研发净利润分析表审核状态
+     * */
+    private Integer developmentStatus;
+    /**
+     * 内部生产净利润分析表审核状态
+     * */
+    private Integer innerProductionStatus;
+
+}
+package com.order.erp.domain.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("order_cost_field_lock_record")
+@ApiModel(value="OrderCostFieldLockRecord对象", description="")
+public class OrderCostFieldLockRecord extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String fields;
+
+    private Long userId;
+
+    private Long orderId;
+
+
+
+}
+package com.order.erp.domain.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+import com.order.erp.domain.ProjectApplyTypeEnum;
+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.SuperBuilder;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("project_apply")
+@ApiModel(value="ProjectFieldLockApply对象", description="项目-字段锁定申请表")
+public class ProjectApplyDO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
+
+
+    @ApiModelProperty(value = "申请用户id")
+    private Long applyUserId;
+
+    @ApiModelProperty(value = "审批用户id")
+    private Long auditUserId;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private String fields;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private String type;
+
+    @ApiModelProperty(value = "状态：0 待审批，1 通过，2 拒绝")
+    private Integer status;
+
+    @ApiModelProperty(value = "审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty(value = "审批角色code集合，分割")
+    private String auditRoleCodes;
+
+    @ApiModelProperty(value = "申请原因")
+    private String applyRemark;
+
+
+
+}
+package com.order.erp.domain.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+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;
+
+/**
+ * <p>
+ * 项目-字段锁定记录表
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+@TableName("project_field_lock_record")
+@ApiModel(value="ProjectFieldLockRecord对象", description="项目-字段锁定记录表")
+public class ProjectFieldLockRecord extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private String fields;
+
+
+
+}
 package com.order.erp.domain.vo.order;
 import com.order.erp.domain.vo.BasePageVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -17,23 +18,26 @@ import java.io.Serializable;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @SuperBuilder
-public class AuditVO extends BasePageVO implements Serializable {
+public class AuditVO implements Serializable {
     /**
      * 申请id
      */
     @NotNull(message = "申请id不能为空")
+    @ApiModelProperty(value = "申请id", required = true)
     private Long id;
     /**
      * 状态：1 通过，2 拒绝
      */
     @NotNull(message = "状态不能为空")
+    @ApiModelProperty(value = "状态：1 通过，2 拒绝", required = true)
     private Integer status;
     /**
      * 拒绝原因备注
      */
+    @ApiModelProperty(value = "拒绝原因备注")
     private String refuseRemark;
 }
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessCostExportSelect {
+    /**
+     * 包装费用$
+     */
+    @ApiModelProperty(value = "包装费用（美元）")
+    private String packetPrice;
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private String packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private String packetRmbTotalPrice;
+
+    /**
+     * 包装费用实际金额
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private String packetActualRmbTotalPrice;
+
+    /**
+     * 实际跟单单价￥
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private String packetActualRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private String packetActualPrice;
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private String packetProfitRmbPrice;
+
+    /**
+     * 包装费用利润率
+     */
+    @ApiModelProperty(value = "包装费用利润率")
+    private String packetProfitRate;
+
+}
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessProfitDetailVO implements Serializable {
+
+
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+
+    /**
+     * 项目号
+     */
+    @ApiModelProperty(value = "项目号")
+    private String projectNo;
+
+    /**
+     * 生产科
+     */
+    @ApiModelProperty(value = "生产部门")
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    @ApiModelProperty(value = "内部编号")
+    private String innerNo;
+
+    /**
+     * pic图片地址
+     */
+    @ApiModelProperty(value = "图片地址")
+    private String picUrl;
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "订单数量")
+    private Integer orderCount;
+
+    /**
+     * 包装费用$
+     */
+    @ApiModelProperty(value = "包装费用（美元）")
+    private Double packetPrice;
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private Double packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private Double packetRmbTotalPrice;
+
+    /**
+     * 包装费用实际金额
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private BigDecimal packetActualRmbTotalPrice;
+
+    /**
+     * 实际跟单单价￥
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private BigDecimal packetActualRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private BigDecimal packetActualPrice;
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private BigDecimal packetProfitRmbPrice;
+
+    /**
+     * 包装费用利润率
+     */
+    @ApiModelProperty(value = "包装费用利润率")
+    private BigDecimal packetProfitRate;
+    /**
+     * 包装费用明细表状态
+     */
+    @ApiModelProperty(value = "包装费用明细表状态")
+    private Integer packStatus;
+
+    /**
+     * 锁定字段信息
+     */
+    @ApiModelProperty(value = "锁定字段信息")
+    private OrderCostInfolockFieldVO lockFields;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessProfitInfoVO implements Serializable {
+
+
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
+
+    @ApiModelProperty(value = "完整项目号,用于当做id来使用,因为没有返回id所以无法确实操作的是那一条数据,所以需要完整的项目号来确认是哪一条数据")
+    private Set<String> detailProjectNo;
+
+    /**
+     * 客户总价￥
+     */
+    @ApiModelProperty(value = "客户总价（人民币）")
+    private Double customerRmbTotalPrice;
+
+    /**
+     * 客户总价￥
+     */
+    @ApiModelProperty(value = "客户总价")
+    private Double customerTotalPrice;
+
+    /**
+     * 生成科总价￥
+     */
+    @ApiModelProperty(value = "生产部门总价")
+    private Double productionDepartmentTotalPrice;
+
+    /**
+     * 生产科
+     */
+    @ApiModelProperty(value = "生产部门")
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    @ApiModelProperty(value = "内部编号")
+    private String innerNo;
+
+    /**
+     * pic图片地址
+     */
+    @ApiModelProperty(value = "图片地址")
+    private String picUrl;
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "订单数量")
+    private Integer orderCount;
+
+    /**
+     * 包装费用$
+     */
+    @ApiModelProperty(value = "包装费用（美元）")
+    private Double packetPrice;
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private Double packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private Double packetRmbTotalPrice;
+
+    /**
+     * 包装费用实际金额
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private BigDecimal packetActualRmbTotalPrice;
+
+    /**
+     * 包装费用实际金额￥
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private BigDecimal packetActualRmbPrice;
+
+    /**
+     * 包装费用实际金额$
+     */
+    @ApiModelProperty(value = "包装费用实际金额（美元）")
+    private BigDecimal packetActualPrice;
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private BigDecimal packetProfitRmbPrice;
+
+    /**
+     * 包装费用利润率
+     */
+    @ApiModelProperty(value = "包装费用利润率")
+    private BigDecimal packetProfitRate;
+
+    /**
+     * 研发复制费合计￥
+     */
+    @ApiModelProperty(value = "研发复制费合计（人民币）")
+    private BigDecimal developmentCopyRmbTotalPrice;
+
+    /**
+     * 固定成本
+     */
+    @ApiModelProperty(value = "固定成本")
+    private BigDecimal fixedCost;
+
+    /**
+     * 西班牙已发提成￥
+     */
+    @ApiModelProperty(value = "西班牙已发提成（人民币）")
+    private BigDecimal spainPaidRmbCommission;
+
+    /**
+     * 西班牙提成￥
+     */
+    @ApiModelProperty(value = "西班牙提成（人民币）")
+    private BigDecimal spainRmbCommission;
+
+    /**
+     * 西班牙未发提成￥
+     */
+    @ApiModelProperty(value = "西班牙未发提成（人民币）")
+    private BigDecimal spainUnpaidRmbCommission;
+
+    /**
+     * 已发提成￥
+     */
+    @ApiModelProperty(value = "已发提成（人民币）")
+    private BigDecimal paidRmbCommission;
+
+    /**
+     * 提成￥
+     */
+    @ApiModelProperty(value = "提成（人民币）")
+    private BigDecimal rmbCommission;
+
+    /**
+     * 未发提成￥
+     */
+    @ApiModelProperty(value = "未发提成（人民币）")
+    private BigDecimal unpaidRmbCommission;
+
+    /**
+     * 实际汇率
+     */
+    @ApiModelProperty(value = "实际汇率")
+    private BigDecimal actualExchangeRate;
+
+    /**
+     * 支出合计
+     */
+    @ApiModelProperty(value = "支出合计（人民币）")
+    private BigDecimal rmbTotalExpense;
+
+    /**
+     * 毛利润
+     */
+    @ApiModelProperty(value = "毛利润")
+    private BigDecimal profit;
+
+    /**
+     * 毛利率
+     */
+    @ApiModelProperty(value = "毛利率")
+    private BigDecimal profitRate;
+
+    /**
+     * 研发净利润
+     */
+    @ApiModelProperty(value = "研发净利润")
+    private BigDecimal developmentProfit;
+
+    /**
+     * 净利润率
+     */
+    @ApiModelProperty(value = "净利润率")
+    private BigDecimal developmentProfitRate;
+
+    /**
+     * 实际跟单单价
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private BigDecimal actualOrderRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private BigDecimal actualOrderPrice;
+
+    /**
+     * 汇率收益
+     */
+    @ApiModelProperty(value = "汇率收益")
+    private BigDecimal exchangeRateProfit;
+
+    /**
+     * 综合收益
+     */
+    @ApiModelProperty(value = "综合收益")
+    private BigDecimal comprehensiveProfit;
+
+
+    /**
+     * 业务研发净利润状态
+     */
+    @ApiModelProperty(value = "业务研发净利润状态")
+    private Integer developmentStatus;
+
+    /**
+     * 内部生产净利润状态
+     */
+    @ApiModelProperty(value = "内部生产净利润状态")
+    private Integer innerProductionStatus;
+
+    /**
+     * 项目开始时间
+     */
+    @ApiModelProperty(value = "项目开始时间")
+    private LocalDateTime projectStartTime;
+
+    /**
+     * 项目结束时间
+     */
+    @ApiModelProperty(value = "项目结束时间")
+    private LocalDateTime projectEndTime;
+
+    @ApiModelProperty(value = "生产开始时间")
+    private LocalDateTime produceStartTime;
+
+    @ApiModelProperty(value = "生产结束时间")
+    private LocalDateTime produceEndTime;
+
+    @ApiModelProperty(value = "锁定字段信息")
+    private ProjectBaseInfoLockFieldVO lockFields;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitDetailExportSelect {
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private String productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private String  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private String  productionDepartmentTotalPrice;
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private String  productionDepartmentPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private String  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private String  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private String  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利率")
+    private String  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private String  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利率")
+    private String  grossProfitRate;
+
+}
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitDetailVO implements Serializable {
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @ApiModelProperty(value = "项目号")
+    private String projectNo;
+    @ApiModelProperty(value = "生产科")
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    @ApiModelProperty(value = "内部编码")
+    private String innerNo;
+    /**
+     * pic图片地址
+     */
+    @ApiModelProperty(value = "图片")
+    private String picUrl;
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer orderCount;
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private BigDecimal productionDepartmentPredictPrice;
+
+    /**
+     * 生产科预算单价,由生产科预算金额/数量。
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private BigDecimal productionDepartmentPredictUnitprice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private BigDecimal  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private Double  productionDepartmentTotalPrice;
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private Double  productionDepartmentPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private BigDecimal  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private BigDecimal  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private BigDecimal  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private BigDecimal  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private BigDecimal  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private BigDecimal  grossProfitRate;
+    /**
+     * 内部生产明细表状态
+     */
+    @ApiModelProperty(value = "内部生产明细表状态")
+    private Integer innerProduceStatus ;
+
+    private OrderCostInfolockFieldVO lockFields;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitInfoExportSelect {
+
+
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private String productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private String  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private String  productionDepartmentUnitPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private String  productionDepartmentTotalPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private String  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private String  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private String  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利率")
+    private String  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private String  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利率")
+    private String  grossProfitRate;
+
+    /**
+     * 内部生产固定成本
+     */
+    @ApiModelProperty(value = "内部生产固定成本")
+    private String  innerProductionFixedCost;
+
+    /**
+     * 内部生产提成
+     */
+    @ApiModelProperty(value = "内部生产提成")
+    private String  innerProductionCommission;
+    /**
+     * 内部生产净利润
+     */
+    @ApiModelProperty(value = "内部生产净利润")
+    private String  innerProductionProfit;
+    /**
+     * 内部生产净利润率
+     */
+    @ApiModelProperty(value = "内部生产净利润率")
+    private String  innerProductionProfitRate;
+}
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitInfoVO implements Serializable {
+
+
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
+    @ApiModelProperty(value = "生产科")
+    private String productionDepartment;
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "数量")
+    private Integer orderCount;
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private BigDecimal productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private BigDecimal  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private Double  productionDepartmentUnitPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private Double  productionDepartmentTotalPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private BigDecimal  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private BigDecimal  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private BigDecimal  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private BigDecimal  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private BigDecimal  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private BigDecimal  grossProfitRate;
+
+    /**
+     * 内部生产固定成本
+     */
+    @ApiModelProperty(value = "内部生产固定成本")
+    private BigDecimal  innerProductionFixedCost;
+
+    /**
+     * 内部生产提成
+     */
+    @ApiModelProperty(value = "内部生产提成")
+    private BigDecimal  innerProductionCommission;
+    /**
+     * 内部生产净利润
+     */
+    @ApiModelProperty(value = "内部生产净利润")
+    private BigDecimal  innerProductionProfit;
+    /**
+     * 内部生产净利润率
+     */
+    @ApiModelProperty(value = "内部生产净利润率")
+    private BigDecimal  innerProductionProfitRate;
+
+    /**
+     * 项目开始时间
+     */
+    @ApiModelProperty(value = "项目开始时间")
+    private LocalDateTime produceStartTime;
+    /**
+     * 项目结束时间
+     */
+    @ApiModelProperty(value = "项目结束时间")
+    private LocalDateTime produceEndTime;
+
+    /**
+     * 内部生产净利润分析表状态
+     */
+    @ApiModelProperty(value = "内部生产净利润分析表状态")
+    private Integer innerProductionStatus;
+
+    private ProjectBaseInfoLockFieldVO lockFields;
+
+}
+
@@ -61,6 +61,12 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private List<String> projectNo;
     /**
+     * 项目号右模糊
+     */
+    private String projectNoLikeRight;
+
+
+    /**
      * 客户编码集合
      */
     private List<String> customerCode;
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 /**
  * 订单基础信息表(OrderBaseInfo)实体类
@@ -26,6 +27,8 @@ public class OrderBaseInfoVO implements Serializable {
      */
     private String invoiceNo;
+    private LocalDateTime createTime;
+
     /**
      * 生产科对账单号  如果要在首页添加生产科对账单号列数,就需要在这里加上。
      */
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostDetailedOptedLogQueryVO  extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+    private Long id;
+
+    /**
+     * 项目号前缀
+     * */
+    private Long orderId;
+
+    /**
+     * 业务类型  20:包装费用明细表创建/编辑   40:对应内部生产明细表创建/编辑
+     * */
+    private Integer type;
+}
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("order_cost_info")
+@ApiModel(value="OrderCostDetail对象", description="")
+public class OrderCostInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private Long orderId;
+
+    private BigDecimal productionDepartmentPredictPrice;
+
+    private BigDecimal productionActualPrice;
+
+    private BigDecimal packetActualRmbTotalPrice;
+    private Integer orderCount;
+    //单价  之前前端是传递productionDepartmentPredictPrice,现在改为传递单价,所以传递productionDepartmentPredictUnitPrice。
+    private BigDecimal productionDepartmentPredictUnitPrice;
+
+    //内部生产费用明细表状态。
+    private Integer innerProduceStatus;
+    //包装费用费用明细表状态。
+    private Integer packStatus;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("order_cost_info")
+@ApiModel(value="OrderCostDetail对象", description="")
+public class OrderCostInfolockFieldVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @NotNull
+    private Integer type;
+    @NotNull
+    private Long orderId;
+
+    private String productionDepartmentPredictPrice;
+
+    private String productionActualPrice;
+
+    private String packetActualRmbTotalPrice;
+    /**
+     * 生产科预算单价。
+     * */
+    private String productionDepartmentPredictUnitPrice;
+
+    private String applyRemark;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostOptLogResultVO implements Serializable {
+    private Long id;
+    /**
+     * 订单id
+     * */
+    private Long orderId;
+    /**
+     * 用户id
+     * */
+    private Long userId;
+    /**
+     * 用户名称
+     * */
+    private String userName;
+    /**
+     * 操作类型
+     * */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     * */
+    private String fields;
+
+    private LocalDateTime createTime;
+}
@@ -59,6 +59,11 @@ public class OrderFieldLockApplyQueryVO extends BasePageVO implements Serializab
     private Integer type;
     /**
+     * 申请类型：枚举类ApplyTypeEnum
+     */
+    private List<Integer> typeIn;
+
+    /**
      * 项目号
      */
     private List<String> projectNo;
@@ -38,6 +38,10 @@ public class OrderInfoResultVO extends OrderBaseInfoVO implements Serializable {
      * 质检信息
      */
     private OrderInspectionStageVO inspectionStageInfo;
+    /**
+     * 费用明细
+     */
+    private OrderCostInfoVO orderCostInfo;
     /**
      * 字段锁定集合
@@ -46,6 +46,11 @@ public class OrderLockFieldVO implements Serializable {
     private OrderInspectionStageFieldVO inspectionStageFields;
     /**
+     * 费用字段
+     */
+    private OrderCostInfolockFieldVO costInfolockFieldVO;
+
+    /**
      * 应收款账单字段
      */
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.math.BigDecimal;
 /**
  * 订单利润分析表(OrderProfitAnalysis)实体类
@@ -34,7 +35,6 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private Double customerTotalPrice;
-
     /**
      * 客户单价￥
      */
@@ -115,4 +115,6 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private String endCheckResult;
+
+
 }
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 订单基础信息表(OrderBaseInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderProfitQueryVO extends BasePageVO implements Serializable {
+    private static final long serialVersionUID = -84816007994858993L;
+
+    private List<Long> ids;
+
+    private Set<Long> orderIds;
+
+
+    private Long id;
+
+    /**
+     * 生成开始时间
+     */
+    private String createStartTime;
+
+    /**
+     * 生成结束时间
+     */
+    private String createEndTime;
+
+    /**
+     * 单据状态
+     */
+    private List<String> orderStatus;
+
+    /**
+     * 提交人名称
+     */
+    private String commitUserName;
+
+    /**
+     * 提交人手机号码
+     */
+    private String commitUserPhone;
+
+    /**
+     * 项目号
+     */
+    private List<String> projectNo;
+
+    /**
+     * 客户编码集合
+     */
+    private List<String> customerCode;
+
+    /**
+     * 客户STYLE#
+     */
+    private List<String> customerStyle;
+
+    /**
+     * 内部编号
+     */
+    private List<String> innerNo;
+
+    /**
+     * 生产科
+     */
+    private List<String> productionDepartment;
+
+    /**
+     * 生成科拖货开始时间
+     */
+    private String productionDepartmentConsignStartTime;
+
+    /**
+     * 生成科拖货结束时间
+     */
+    private String productionDepartmentConsignEndTime;
+
+    /**
+     * 订单上HOD开始时间
+     */
+    private String orderHodStartTime;
+
+    /**
+     * 订单上HOD结束时间
+     */
+    private String orderHodEndTime;
+
+    /**
+     * 最小利润率
+     */
+    private Double profitRateLqt;
+
+    /**
+     * 最大利润率
+     */
+    private Double profitRateGqt;
+
+    /**
+     * 想法来源
+     */
+    private List<String> ideaSource;
+
+    /**
+     * 想法来源占比
+     */
+    private Double ideaSourceRate;
+
+    /**
+     * 设计师
+     */
+    private String designer;
+
+    /**
+     * 手工初型1
+     */
+    private List<String> manualPreform1;
+
+    /**
+     * 手工初型1占比
+     */
+    private Double manualPreform1Rate;
+
+    /**
+     * 手工初型2
+     */
+    private List<String> manualPreform2;
+
+    /**
+     * 手工初型2占比
+     */
+    private Double manualPreform2Rate;
+
+    /**
+     * pp样品确认意见
+     */
+    private List<String> ppConfirmResult;
+
+    /**
+     * 自测通过开始时间
+     */
+    private String selfTestPassStartTime;
+
+    /**
+     * 自测通过结束时间
+     */
+    private String selfTestPassEndTime;
+
+    /**
+     * 中期验货结果PASS / FAIL
+     */
+    private List<String> midCheckResult;
+
+    /**
+     * 尾期验货结果PASS / FAIL
+     */
+    private List<String> endCheckResult;
+
+    /**
+     * 选择的字段
+     */
+    private OrderLockFieldVO fieldVO;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 业务员
+     */
+    private List<String> businessPerson;
+
+    
+    private List<Long> exportOrderIds;
+
+    /**
+     * invoice   首页筛选invoice。
+     */
+    private List<String> invoiceNo;
+
+    /**
+     * checkNo   首页筛选Check。
+     */
+    private List<String> CheckNo;
+    /**
+     * invoice   invoice状态。
+     */
+    private Long invoiceStatus;
+    /**
+     * checkNo   checkNo状态。
+     */
+    private Long checkNoStatus;
+}
+
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("project_apply")
+@ApiModel(value="ProjectApply对象", description="项目-字段锁定申请表")
+public class ProjectApplyVO extends BaseDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
+    @ApiModelProperty(value = "项目号")
+    private String projectNoPrefix;
+
+    @ApiModelProperty(value = "申请用户id")
+    private Long applyUserId;
+
+    @ApiModelProperty(value = "审批用户id")
+    private Long auditUserId;
+
+    @ApiModelProperty(value = "申请类型")
+    private String type;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private String fields;
+
+    @ApiModelProperty(value = "状态：0 待审批，1 通过，2 拒绝")
+    private Integer status;
+
+    @ApiModelProperty(value = "审核备注")
+    private String auditRemark;
+
+    @ApiModelProperty(value = "审批角色code集合，分割")
+    private String auditRoleCodes;
+
+    @ApiModelProperty(value = "申请原因")
+    private String applyRemark;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseInfoAuditStatus {
+    /**
+     * 设置状态时传递过来的projectNo可能只包含前八位(业务研发净利润分析),或者全部包含(内部生产净利润分析表)。
+     * */
+    private String projectNo;
+
+    /**
+     * 类型,用来判断是业务研发净利润分析表还是内部生产净利润分析表
+     * */
+    private String type;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value="ProjectFieldLockApply对象", description="项目-字段锁定申请表")
+public class ProjectBaseInfoLockFieldVO implements Serializable {
+
+
+    private Long projectId;
+
+    private String projectNoPrefix;
+
+    private String applyRemark;
+
+    private String developmentCopyRmbTotalPrice;
+
+    private String projectStartTime;
+
+    private String projectEndTime;
+
+
+    private String spainPaidRmbCommission;
+
+    private String paidRmbCommission;
+
+    private String actualExchangeRate;
+
+    private String projectInnerProfitInfoStartTime;
+
+    private String projectInnerProfitInfoEndTime;
+
+    private String type;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseInfoQueryVO extends BaseDO implements Serializable {
+    /**
+     * 业务研发净利润表以及内部生产明细表,用于条件查询的项目号,需要传递完整的项目号
+     * */
+    private List<String> detailProjectNo;
+
+    /**
+     * 包装费用明细表以及内部生产明细表,用于条件查询。
+     * */
+    private Set<Long> orderIds;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -客户编码。
+     * */
+    private List<String> customerCode;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -内部编号。
+     * */
+    private List<String> innerNo;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -生产科。
+     * */
+    private List<String> productionDepartment;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -项目号。
+     * */
+    private List<String> projectNo;
+
+    /**
+     * 业务研发净利润分析选择导出字段
+     * */
+    private ProjectExportSelect projectExportSelect;
+
+    /**
+     * 内部研发净利润分析选择导出字段
+     * */
+    private  InnerProfitInfoExportSelect innerProfitInfoExportSelect;
+
+    /**
+     * 包装费用明细表选择导出字段
+     * */
+    private BusinessCostExportSelect businessCostExportSelect;
+
+    /**
+     * 内部生产费用明细表选择导出字段
+     * */
+    private InnerProfitDetailExportSelect innerProfitDetailExportSelect;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("project_base_info")
+@ApiModel(value="ProjectBaseInfoDO", description="")
+public class ProjectBaseInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String projectNoPrefix;
+
+    private BigDecimal developmentCopyRmbTotalPrice;
+
+    private LocalDateTime projectStartTime;
+
+    private LocalDateTime projectEndTime;
+
+    private LocalDateTime projectInnerProfitInfoStartTime;
+
+    private LocalDateTime projectInnerProfitInfoEndTime;
+
+    private BigDecimal spainPaidRmbCommission;
+
+    private BigDecimal paidRmbCommission;
+
+    private BigDecimal actualExchangeRate;
+
+    private String fieldType;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectExportSelect {
+    /**
+     * 客户总价￥
+     */
+    @ApiModelProperty(value = "客户总价（人民币）")
+    private String customerRmbTotalPrice;
+
+    /**
+     * 客户总价$
+     */
+    @ApiModelProperty(value = "客户总价")
+    private String customerTotalPrice;
+
+    /**
+     * 生成科总价￥
+     */
+    @ApiModelProperty(value = "生产部门总价")
+    private String productionDepartmentTotalPrice;
+
+
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "订单数量")
+    private String orderCount;
+
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private String packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private String packetRmbTotalPrice;
+
+
+    /**
+     * 包装费用实际金额$
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private String packetActualRmbPrice;
+
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private String packetProfitRmbPrice;
+
+
+    /**
+     * 研发复制费合计￥
+     */
+    @ApiModelProperty(value = "研发复制费合计（人民币）")
+    private String developmentCopyRmbTotalPrice;
+
+    /**
+     * 固定成本
+     */
+    @ApiModelProperty(value = "固定成本")
+    private String fixedCost;
+
+    /**
+     * 西班牙已发提成￥
+     */
+    @ApiModelProperty(value = "西班牙已发提成（人民币）")
+    private String spainPaidRmbCommission;
+
+    /**
+     * 西班牙提成￥
+     */
+    @ApiModelProperty(value = "西班牙提成（人民币）")
+    private String spainRmbCommission;
+
+    /**
+     * 西班牙未发提成￥
+     */
+    @ApiModelProperty(value = "西班牙未发提成（人民币）")
+    private String spainUnpaidRmbCommission;
+
+    /**
+     * 已发提成￥
+     */
+    @ApiModelProperty(value = "已发提成（人民币）")
+    private String paidRmbCommission;
+
+    /**
+     * 提成￥
+     */
+    @ApiModelProperty(value = "提成（人民币）")
+    private String rmbCommission;
+
+    /**
+     * 未发提成￥
+     */
+    @ApiModelProperty(value = "未发提成（人民币）")
+    private String unpaidRmbCommission;
+
+
+    /**
+     * 支出合计
+     */
+    @ApiModelProperty(value = "支出合计（人民币）")
+    private String rmbTotalExpense;
+
+    /**
+     * 毛利润
+     */
+    @ApiModelProperty(value = "毛利润")
+    private String profit;
+
+    /**
+     * 毛利率
+     */
+    @ApiModelProperty(value = "毛利率")
+    private String profitRate;
+
+    /**
+     * 研发净利润
+     */
+    @ApiModelProperty(value = "研发净利润")
+    private String developmentProfit;
+
+    /**
+     * 净利润率
+     */
+    @ApiModelProperty(value = "净利润率")
+    private String developmentProfitRate;
+
+    /**
+     * 实际跟单单价
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private String actualOrderRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private String actualOrderPrice;
+
+
+    /**
+     * 综合收益
+     */
+    @ApiModelProperty(value = "综合收益")
+    private String comprehensiveProfit;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectOptLogQueryVO extends BasePageVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private List<Long> ids;
+
+    private Long id;
+
+    /**
+     * 项目号前缀
+     * */
+    private String projectNoPrefix;
+
+    /**
+     * 业务类型  10:对应业务研发净利润创建/编辑   30:对应内部生产净利润创建/编辑
+     * */
+    private Integer type;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectOptLogResultVO implements Serializable {
+    private Long id;
+    /**
+     * 项目号前缀,前八位或者前十位。
+     */
+    private String projectNoPrefix;
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 操作类型
+     */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     */
+    private String fields;
+
+    private LocalDateTime createTime;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.vo.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("order_cost_info")
+@ApiModel(value="OrderCostDetail对象", description="")
+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;
+
+    private String productionActualPrice;
+
+    private String packetActualRmbTotalPrice;
+
+    private Integer type;
+
+
+}
+package com.order.erp.mapper;
+
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface OrderCostFieldLockRecordMapper extends BaseMapper<OrderCostFieldLockRecord> {
+
+}
+package com.order.erp.mapper;
+
+import com.order.erp.domain.model.ProjectApplyDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface ProjectApplyMapper extends BaseMapper<ProjectApplyDO> {
+
+}
+package com.order.erp.mapper;
+
+import com.order.erp.domain.model.ProjectFieldLockRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 项目-字段锁定记录表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface ProjectFieldLockRecordMapper extends BaseMapper<ProjectFieldLockRecord> {
+
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+
+public interface OrderCostDetailedOptLogMapper extends BaseMapper<OrderCostDetailedOptLogDO> {
+}
+package com.order.erp.mapper.order;
+
+import com.order.erp.domain.dto.order.OrderCostInfoDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface OrderCostInfoMapper extends BaseMapper<OrderCostInfoDO> {
+
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+
+public interface ProjectBaseAfterReviewSettingMapper extends BaseMapper<ProjectBaseAfterReviewSettingDO> {
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+
+
+public interface ProjectBaseDevelopOptLogMapper extends BaseMapper<ProjectBaseDevelopOptLogDO> {
+}
+package com.order.erp.mapper.order;
+
+import com.order.erp.domain.dto.order.ProjectBaseInfoDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-18
+ */
+public interface ProjectBaseInfoMapper extends BaseMapper<ProjectBaseInfoDO> {
+
+}
+package com.order.erp.service;
+
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface IOrderCostFieldLockRecordService extends IService<OrderCostFieldLockRecord> {
+
+}
+package com.order.erp.service;
+
+import com.order.erp.domain.model.ProjectApplyDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface IProjectApplyService extends IService<ProjectApplyDO> {
+
+}
+package com.order.erp.service;
+
+import com.order.erp.domain.model.ProjectFieldLockRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 项目-字段锁定记录表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface IProjectFieldLockRecordService extends IService<ProjectFieldLockRecord> {
+
+}
@@ -6,6 +6,8 @@ import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.vo.SystemSettingQueryVO;
 import com.order.erp.domain.vo.SystemSettingVO;
+import java.math.BigDecimal;
+
 /**
  * 系统配置(SystemSetting)表服务接口
  *
@@ -37,6 +39,8 @@ public interface SystemSettingService extends IService&lt;SystemSettingDO&gt; {
      */
     ServerResult listByPage(SystemSettingQueryVO systemSettingQueryVO);
+    BigDecimal getExchangeRate();
+
     /**
      * 新增数据
      *
+package com.order.erp.service.impl;
+
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
+import com.order.erp.mapper.OrderCostFieldLockRecordMapper;
+import com.order.erp.service.IOrderCostFieldLockRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Service
+public class OrderCostFieldLockRecordServiceImpl extends ServiceImpl<OrderCostFieldLockRecordMapper, OrderCostFieldLockRecord> implements IOrderCostFieldLockRecordService {
+
+}
+package com.order.erp.service.impl;
+
+import com.order.erp.domain.model.ProjectApplyDO;
+import com.order.erp.mapper.ProjectApplyMapper;
+import com.order.erp.service.IProjectApplyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目-字段锁定申请表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Service
+public class ProjectApplyServiceImpl extends ServiceImpl<ProjectApplyMapper, ProjectApplyDO> implements IProjectApplyService {
+
+}
+package com.order.erp.service.impl;
+
+import com.order.erp.domain.model.ProjectFieldLockRecord;
+import com.order.erp.mapper.ProjectFieldLockRecordMapper;
+import com.order.erp.service.IProjectFieldLockRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目-字段锁定记录表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Service
+public class ProjectFieldLockRecordServiceImpl extends ServiceImpl<ProjectFieldLockRecordMapper, ProjectFieldLockRecord> implements IProjectFieldLockRecordService {
+
+}
@@ -24,7 +24,9 @@ import com.order.erp.service.SystemSettingService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import springfox.documentation.annotations.Cacheable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -110,6 +112,15 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
                 .eq(StringUtils.isNotBlank(queryVO.getRelationCode()), SystemSettingDO::getRelationCode, queryVO.getRelationCode());
     }
+    @Override
+    public BigDecimal getExchangeRate(){
+        SystemSettingDO exchangeRate = this.lambdaQuery()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode, "exchangeRate")
+                .one();
+        return BigDecimal.valueOf(Double.parseDouble(exchangeRate.getSettingValue()));
+    }
+
     /**
      * 新增数据
+package com.order.erp.service.order;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.OrderCostInfoDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
+import com.order.erp.domain.vo.order.OrderCostInfoVO;
+import com.order.erp.domain.vo.order.OrderCostInfolockFieldVO;
+import com.order.erp.domain.vo.order.ProjectBaseInfoQueryVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+public interface IOrderCostInfoService extends IService<OrderCostInfoDO> {
+
+    ServerResult edit(OrderCostInfoVO vo);
+
+    ServerResult applyEditFileds(OrderCostInfolockFieldVO vo);
+
+    ServerResult listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO);
+
+    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);
+}
+package com.order.erp.service.order;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.ProjectBaseInfoDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.domain.vo.order.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-18
+ */
+public interface IProjectBaseInfoService extends IService<ProjectBaseInfoDO> {
+
+    ServerResult edit(ProjectBaseInfoVO vo);
+
+    ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo);
+
+    ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo);
+
+    ServerResult audit(AuditVO vo);
+
+    ServerResult listInnerProfitInfoByPage(OrderBaseInfoQueryVO queryVO);
+
+    ServerResult listBusinessProfitInfoByPage(OrderBaseInfoQueryVO queryVO);
+
+    void exportBusinessProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception;
+
+    void exportInnerProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception;
+    void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
+    void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
+
+    void setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo);
+    void setInnerProductionStatus(OrderBaseInfoVO vo);
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+
+
+public interface OrderCostDetailedOptLogService extends IService<OrderCostDetailedOptLogDO> {
+   ServerResult listByPage(OrderCostDetailedOptedLogQueryVO queryVO);
+
+}
@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
-import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
-import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
-import com.order.erp.domain.vo.order.ProfitCalculateVO;
+import com.order.erp.domain.vo.order.*;
 import java.time.LocalDate;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 /**
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+
+public interface ProjectBaseAfterReviewSettingService extends IService<ProjectBaseAfterReviewSettingDO> {
+}
+package com.order.erp.service.order;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+
+import java.util.List;
+
+public interface ProjectBaseDevelopOptLogService extends IService<ProjectBaseDevelopOptLogDO> {
+    ServerResult listByPage(ProjectOptLogQueryVO queryVO);
+}
@@ -67,6 +67,10 @@ public class CalculateProfitServiceImpl {
      */
     public ServerResult businessProfitRatioExport(HttpServletResponse response, BusinessProfitRatioQueryVO queryVO) throws IOException {
         BusinessProfitRatioResultVO resultVO = buildBusinessProfitRatioResultVO(queryVO);
+        return writeBusinessProfitRatioResult(response, resultVO);
+    }
+
+    private ServerResult<Object> writeBusinessProfitRatioResult(HttpServletResponse response, BusinessProfitRatioResultVO resultVO) throws IOException {
         //开始
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("业务净利润分析表");
@@ -90,7 +94,7 @@ public class CalculateProfitServiceImpl {
         // 第二行
         createMergedCell(sheet, workbook, 4, 0, 4, 5, 0, 1, "项目号");
-        createMergedCell(sheet, workbook, 4, 2, 4, 5, 2, 4, String.join(",",resultVO.getProjectNo()));
+        createMergedCell(sheet, workbook, 4, 2, 4, 5, 2, 4, String.join(",", resultVO.getProjectNo()));
         createMergedCell(sheet, workbook, 4, 5, 4, 5, 5, 6, "开始时间");
         createMergedCell(sheet, workbook, 4, 7, 4, 5, 7, 9, "结束时间");
 // 第三行
@@ -111,55 +115,55 @@ public class CalculateProfitServiceImpl {
         createMergedCell(sheet, workbook, 10, 7, 10, 11, 7, 9, "备注");
 //第六行
         createMergedCell(sheet, workbook, 12, 0, 12, 13, 0, 4, "客户总金额计算");
-        createMergedCell(sheet, workbook, 12, 5, 12, 13, 5, 6, "￥"+resultVO.getCustomerTotalPrice());
-        createMergedCell(sheet, workbook, 12, 7, 12, 13, 7, 9, "$"+resultVO.getCustomerTotalPriceUsd());
+        createMergedCell(sheet, workbook, 12, 5, 12, 13, 5, 6, "￥"+ resultVO.getCustomerTotalPrice());
+        createMergedCell(sheet, workbook, 12, 7, 12, 13, 7, 9, "$"+ resultVO.getCustomerTotalPriceUsd());
 ////第七行
         createMergedCell(sheet, workbook, 14, 0, 14, 15, 0, 4, "生产科总价合计");
-        createMergedCell(sheet, workbook, 14, 5, 14, 15, 5, 6, "￥"+resultVO.getProductionDepartmentTotalPrice());
-        createMergedCell(sheet, workbook, 14, 7, 14, 15, 7, 9, "$"+resultVO.getProductionDepartmentTotalPriceUsd());
+        createMergedCell(sheet, workbook, 14, 5, 14, 15, 5, 6, "￥"+ resultVO.getProductionDepartmentTotalPrice());
+        createMergedCell(sheet, workbook, 14, 7, 14, 15, 7, 9, "$"+ resultVO.getProductionDepartmentTotalPriceUsd());
 ////第八行
         createMergedCell(sheet, workbook, 16, 0, 16, 17, 0, 4, "包装费用合计");
-        createMergedCell(sheet, workbook, 16, 5, 16, 17, 5, 6, "￥"+resultVO.getPacketTotalPrice());
-        createMergedCell(sheet, workbook, 16, 7, 16, 17, 7, 9, "$"+resultVO.getPacketTotalPriceUsd());
+        createMergedCell(sheet, workbook, 16, 5, 16, 17, 5, 6, "￥"+ resultVO.getPacketTotalPrice());
+        createMergedCell(sheet, workbook, 16, 7, 16, 17, 7, 9, "$"+ resultVO.getPacketTotalPriceUsd());
 ////第九行
         createMergedCell(sheet, workbook, 18, 0, 18, 19, 0, 4, "研发开发费合计");
-        createMergedCell(sheet, workbook, 18, 5, 18, 19, 5, 6, "￥"+resultVO.getDevelopTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 18, 5, 18, 19, 5, 6, "￥"+ resultVO.getDevelopTotalPrice().setScale(2, RoundingMode.HALF_UP));
         createMergedCell(sheet, workbook, 18, 7, 18, 19, 7, 9, "");
 ////第十行
         createMergedCell(sheet, workbook, 20, 0, 20, 21, 0, 4, "复制费用合计");
-        createMergedCell(sheet, workbook, 20, 5, 20, 21, 5, 6, "￥"+resultVO.getCopyTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 20, 5, 20, 21, 5, 6, "￥"+ resultVO.getCopyTotalPrice().setScale(2, RoundingMode.HALF_UP));
         createMergedCell(sheet, workbook, 20, 7, 20, 21, 7, 9, "");
 //第十一行
         createMergedCell(sheet, workbook, 22, 0, 22, 23, 0, 4, "固定成本");
-        createMergedCell(sheet, workbook, 22, 5, 22, 23, 5, 6, "￥"+resultVO.getFixCost());
+        createMergedCell(sheet, workbook, 22, 5, 22, 23, 5, 6, "￥"+ resultVO.getFixCost());
         createMergedCell(sheet, workbook, 22, 7, 22, 23, 7, 9, "");
 //第十二行
         createMergedCell(sheet, workbook, 24, 0, 24, 25, 0, 4, "西班牙提成");
-        createMergedCell(sheet, workbook, 24, 5, 24, 25, 5, 6, "￥"+resultVO.getSpainRatioProfitPrice());
+        createMergedCell(sheet, workbook, 24, 5, 24, 25, 5, 6, "￥"+ resultVO.getSpainRatioProfitPrice());
         createMergedCell(sheet, workbook, 24, 7, 24, 25, 7, 9, "");
 //第十三行
         createMergedCell(sheet, workbook, 26, 0, 26, 27, 0, 4, "中国团队提成");
-        createMergedCell(sheet, workbook, 26, 5, 26, 27, 5, 6, "￥"+resultVO.getChinaRatioProfitPrice());
+        createMergedCell(sheet, workbook, 26, 5, 26, 27, 5, 6, "￥"+ resultVO.getChinaRatioProfitPrice());
         createMergedCell(sheet, workbook, 26, 7, 26, 27, 7, 9, "");
- //第十四行
+        //第十四行
         createMergedCell(sheet, workbook, 28, 0, 28, 29, 0, 4, "支出合计");
-        createMergedCell(sheet, workbook, 28, 5, 28, 29, 5, 6, "￥"+resultVO.getOutTotalPrice());
+        createMergedCell(sheet, workbook, 28, 5, 28, 29, 5, 6, "￥"+ resultVO.getOutTotalPrice());
         createMergedCell(sheet, workbook, 28, 7, 28, 29, 7, 9, "");
 //第十五行
         createMergedCell(sheet, workbook, 30, 0, 30, 31, 0, 4, "毛利润");
-        createMergedCell(sheet, workbook, 30, 5, 30, 31, 5, 6, "￥"+resultVO.getGrossProfit());
+        createMergedCell(sheet, workbook, 30, 5, 30, 31, 5, 6, "￥"+ resultVO.getGrossProfit());
         createMergedCell(sheet, workbook, 30, 7, 30, 31, 7, 9, "");
 ////第十六行
         createMergedCell(sheet, workbook, 32, 0, 32, 33, 0, 4, "研发贸易净利润");
-        createMergedCell(sheet, workbook, 32, 5, 32, 33, 5, 6, "￥"+resultVO.getDevelopProfit());
+        createMergedCell(sheet, workbook, 32, 5, 32, 33, 5, 6, "￥"+ resultVO.getDevelopProfit());
         createMergedCell(sheet, workbook, 32, 7, 32, 33, 7, 9, "");
 ////第十七行
         createMergedCell(sheet, workbook, 34, 0, 34, 35, 0, 4, "包装费用合计金额");
-        createMergedCell(sheet, workbook, 34, 5, 34, 35, 5, 6, "￥"+resultVO.getPacketTotalPrice());
+        createMergedCell(sheet, workbook, 34, 5, 34, 35, 5, 6, "￥"+ resultVO.getPacketTotalPrice());
         createMergedCell(sheet, workbook, 34, 7, 34, 35, 7, 9, "");
 ////第十八行
         createMergedCell(sheet, workbook, 36, 0, 36, 37, 0, 4, "包装费用实际金额");
-        createMergedCell(sheet, workbook, 36, 5, 36, 37, 5, 6, "￥"+resultVO.getPacketActualTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 36, 5, 36, 37, 5, 6, "￥"+ resultVO.getPacketActualTotalPrice().setScale(2, RoundingMode.HALF_UP));
         createMergedCell(sheet, workbook, 36, 7, 36, 37, 7, 9, "");
 ////第十九行
         createMergedCell(sheet, workbook, 38, 0, 38, 39, 0, 4, "订单总数量");
@@ -167,27 +171,27 @@ public class CalculateProfitServiceImpl {
         createMergedCell(sheet, workbook, 38, 7, 38, 39, 7, 9, "");
 ////第二十行
         createMergedCell(sheet, workbook, 40, 0, 40, 41, 0, 4, "实际跟单单价=实际跟单费用/件数");
-        createMergedCell(sheet, workbook, 40, 5, 40, 41, 5, 6, "￥"+resultVO.getActualRmbPrice());
+        createMergedCell(sheet, workbook, 40, 5, 40, 41, 5, 6, "￥"+ resultVO.getActualRmbPrice());
         createMergedCell(sheet, workbook, 40, 7, 40, 41, 7, 9, "");
 //第二十一行
         createMergedCell(sheet, workbook, 42, 0, 42, 43, 0, 4, "实际跟单单价折算美金");
-        createMergedCell(sheet, workbook, 42, 5, 42, 43, 5, 6, "$"+resultVO.getActualPrice());
+        createMergedCell(sheet, workbook, 42, 5, 42, 43, 5, 6, "$"+ resultVO.getActualPrice());
         createMergedCell(sheet, workbook, 42, 7, 42, 43, 7, 9, "");
 //第二十二行
         createMergedCell(sheet, workbook, 44, 0, 44, 45, 0, 4, "包装费用收益");
-        createMergedCell(sheet, workbook, 44, 5, 44, 45, 5, 6, "￥"+resultVO.getPacketProfitPrice());
+        createMergedCell(sheet, workbook, 44, 5, 44, 45, 5, 6, "￥"+ resultVO.getPacketProfitPrice());
         createMergedCell(sheet, workbook, 44, 7, 44, 45, 7, 9, "");
 //第二十三行
         createMergedCell(sheet, workbook, 46, 0, 46, 47, 0, 4, "实际汇率");
-        createMergedCell(sheet, workbook, 46, 5, 46, 47, 5, 6, "￥"+resultVO.getActualRatio().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 46, 5, 46, 47, 5, 6, "￥"+ resultVO.getActualRatio().setScale(2, RoundingMode.HALF_UP));
         createMergedCell(sheet, workbook, 46, 7, 46, 47, 7, 9, "");
 //第二十四行
         createMergedCell(sheet, workbook, 48, 0, 48, 49, 0, 4, "汇率收益");
-        createMergedCell(sheet, workbook, 48, 5, 48, 49, 5, 6, "￥"+resultVO.getActualRatioProfitPrice());
+        createMergedCell(sheet, workbook, 48, 5, 48, 49, 5, 6, "￥"+ resultVO.getActualRatioProfitPrice());
         createMergedCell(sheet, workbook, 48, 7, 48, 49, 7, 9, "");
 //第二十五行
         createMergedCell(sheet, workbook, 50, 0, 50, 51, 0, 4, "综合收益");
-        createMergedCell(sheet, workbook, 50, 5, 50, 51, 5, 6, "￥"+resultVO.getTotalProfitPrice());
+        createMergedCell(sheet, workbook, 50, 5, 50, 51, 5, 6, "￥"+ resultVO.getTotalProfitPrice());
         createMergedCell(sheet, workbook, 50, 7, 50, 51, 7, 9, "");
         response.setHeader("Content-Disposition", "attachment; filename=\"-.xlsx\"");
         workbook.write(response.getOutputStream());
@@ -203,6 +207,10 @@ public class CalculateProfitServiceImpl {
      */
     public ServerResult innerProfitRatioExport(HttpServletResponse response,InnerProfitRatioQueryVO queryVO) throws IOException {
         InnerProfitRatioResultVO resultVO = buildInnerProfitRatioResultVO(queryVO);
+        return writeInnerProfitRatioData(response, resultVO);
+    }
+
+    private ServerResult<Object> writeInnerProfitRatioData(HttpServletResponse response, InnerProfitRatioResultVO resultVO) throws IOException {
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("内部生产净利润分析表");
         Row row = sheet.createRow(0);
@@ -270,7 +278,7 @@ public class CalculateProfitServiceImpl {
         createMergedCell(sheet, workbook, 20, 4, 20, 21, 4, 5, "￥"+ resultVO.getInnerProduceTotalPrice());
         createMergedCell(sheet, workbook, 20, 6, 20, 21, 6, 7, "");
         createMergedCell(sheet, workbook, 20, 8, 20, 21, 8, 10, "");
- //第十一行
+        //第十一行
         createMergedCell(sheet, workbook, 22, 0, 22, 23, 0, 3, "内部生产净利润");
         createMergedCell(sheet, workbook, 22, 4, 22, 23, 4, 5, "￥"+ resultVO.getInnerProduceTotalProfit());
         createMergedCell(sheet, workbook, 22, 6, 22, 23, 6, 7, "");
@@ -281,6 +289,7 @@ public class CalculateProfitServiceImpl {
         workbook.close();
         return ServerResult.success();
     }
+
     public void createMergedCell(Sheet sheet, Workbook workbook, int rowIndex, int colIndex, int startRow, int endRow, int startCol, int endCol, String value) {
         // 创建或获取当前行
         Row row = sheet.getRow(rowIndex);
@@ -35,22 +35,19 @@ import com.order.erp.domain.excel.AccountStatementExcelVO;
 import com.order.erp.domain.vo.AccountStatementVO;
 import com.order.erp.domain.vo.ProducePdfVO;
 import com.order.erp.domain.vo.order.*;
-import com.order.erp.job.OrderOverTimeEventJob;
 import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.admin.AdminUserRoleService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
-import freemarker.template.TemplateException;
 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;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
-import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
@@ -150,6 +147,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private  ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+    @Autowired
+    private IOrderCostInfoService orderCostInfoService;
     @Resource
     private OrderTrackStageService orderTrackStageService;
@@ -267,6 +266,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充发票信息       对于填充发票信息和填充生产科对账单号,其实不需要在这里写了,而且这里只是填充了invoice号和check号,这里的代码是填充数据,达到一个进度条的效果,既然没有根据是否填充发票来填充进度条,这里就不需要写。
 //            fillInvoiceNo(resultVOList);
+
+            fillOrderCostDetils(resultVOList);
             //第四版  start
 /*            //需要填充生产科对账单号信息
             fillCheckNo(resultVOList);
@@ -287,6 +288,29 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return resultVOList;
     }
+    private void fillOrderCostDetils(List<OrderInfoResultVO> resultVOList) {
+        if (CollectionUtils.isEmpty(resultVOList)) {
+            return;
+        }
+
+        Set<Long> orderIds = resultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+        List<OrderCostInfoDO> orderCostInfoDOS = orderCostInfoService.lambdaQuery()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderCostInfoDO::getOrderId, orderIds)
+                .list();
+
+        if (CollectionUtils.isNotEmpty(orderCostInfoDOS)) {
+            Map<Long, OrderCostInfoDO> orderCostDetailDOMap = orderCostInfoDOS.stream().collect(Collectors.toMap(OrderCostInfoDO::getOrderId, Function.identity(), (v1, v2) -> v1));
+            resultVOList.forEach(result -> {
+                if (orderCostDetailDOMap.containsKey(result.getId())) {
+                    OrderCostInfoDO orderCostInfoDO = orderCostDetailDOMap.get(result.getId());
+                    OrderCostInfoVO orderCostInfoVO = BeanUtil.copyProperties(orderCostInfoDO, OrderCostInfoVO.class);
+                    result.setOrderCostInfo(orderCostInfoVO);
+                }
+            });
+        }
+    }
+
     @Override
     public void export(HttpServletResponse response, OrderBaseInfoQueryVO queryVO) throws IOException, Excel4JException {
         OrderLockFieldVO lockFieldVO = queryVO.getFieldVO();
@@ -1585,6 +1609,8 @@ end
                 .in(CollectionUtils.isNotEmpty(queryVO.getCheckNo()),OrderBaseInfoDO::getCheckNo,queryVO.getCheckNo())
                 .eq(Objects.nonNull(queryVO.getInvoiceStatus()), OrderBaseInfoDO::getInvoiceStatus, queryVO.getInvoiceStatus())
                 .eq(Objects.nonNull(queryVO.getCheckNoStatus()), OrderBaseInfoDO::getCheckStatus, queryVO.getCheckNoStatus())
+                .in(CollUtil.isNotEmpty(queryVO.getIds()), OrderBaseInfoDO::getId, queryVO.getIds())
+                .likeRight(StringUtils.isNotBlank(queryVO.getProjectNoLikeRight()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNoLikeRight())
                 .orderByDesc(OrderBaseInfoDO::getId)
                 ;
     }
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+import com.order.erp.domain.vo.order.OrderCostOptLogResultVO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+import com.order.erp.domain.vo.order.ProjectOptLogResultVO;
+import com.order.erp.mapper.order.OrderCostDetailedOptLogMapper;
+import com.order.erp.service.admin.AdminUserService;
+import com.order.erp.service.order.OrderCostDetailedOptLogService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class OrderCostDetailedOptLogServiceImpl extends ServiceImpl<OrderCostDetailedOptLogMapper, OrderCostDetailedOptLogDO> implements OrderCostDetailedOptLogService{
+    @Resource
+    private AdminUserService userService;
+
+    @Override
+    public ServerResult listByPage(OrderCostDetailedOptedLogQueryVO queryVO) {
+        LambdaQueryWrapper<OrderCostDetailedOptLogDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<OrderCostDetailedOptLogDO> iPage = page(page, queryWrapper);
+
+        Page<OrderCostOptLogResultVO> webVOPage = new Page<>();
+        List<OrderCostDetailedOptLogDO> OrderCostDetailedOptLogDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(OrderCostDetailedOptLogDOS)) {
+            Set<Long> userIds = OrderCostDetailedOptLogDOS.stream().map(OrderCostDetailedOptLogDO::getUserId).collect(Collectors.toSet());
+            Map<Long, AdminUserDO> userDOMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                List<AdminUserDO> userDOS = userService.listByIds(userIds);
+                if (CollectionUtils.isNotEmpty(userDOS)) {
+                    userDOMap = userDOS.stream().collect(Collectors.toMap(AdminUserDO::getId, Function.identity()));
+                }
+            }
+            Map<Long, AdminUserDO> finalUserDOMap = userDOMap;
+            List<OrderCostOptLogResultVO> resultVOList = OrderCostDetailedOptLogDOS.stream().map(x -> {
+                OrderCostOptLogResultVO resultVO = new OrderCostOptLogResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                if (finalUserDOMap.containsKey(x.getUserId())) {
+                    resultVO.setUserName(finalUserDOMap.get(x.getUserId()).getUserName());
+                }
+                return resultVO;
+            }).collect(Collectors.toList());
+
+            webVOPage.setRecords(resultVOList);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    private LambdaQueryWrapper<OrderCostDetailedOptLogDO> buildQueryByParam(OrderCostDetailedOptedLogQueryVO queryVO) {
+        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())
+                .orderByDesc(OrderCostDetailedOptLogDO::getId);
+    }
+
+
+}
+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;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
+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.config.DataScope;
+import com.order.erp.domain.*;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+import com.order.erp.domain.dto.order.OrderCostInfoDO;
+import com.order.erp.domain.dto.order.OrderFieldLockApplyDO;
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.OrderCostInfoMapper;
+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.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-22
+ */
+@Service
+public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, OrderCostInfoDO> implements IOrderCostInfoService {
+    @Autowired
+    private DataScope dataScope;
+    @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+    @Autowired
+    private OrderBaseInfoService orderBaseInfoService;
+    @Autowired
+    private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
+    @Autowired
+    private SystemSettingService systemSettingService;
+    @Autowired
+    private OrderCostDetailedOptLogService orderCostDetailedOptLogService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ServerResult edit(OrderCostInfoVO vo) {
+        Integer type=null;
+        String  operationDesc=null;
+        Long id = vo.getOrderId();
+        Optional<OrderCostInfoDO> orderCostInfoDOOpt = this.lambdaQuery()
+                .eq(OrderCostInfoDO::getOrderId, id)
+                .last(" limit 1 ")
+                .oneOpt();
+        OrderCostInfoDO orderCostInfoDO = null;
+        OrderCostInfoDO oldOrderCostInfoDO = null;
+        boolean isUpdate = orderCostInfoDOOpt.isPresent();
+        if (!isUpdate) {
+            //对象不存在。
+            orderCostInfoDO = BeanUtil.copyProperties(vo, OrderCostInfoDO.class);
+        } else {
+            orderCostInfoDO = orderCostInfoDOOpt.get();
+            oldOrderCostInfoDO = BeanUtil.copyProperties(orderCostInfoDO, OrderCostInfoDO.class,"id","orderId","createTime","createBy","modifyTime","modifyBy","enableFlag");
+            BeanUtil.copyProperties(vo, orderCostInfoDO, CopyOptions.create().ignoreNullValue());
+        }
+        // 如果对于新旧数据一致时,则不会进行状态设置。  但是对于第一次创建数据应该怎么办呢？ 通过isUpdate来进行判断。  对象不存在时,就不需要判断数据是否一致,对象存在时,就需要进行判断数据是否一致。如果一致,则不要进行状态设置,反之则需要进行状态设置。
+
+        Optional<OrderCostFieldLockRecord> orderCostFieldLockRecordOpt = orderCostFieldLockRecordService
+                .lambdaQuery()
+                .eq(OrderCostFieldLockRecord::getOrderId, id)
+                .last(" limit 1 ")
+                .oneOpt();
+        OrderCostFieldLockRecord orderCostFieldLockRecord = orderCostFieldLockRecordOpt.orElse(
+                OrderCostFieldLockRecord.builder()
+                        .orderId(id)
+                        .userId(dataScope.getLoginUserId())
+                        .build()
+        );
+        OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(Optional.ofNullable(orderCostFieldLockRecord.getFields()).orElse("{}"), OrderCostInfolockFieldVO.class);
+        if(Objects.nonNull(vo.getPacketActualRmbTotalPrice())){
+            originOrderCostInfolockFieldVO.setPacketActualRmbTotalPrice(OrderLockFieldEnum.LOCKED.name());
+            type=ProjectOptTypeEnum.PACKAGING_COST_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_COST_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_COST_ADD.getDesc();
+            //编辑包装费用实际金额之后状态为待审核
+            /*需要考虑一个问题,假如状态为已通过,但是没有进行任何的修改而点击了确认,那么它的状态会由已审核变为待审核,所以需要进行判断一下,此次传递来的数据是否与上一次的数据一致,如果不一致则需要进行状态设置*/
+            if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
+                    && oldOrderCostInfoDO.getPacketActualRmbTotalPrice().compareTo(vo.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());
+            originOrderCostInfolockFieldVO.setProductionActualPrice(OrderLockFieldEnum.LOCKED.name());
+            originOrderCostInfolockFieldVO.setProductionDepartmentPredictPrice(OrderLockFieldEnum.LOCKED.name());
+            type=ProjectOptTypeEnum.INTERNAL_PRODUCE_DETAILS_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_ADD.getDesc();
+            //编辑生产科预算金额和实际发生费用之后状态为待审核
+            /*也需要考虑问题,假如状态为已通过,但是没有进行任何修改二点击了确认,那么它的状态会由已审核变为待审核*/
+            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){
+            }else{
+                orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
+            }
+        }
+        orderCostFieldLockRecord.setFields(JSONObject.toJSONString(originOrderCostInfolockFieldVO));
+        orderCostFieldLockRecordService.saveOrUpdate(orderCostFieldLockRecord);
+        this.saveOrUpdate(orderCostInfoDO);
+        //进行日志记录。
+        OrderCostInfoVO orderCostInfoVO = buildOrderConstInfoVO(vo, id);
+        OrderCostDetailedOptLogDO orderConstOptLogDo = buildOrderConstOptLogDo(id, dataScope.getLoginUserId(),type ,operationDesc,JSONObject.toJSONString(orderCostInfoVO));
+        return ServerResult.success(orderCostDetailedOptLogService.save(orderConstOptLogDo));
+    }
+
+    @Override
+    public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) {
+        Integer applyType=null;
+        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, vo.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+        OrderCostInfolockFieldVO lockField = OrderCostInfolockFieldVO.builder()
+                .packetActualRmbTotalPrice(vo.getPacketActualRmbTotalPrice())
+                .productionActualPrice(vo.getProductionActualPrice())
+                .productionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice())
+                .productionDepartmentPredictUnitPrice(vo.getProductionDepartmentPredictUnitPrice())
+                .build();
+        OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
+                .orderId(vo.getOrderId())
+                .applyUserId(dataScope.getLoginUserId())
+                .applyRemark(vo.getApplyRemark())
+                .fields(JSONObject.toJSONString(lockField))
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .type(vo.getType())
+                .remark(OrderCostApplyTpeEnum.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();
+        }else{
+         applyType=OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
+        }
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(),applyType,OrderCostApplyTpeEnum.getNameByType(applyType),JSONObject.toJSONString(lockField)));
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult<Page<InnerProfitDetailVO>> listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
+        ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
+        Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
+        List<OrderInfoResultVO> records = page.getRecords();
+        List<OrderCostFieldLockRecord> lockRecords = orderCostFieldLockRecordService
+                .lambdaQuery()
+                .func(query -> {
+                    Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+                    if (CollUtil.isNotEmpty(collect)) {
+                        query.in(OrderCostFieldLockRecord::getOrderId, collect);
+
+                    } else {
+                        query.apply("1!=1");
+                    }
+                })
+                .list();
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<Long, OrderCostInfolockFieldVO> orderId2fieldMapMap = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId, record -> {
+            try {
+                return objectMapper.readValue(record.getFields(), OrderCostInfolockFieldVO.class);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+        List<InnerProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
+            OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
+            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());
+            }
+            InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
+                    .orderId(record.getId())
+                    .customerCode(record.getCustomerCode())
+                    .projectNo(record.getProjectNo())
+                    .productionDepartment(record.getProductionDepartment())
+                    .innerNo(record.getInnerNo())
+                    .picUrl(record.getPicUrl())
+                    .orderCount(record.getOrderCount())
+                    .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())
+                    .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)
+                    .build();
+
+            if (Objects.nonNull(vo.getProductionDepartmentPredictPrice())
+                    && Objects.nonNull(vo.getProductionActualPrice())
+                    && vo.getProductionDepartmentPredictPrice().compareTo(BigDecimal.ZERO) != 0) {
+                //预算占比=实际发生费用/预算金额
+                vo.setPredictRatio(vo.getProductionActualPrice().divide(vo.getProductionDepartmentPredictPrice(), 4, RoundingMode.HALF_UP));
+                //预算占比与实际比占比差:1-预算占比
+                vo.setPredictAndActualRatio(new BigDecimal(1).subtract(vo.getPredictRatio()));
+            }
+            if (Objects.nonNull(vo.getProductionDepartmentTotalPrice())
+                    && Objects.nonNull(vo.getProductionDepartmentPredictPrice())) {
+                //事前毛利润=生产总额-预算金额
+                vo.setBeforeGrossProfit(BigDecimal.valueOf(vo.getProductionDepartmentTotalPrice()).subtract(vo.getProductionDepartmentPredictPrice()));
+                if (Objects.nonNull(vo.getProductionDepartmentTotalPrice())
+                        && vo.getProductionDepartmentTotalPrice().compareTo(0.0) != 0) {
+                    //事前毛利润率=事前毛利润/生产总额
+                    vo.setBeforeGrossProfitRate(vo.getBeforeGrossProfit().divide(BigDecimal.valueOf(vo.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
+                }
+            }
+            if (Objects.nonNull(vo.getProductionDepartmentTotalPrice())
+                    && Objects.nonNull(vo.getProductionActualPrice())) {
+                //事后毛利润=实际发生费用-生产总额
+                vo.setGrossProfit(BigDecimal.valueOf(vo.getProductionDepartmentTotalPrice()).subtract(vo.getProductionActualPrice()));
+                if (Objects.nonNull(vo.getProductionDepartmentTotalPrice())
+                        && vo.getProductionDepartmentTotalPrice().compareTo(0.0) != 0) {
+                    //事后毛利润率=事后毛利润/生产总额
+                    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));
+            }
+            return vo;
+        }).collect(Collectors.toList());
+        Page<InnerProfitDetailVO> webVOPage = new Page<>();
+        webVOPage.setRecords(innerProfitRatioResultVOs);
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+
+    @Override
+    public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO) {
+        ServerResult serverResult = orderBaseInfoService.listByPage(queryVO);
+        Page<OrderInfoResultVO> page = (Page<OrderInfoResultVO>) serverResult.getData();
+        List<OrderInfoResultVO> records = page.getRecords();
+        List<OrderCostFieldLockRecord> lockRecords = orderCostFieldLockRecordService
+                .lambdaQuery()
+                .func(query -> {
+                    Set<Long> collect = records.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+                    if (CollUtil.isNotEmpty(collect)) {
+                        query.in(OrderCostFieldLockRecord::getOrderId, collect);
+
+                    } else {
+                        query.apply("1!=1");
+                    }
+                })
+                .list();
+        ObjectMapper objectMapper = new ObjectMapper();
+        Map<Long, OrderCostInfolockFieldVO> orderId2fieldMapMap = lockRecords.stream().collect(Collectors.toMap(OrderCostFieldLockRecord::getOrderId, record -> {
+            try {
+                return objectMapper.readValue(record.getFields(), OrderCostInfolockFieldVO.class);
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+        BigDecimal exchangeRate = systemSettingService.getExchangeRate();
+
+        List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
+            OrderCostInfoVO orderCostInfo = record.getOrderCostInfo();
+            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());
+            }
+            BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
+                    .orderId(record.getId())
+                    .customerCode(record.getCustomerCode())
+                    .projectNo(record.getProjectNo())
+                    .productionDepartment(record.getProductionDepartment())
+                    .innerNo(record.getInnerNo())
+                    .picUrl(record.getPicUrl())
+                    .orderCount(record.getOrderCount())
+                    .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())
+                    .packStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getPackStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getPackStatus())
+                    .lockFields(lockFields)
+                    .build();
+            if (Objects.nonNull(vo.getPacketTotalPrice())) {
+                //包装费用合计 = 包装费合计*汇率
+                vo.setPacketRmbTotalPrice(BigDecimal.valueOf(vo.getPacketTotalPrice()).multiply(exchangeRate.setScale(4, RoundingMode.HALF_UP)).doubleValue());
+            }
+            if (Objects.nonNull(vo.getPacketActualRmbTotalPrice()) && Objects.nonNull(vo.getOrderCount())) {
+                //实际跟单单价 = 包装费用实际金额/数量
+                vo.setPacketActualRmbPrice(vo.getPacketActualRmbTotalPrice().divide(BigDecimal.valueOf(vo.getOrderCount()), 4, RoundingMode.HALF_UP));
+                //实际跟单单价折算美金$ = 人民币单价/汇率
+                vo.setPacketActualPrice(vo.getPacketActualRmbPrice().divide(exchangeRate, 4, RoundingMode.HALF_UP));
+            }
+            if (Objects.nonNull(vo.getPacketRmbTotalPrice()) && Objects.nonNull(vo.getPacketActualRmbPrice())) {
+                //包装费用收益￥ = 包装费用合计-包装费用实际金额
+                vo.setPacketProfitRmbPrice(BigDecimal.valueOf(vo.getPacketRmbTotalPrice()).subtract(vo.getPacketActualRmbTotalPrice()));
+            }
+            if (Objects.nonNull(vo.getPacketProfitRmbPrice()) && Objects.nonNull(vo.getPacketRmbTotalPrice())) {
+                //包装费用净利润率 = 包装费用收益/包装费用合计
+                vo.setPacketProfitRate(vo.getPacketProfitRmbPrice().divide(BigDecimal.valueOf(vo.getPacketRmbTotalPrice()), 4, RoundingMode.HALF_UP));
+            }
+            return vo;
+        }).collect(Collectors.toList());
+        Page<BusinessProfitDetailVO> webVOPage = new Page<>();
+        webVOPage.setRecords(innerProfitRatioResultVOs);
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    @Override
+    public void exportBusinessProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception {
+        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+           CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
+           CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
+           CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
+           CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
+                .page(1)
+                .pageSize(200); // 设置大一点，确保导出数据不遗漏
+
+      // 根据传入条件设置筛选字段
+        if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
+            builder.orderIds(queryVO.getOrderIds());
+        } else {
+            //如果orderIds为空就代表传递的是筛选条件。
+            if (CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
+                builder.projectNo(queryVO.getProjectNo());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode())) {
+                builder.customerCode(queryVO.getCustomerCode());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())) {
+                builder.productionDepartment(queryVO.getProductionDepartment());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
+                builder.innerNo(queryVO.getInnerNo());
+            }
+        }
+        ServerResult serverResult = listBusinessProfitDetailByPage(builder.build());
+        Page<BusinessProfitDetailVO> page = (Page<BusinessProfitDetailVO>) serverResult.getData();
+        List<BusinessProfitDetailVO> businessProfitDetailVOS = page.getRecords();
+        System.out.println("订单数量:"+businessProfitDetailVOS.size());
+        if(CollectionUtils.isNotEmpty(businessProfitDetailVOS)){
+            List<Map<String, Object>> list = buildBusinessProfitExportExcel(businessProfitDetailVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+                System.out.println("导出成功");
+            }
+        }
+        System.out.println(businessProfitDetailVOS);
+    }
+
+    @Override
+    public void exportInnerProfitDetailExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
+        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+                CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
+                CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
+                CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
+                CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
+                .page(1)
+                .pageSize(200); //设置大一点，确保导出数据不遗漏
+        if(CollectionUtils.isNotEmpty(queryVO.getOrderIds())){
+            builder.orderIds(queryVO.getOrderIds());
+        }else{
+            //如果orderIds为空就代表传递的是筛选条件。
+            if(CollectionUtils.isNotEmpty(queryVO.getProjectNo())){
+                builder.projectNo(queryVO.getProjectNo());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getCustomerCode())){
+                builder.customerCode(queryVO.getCustomerCode());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())){
+                builder.productionDepartment(queryVO.getProductionDepartment());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                builder.innerNo(queryVO.getInnerNo());
+            }
+        }
+        //这里设置为100是故意设置大一点,防止导出多条数据。
+        ServerResult<Page<InnerProfitDetailVO>> serverResult= listInnerProfitDetailByPage(builder.build());
+        Page<InnerProfitDetailVO> page=(Page<InnerProfitDetailVO>) serverResult.getData();
+        List<InnerProfitDetailVO> innerProfitDetailVOS = page.getRecords();
+        System.out.println("订单数量"+innerProfitDetailVOS.size());
+        if(CollectionUtils.isNotEmpty(innerProfitDetailVOS)){
+            List<Map<String, Object>> list = buildInnerProfitDetailExcel(innerProfitDetailVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+                System.out.println("导出成功");
+            }
+        }
+    }
+
+    @Override
+    public void setPackStatus(OrderCostInfoVO vo) {
+        //首先判断orderId是否为空。
+        if(Objects.isNull(vo.getOrderId())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
+                .last("limit 1"));
+        if(Objects.isNull(orderCostInfoDO)){
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+        orderCostInfoDO.setPackStatus(ProfitStatusEnum.APPROVED.getStatus());
+        updateById(orderCostInfoDO);
+    }
+
+    @Override
+    public void setInnerProduceStatus(OrderCostInfoVO vo) {
+        if(Objects.isNull(vo.getOrderId())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
+                .last("limit 1"));
+        if(Objects.isNull(orderCostInfoDO)){
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+       orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.APPROVED.getStatus());
+        updateById(orderCostInfoDO);
+    }
+
+
+    private OrderCostDetailedOptLogDO buildOrderConstOptLogDo(Long orderId, Long userId , Integer type, String optType, String field){
+        return OrderCostDetailedOptLogDO.builder()
+                .orderId(orderId)
+                .userId(userId)
+                .type(type)
+                .optType(optType)
+                .fields(field)
+                .build();
+    }
+    private OrderCostInfoVO buildOrderConstInfoVO(OrderCostInfoVO vo,Long orderId){
+        OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
+        BeanUtils.copyProperties(vo, orderCostInfoVO, "id");
+        orderCostInfoVO.setId(orderId);
+        return orderCostInfoVO;
+    }
+
+    private List<Map<String,Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS,ProjectBaseInfoQueryVO queryVO){
+        List<Map<String,Object>> list= new ArrayList<>();
+        for(BusinessProfitDetailVO vo:businessProfitDetailVOS){
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            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() : "");
+            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()) : "");
+            map.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
+            map.put("包装费用实际金额￥",Objects.nonNull(vo.getPacketActualRmbTotalPrice()) ? vo.getPacketActualRmbTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价$",Objects.nonNull(vo.getPacketActualPrice()) ? vo.getPacketActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("包装费用净利润率",Objects.nonNull(vo.getPacketProfitRate()) ? vo.getPacketProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+//            if(StringUtils.isNotBlank(queryVO.getBusinessCostExportSelect().getPacketPrice()) &&
+//                OrderLockFieldEnum.SELECTED.name().equals(queryVO.getBusinessCostExportSelect().getPacketPrice())){
+//
+//            }
+            list.add(map);
+        }
+        return list;
+    }
+
+    private List<Map<String,Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO){
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (InnerProfitDetailVO vo:innerProfitDetailVOS){
+            Map<String, Object> hashMap = new LinkedHashMap<>();
+            hashMap.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            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() : "");
+            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()) : "");
+            hashMap.put("生产科预算金额￥",Objects.nonNull(vo.getProductionDepartmentPredictPrice()) ? vo.getProductionDepartmentPredictPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("实际发生费用￥",Objects.nonNull(vo.getProductionActualPrice()) ? vo.getProductionActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("预算占比",Objects.nonNull(vo.getPredictRatio()) ? vo.getPredictRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("预算占比与实际占比差",Objects.nonNull(vo.getPredictAndActualRatio()) ? vo.getPredictAndActualRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事前毛利润",Objects.nonNull(vo.getBeforeGrossProfit()) ? vo.getBeforeGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事前毛利率",Objects.nonNull(vo.getBeforeGrossProfitRate()) ? vo.getBeforeGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事后毛利润",Objects.nonNull(vo.getGrossProfit()) ? vo.getGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事后毛利率",Objects.nonNull(vo.getGrossProfitRate()) ? vo.getGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            /*if(StringUtils.isNotBlank(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice()) &&
+            OrderLockFieldEnum.SELECTED.name().equals(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice())){
+
+            }*/
+            list.add(hashMap);
+        }
+        return list;
+    }
+
+}
 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;
@@ -20,12 +21,15 @@ import com.order.erp.config.DataScope;
 import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderFieldLockApplyMapper;
+import com.order.erp.service.IOrderCostFieldLockRecordService;
 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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +39,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 /**
  * 用户订单-字段锁定申请表(OrderFieldLockApply)表服务实现类
@@ -52,6 +57,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderFieldLockRecordService fieldLockRecordService;
+    @Autowired
+    private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
+
     @Resource
     private OrderFieldLockApplyService applyService;
@@ -121,15 +129,23 @@ 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));
                     }
+                    // todo
+                    if (Stream.of(OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
+                                    OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
+                            .map(OrderCostApplyTpeEnum::getType)
+                            .anyMatch(type -> type.equals(x.getType()))) {
+                        OrderCostInfolockFieldVO orderCostInfolockFieldVO = JSONObject.parseObject(fields, OrderCostInfolockFieldVO.class);
+                        resultVO.setFieldInfos(OrderLockFieldVO.builder().costInfolockFieldVO(orderCostInfolockFieldVO).build());
+                    }
                     if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         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);
@@ -158,8 +174,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         } else{
                             resultVO.setFieldInfos(orderLockFieldVO);
                         }
-                        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()) || ApplyTypeEnum.CHECK_DEDUCT_URL.getType().equals(x.getType())) {
@@ -200,13 +216,13 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                         } else{
                             resultVO.setFieldInfos(orderLockFieldVO);
                         }
-                        if(Objects.isNull(resultVO.getFieldInfos())){
-                            resultVO=null;
+                        if (Objects.isNull(resultVO.getFieldInfos())) {
+                            resultVO = null;
                         }
                     }
                 }
                 return resultVO;
-            }).filter(result->result!=null).collect(Collectors.toList());
+            }).filter(Objects::nonNull).collect(Collectors.toList());
             if (resultVOList != null && resultVOList.stream().noneMatch(x -> ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())
                     || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())
                     || ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(x.getType())
@@ -406,7 +422,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());
@@ -424,7 +440,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
 //        queryVO.getType==Constant.SIXTY完全是为了跟单和业务对于应收账单类型请求时,屏蔽掉应收账单,只展示invoice扣款单申请数据。
         if(queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050 || queryVO.getType()==Constant.SIXTY){
-        }else{
+        } else {
             /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
             //这里是否还u需要添加财务角色权限的逻辑。
             if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
@@ -450,14 +466,14 @@ 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,ApplyTypeEnum.CHECK_DEDUCT_URL.getType());
                 //目前是只能通过内部编号查询出应付款审核,无法查询出发票信息。
-                if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                     String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                     queryWrapper.apply(
                             "(" +
@@ -472,7 +488,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 //应收款审核。
                     queryWrapper.in(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType(),ApplyTypeEnum.INVOICE_DEDUCT_URL.getType());
                     //这个内部编号单独针对于应付款申请设置的。
-                    if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                    if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
                         String queryInnerNo = queryVO.getInnerNo().get(0).trim();
                         queryWrapper.apply(
                                 "(" +
@@ -525,15 +541,22 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         }else if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050 || queryVO.getType() ==Constant.SIXTY)){
-        }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;
+        return queryWrapper
+                .func(Objects.nonNull(queryVO.getTypeIn()), query -> {
+                    if (CollUtil.isNotEmpty(queryVO.getTypeIn())) {
+                        query.in(OrderFieldLockApplyDO::getType, queryVO.getTypeIn());
+                    } else {
+                        query.apply("1!=1");
+                    }
+                });
     }
     /**
@@ -676,16 +699,16 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 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())) {
@@ -696,7 +719,7 @@ 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<OrderFieldLockApplyDO> InvoiceDeductUrlList = list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
@@ -708,7 +731,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 throw new BusinessException("该Invoice存在未审批的扣款单,请先审批该对账单的扣款单!");
             }
             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;
@@ -757,8 +780,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 throw new BusinessException("该生产科对账单存在未审批的扣款单,请先审批该对账单的扣款单!");
             }
             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());
@@ -783,7 +806,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 emailSendUtils.sendInvoiceAndCheckEmail(FinanceOverEnum.CHECK_FAIL,invoiceAndCheckBillSendEmailVO,false);
             }
-        } 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);
             ProducePaymentCheckBillVO checkBillOrderDO = lockFieldVO.getCheckBillVO();
@@ -791,9 +814,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()));
@@ -802,7 +825,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     String updatedInvoiceUrls = String.join(",", urlList);
                     invoiceInfoDO.setInvoiceUrl(updatedInvoiceUrls);
                 }
-            }else{
+            } else {
                 invoiceInfoDO.setInvoiceUrl(null);
             }
             checkBillOrderService.updateById(invoiceInfoDO);
@@ -992,7 +1015,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             //后期需要判断是否存在存在未审核的扣款单。
             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();
             //查询是否存在未审核的扣款单。
@@ -1005,7 +1028,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 throw new BusinessException("该Invoice存在未审批的扣款单,请先审批该对账单的扣款单!");
             }
             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;
@@ -1054,7 +1077,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 throw new BusinessException("该生产科对账单存在未审批的扣款单,请先审批该对账单的扣款单!");
             }
             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;
@@ -1068,7 +1091,7 @@ 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);
                 });
@@ -1079,7 +1102,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 emailSendUtils.sendInvoiceAndCheckEmail(FinanceOverEnum.CHECK_PASS,invoiceAndCheckBillSendEmailVO,true);
             }
-        }  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);
@@ -1088,18 +1111,18 @@ 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());
                 }
             }
@@ -1166,6 +1189,39 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             InvoiceAndCheckBillSendEmailVO invoiceAndCheckBillSendEmailVO = new InvoiceAndCheckBillSendEmailVO();
             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)
+                .anyMatch(x -> x.equals(applyDO.getType()))) {
+            applyDO.setAuditUserId(auditUserId);
+            applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+
+            OrderCostFieldLockRecord recordDO = orderCostFieldLockRecordService.getOne(new LambdaQueryWrapper<OrderCostFieldLockRecord>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderCostFieldLockRecord::getOrderId, applyDO.getOrderId())
+                    .eq(OrderCostFieldLockRecord::getUserId, applyDO.getApplyUserId())
+                    .orderByDesc(OrderCostFieldLockRecord::getId)
+                    .last("limit 1"));
+            if (Objects.isNull(recordDO)) {
+                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));
+            }
+            if (Objects.isNull(recordDO.getId())) {
+                orderCostFieldLockRecordService.save(recordDO);
+            } else {
+                orderCostFieldLockRecordService.updateById(recordDO);
+            }
         }
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_PASS.getDesc()).build();
@@ -3,30 +3,55 @@ package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ProfitUtils;
 import com.order.erp.common.utils.StringUtils;
 import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
+import com.order.erp.domain.dto.order.ProjectBaseInfoDO;
+import com.order.erp.domain.model.OrderCostFieldLockRecord;
+import com.order.erp.domain.model.ProjectFieldLockRecord;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
-import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
-import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
-import com.order.erp.domain.vo.order.ProfitCalculateVO;
+import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderProfitAnalysisMapper;
+import com.order.erp.service.IProjectFieldLockRecordService;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.impl.OrderCostFieldLockRecordServiceImpl;
+import com.order.erp.service.order.IProjectBaseInfoService;
 import com.order.erp.service.order.OrderBaseInfoService;
+import com.order.erp.service.order.OrderFieldLockRecordService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.function.Function;
 import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.List;
@@ -46,6 +71,16 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     @Resource
     private OrderBaseInfoService orderBaseInfoService;
+    @Autowired
+    private SystemSettingService systemSettingService;
+    @Autowired
+    private IProjectBaseInfoService projectProfitAnalysisService;
+    @Autowired
+    private IProjectFieldLockRecordService projectionFieldLockRecordService;
+    @Resource
+    private OrderFieldLockRecordService orderFieldLockRecordService;
+    @Autowired
+    OrderCostFieldLockRecordServiceImpl orderCostFieldLockRecordService;
     /**
      * 通过ID查询单条数据
@@ -109,6 +144,7 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
         if (Objects.isNull(orderProfitAnalysisVO.getId())) {
             return ServerResult.fail("id 不能为空");
         }
+        orderProfitAnalysisVO.getId();
         OrderProfitAnalysisDO orderProfitAnalysisDo = BeanUtil.copyProperties(orderProfitAnalysisVO, OrderProfitAnalysisDO.class);
         updateById(orderProfitAnalysisDo);
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+import com.order.erp.mapper.order.ProjectBaseAfterReviewSettingMapper;
+import com.order.erp.service.order.ProjectBaseAfterReviewSettingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ProjectBaseAfterReviewSettingServiceImpl extends ServiceImpl<ProjectBaseAfterReviewSettingMapper, ProjectBaseAfterReviewSettingDO> implements ProjectBaseAfterReviewSettingService {
+}
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+import com.order.erp.domain.vo.order.ProjectOptLogResultVO;
+import com.order.erp.mapper.order.ProjectBaseDevelopOptLogMapper;
+import com.order.erp.service.admin.AdminUserService;
+
+import com.order.erp.service.order.ProjectBaseDevelopOptLogService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class ProjectBaseDevelopOptLogServiceImpl extends ServiceImpl<ProjectBaseDevelopOptLogMapper, ProjectBaseDevelopOptLogDO> implements ProjectBaseDevelopOptLogService {
+    @Resource
+    private AdminUserService userService;
+
+    @Override
+    public ServerResult listByPage(ProjectOptLogQueryVO queryVO) {
+        LambdaQueryWrapper<ProjectBaseDevelopOptLogDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<ProjectBaseDevelopOptLogDO> iPage = page(page, queryWrapper);
+
+        Page<ProjectOptLogResultVO> webVOPage = new Page<>();
+        List<ProjectBaseDevelopOptLogDO> ProjectDevelopOptLogDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(ProjectDevelopOptLogDOS)) {
+            Set<Long> userIds = ProjectDevelopOptLogDOS.stream().map(ProjectBaseDevelopOptLogDO::getUserId).collect(Collectors.toSet());
+            Map<Long, AdminUserDO> userDOMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                List<AdminUserDO> userDOS = userService.listByIds(userIds);
+                if (CollectionUtils.isNotEmpty(userDOS)) {
+                    userDOMap = userDOS.stream().collect(Collectors.toMap(AdminUserDO::getId, Function.identity()));
+                }
+            }
+            Map<Long, AdminUserDO> finalUserDOMap = userDOMap;
+            List<ProjectOptLogResultVO> resultVOList = ProjectDevelopOptLogDOS.stream().map(x -> {
+                ProjectOptLogResultVO resultVO = new ProjectOptLogResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                if (finalUserDOMap.containsKey(x.getUserId())) {
+                    resultVO.setUserName(finalUserDOMap.get(x.getUserId()).getUserName());
+                }
+                return resultVO;
+            }).collect(Collectors.toList());
+
+            webVOPage.setRecords(resultVOList);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    private LambdaQueryWrapper<ProjectBaseDevelopOptLogDO> buildQueryByParam(ProjectOptLogQueryVO queryVO) {
+        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())
+                .orderByDesc(ProjectBaseDevelopOptLogDO::getId);
+    }
+}
 \ No newline at end of file