feat(order): 新增订单费用字段申请功能

- 在 ApplyTypeEnum 中添加 ORDER_COST_FIELD_EDIT_APPLY 类型 - 在 OrderFieldLockApplyQueryVO 中添加 typeIn 字段，支持多类型查询 - 实现订单费用字段锁定和编辑功能 - 新增 BusinessProfitDetailVO 类，用于业务净利润分析 - 优化订单利润分析相关服务和控制器

feat(order): 新增订单费用字段申请功能
- 在 ApplyTypeEnum 中添加 ORDER_COST_FIELD_EDIT_APPLY 类型 - 在 OrderFieldLockApplyQueryVO 中添加 typeIn 字段，支持多类型查询 - 实现订单费用字段锁定和编辑功能 - 新增 BusinessProfitDetailVO 类，用于业务净利润分析 - 优化订单利润分析相关服务和控制器
曾国涛
1 parent 32270f03
Showing 55 changed files with 3292 additions and 51 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/controller/OrderProfitController.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/ProjectApplyTypeEnum.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/ProjectBaseInfoDO.java
src/main/java/com/order/erp/domain/model/OrderCostFieldLockRecord.java
src/main/java/com/order/erp/domain/model/ProjectApplyDO.java
src/main/java/com/order/erp/domain/model/ProjectFieldLockRecord.java
src/main/java/com/order/erp/domain/vo/order/AuditVO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitInfoVO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitDetailVO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfolockFieldVO.java
@@ -161,7 +161,7 @@ public class Constant {
     public static final int SEVEN = 7;
     public static final int FOURTEEN= 14;
-    public static final int THIRTY = 30;
+    public static final Integer THIRTY = 30;
     public static final int TWENTY_FIRST = 21;
+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.*;
+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 listInnerProfitDetailByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        queryVO.setProductionDepartment(Collections.singletonList("内部"));
+        return orderCostInfoService.listInnerProfitDetailByPage(queryVO);
+    }
+    @PostMapping("/BusinessProfitDetail/listByPage")
+    @ApiOperation("包装费用明细表")
+    public ServerResult 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(OrderCostInfolockFieldVO vo) throws Exception {
+       return orderCostInfoService.applyEditFileds(vo);
+    }
+
+}
@@ -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.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) {
+        queryVO.setProductionDepartment(Collections.singletonList("内部"));
+        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);
+    }
+
+}
@@ -24,6 +24,8 @@ public enum ApplyTypeEnum {
     CHECK_BILL_APPLY(40, "应付账单申请"),
     DEPARTMENT_INVOICE_APPLY(50,"生产科发票申请"),
+
+    ORDER_COST_FIELD_EDIT_APPLY(60,"订单费用字段申请"),
     ;
     private Integer type;
+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, "字段编辑申请"),
+    ;
+    @EnumValue
+    @JsonValue
+    private Integer type;
+
+    private String desc;
+}
+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;
+
+
+}
@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.math.BigDecimal;
 /**
  * 订单利润分析表(OrderProfitAnalysis)实体类
@@ -98,5 +99,19 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      */
     private int profitType;
+    /**
+     * 生产科预算金额
+     */
+    private BigDecimal productionDepartmentPredictPrice;
+
+    /**
+     * 实际发生费用
+     */
+    private BigDecimal productionActualPrice;
+
+    /**
+     * 包装费用实际金额
+     */
+    private BigDecimal packetActualRmbTotalPrice;
 }
+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 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 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 BigDecimal spainPaidRmbCommission;
+
+    private BigDecimal paidRmbCommission;
+
+    private BigDecimal actualExchangeRate;
+
+
+}
+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 = "项目id")
+    private Long projectId;
+
+
+    @ApiModelProperty(value = "申请用户id")
+    private Long applyUserId;
+
+    @ApiModelProperty(value = "审批用户id")
+    private Long auditUserId;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private String fields;
+
+    @ApiModelProperty(value = "锁定字段 json字符串")
+    private ProjectApplyTypeEnum 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 = "项目id")
+    private Long projectId;
+
+    @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;
@@ -23,17 +24,20 @@ public class AuditVO extends BasePageVO 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;
+
+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 = "项目号")
+    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 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;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @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 = "客户总价（人民币）")
+    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 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;
+
+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 {
+
+
+    /**
+     * 客户编码
+     */
+    @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  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;
+
+    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;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @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  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;
+
+}
+
@@ -61,6 +61,12 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private List<String> projectNo;
     /**
+     * 项目号右模糊
+     */
+    private String projectNoLikeRight;
+
+
+    /**
      * 客户编码集合
      */
     private List<String> customerCode;
+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;
+
+
+}
+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 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;
+
+    private Long orderId;
+
+    private String productionDepartmentPredictPrice;
+
+    private String productionActualPrice;
+
+    private String packetActualRmbTotalPrice;
+
+
+}
@@ -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;
+
+    /**
      * 应收款账单字段
      */
 //    private List<InvoiceBillOrderDO> invoiceBillOrderDOList;
@@ -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;
-
     /**
      * 客户单价￥
      */
@@ -111,4 +111,6 @@ public class OrderProfitAnalysisVO implements Serializable {
      */
     private Integer recordNum;
+
+
 }
+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 = "锁定字段 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 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.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-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProjectFieldLockApply对象", description="项目-字段锁定申请表")
+public class ProjectBaseInfoLockFieldVO implements Serializable {
+
+
+    private Long projectId;
+
+    private String projectNoPrefix;
+
+    private String developmentCopyRmbTotalPrice;
+
+    private String projectStartTime;
+
+    private String projectEndTime;
+
+
+    private String spainPaidRmbCommission;
+
+    private String paidRmbCommission;
+
+    private String actualExchangeRate;
+
+
+}
+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 BigDecimal spainPaidRmbCommission;
+
+    private BigDecimal paidRmbCommission;
+
+    private BigDecimal actualExchangeRate;
+
+
+}
+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;
+
+    private String productionDepartmentPredictPrice;
+
+    private String productionActualPrice;
+
+    private String packetActualRmbTotalPrice;
+
+
+}
+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.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.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;
+
+/**
+ * <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);
+}
+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;
+
+/**
+ * <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;
+}
@@ -4,10 +4,9 @@ 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 javax.servlet.http.HttpServletResponse;
 import java.util.List;
 /**
@@ -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);
@@ -31,22 +31,19 @@ import com.order.erp.domain.dto.admin.AdminUserRoleDO;
 import com.order.erp.domain.dto.order.*;
 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.File;
 import java.io.IOException;
@@ -56,7 +53,6 @@ import java.math.RoundingMode;
 import java.net.URL;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.Month;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -146,6 +142,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private  ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+    @Autowired
+    private IOrderCostInfoService orderCostInfoService;
@@ -232,6 +230,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充发票信息
             fillInvoiceNo(resultVOList);
+
+            fillOrderCostDetils(resultVOList);
             //第四版  start
 /*            //需要填充生产科对账单号信息
             fillCheckNo(resultVOList);
@@ -252,6 +252,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();
@@ -1502,6 +1525,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 cn.hutool.core.bean.BeanUtil;
+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.extension.plugins.pagination.Page;
+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.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ApplyTypeEnum;
+import com.order.erp.domain.ProjectApplyTypeEnum;
+import com.order.erp.domain.dto.BaseDO;
+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.order.IOrderCostInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.service.order.OrderBaseInfoService;
+import com.order.erp.service.order.OrderFieldLockApplyService;
+import com.order.erp.service.order.OrderFieldLockRecordService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+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 OrderFieldLockRecordService orderFieldLockRecordService;
+    @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+    @Autowired
+    private OrderBaseInfoService orderBaseInfoService;
+    @Autowired
+    private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
+
+    @Override
+    public ServerResult edit(OrderCostInfoVO vo) {
+        Long id = vo.getId();
+        OrderCostInfoDO byId = this.getById(id);
+        if (Objects.isNull(byId)) {
+            byId = BeanUtil.copyProperties(vo, OrderCostInfoDO.class);
+        }else {
+            BeanUtil.copyProperties(vo, byId);
+        }
+        return ServerResult.success(this.saveOrUpdate(byId));
+    }
+    @Override
+    public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getOrderId, vo.getOrderId())
+                .eq(OrderFieldLockApplyDO::getApplyUserId, dataScope.getLoginUserId())
+                .eq(OrderFieldLockApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+        Long orderId = vo.getOrderId();
+        vo.setOrderId(null);
+        OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
+                .orderId(orderId)
+                .applyUserId(dataScope.getLoginUserId())
+                .fields(JSONObject.toJSONString(vo))
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .type(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType())
+                .remark(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getDesc())
+                .build();
+        orderFieldLockApplyService.save(build);
+        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 -> {
+            InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
+                    .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())
+                    .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));
+                }
+            }
+            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);
+            }
+        }));
+        List<BusinessProfitDetailVO> innerProfitRatioResultVOs = records.stream().map(record -> {
+            BusinessProfitDetailVO vo = BusinessProfitDetailVO.builder()
+                    .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())
+                    .lockFields(orderId2fieldMapMap.get(record.getId()))
+                    .build();
+            if (Objects.nonNull(vo.getPacketTotalPrice())) {
+                //包装费用合计 = 包装费合计*汇率
+                vo.setPacketRmbTotalPrice(BigDecimal.valueOf(vo.getPacketTotalPrice()).multiply((new BigDecimal("6.2")).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(new BigDecimal("6.2"), 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);
+    }
+
+}
@@ -20,11 +20,14 @@ 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.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +52,9 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderFieldLockRecordService fieldLockRecordService;
+    @Autowired
+    private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
+
     @Resource
     private OrderFieldLockApplyService applyService;
@@ -126,6 +132,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() .equals(x.getType())) {
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
+                    if(ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType().equals(x.getType())){
+                        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));
@@ -190,7 +200,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     }
                 }
                 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()))) {
@@ -374,7 +384,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         }
         Set<Long> orderIds = new HashSet<>();
         //由于下面是原始的代码,怕改出错了,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。   限制情况为跟单业务,对应收款,应付款,发票审核请求时。
-        if(queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050){
+        if(Constant.THIRTY.equals(queryVO.getType()) ||Integer.valueOf(4050).equals(queryVO.getType())){
         }else{
             /** 这部分代码是之前的,每台看懂,就先不修改了,保留*/
@@ -474,7 +484,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
         }
-        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");
+                    }
+                });
     }
     /**
@@ -815,6 +832,28 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 }
             }
             checkBillOrderService.updateById(invoiceInfoDO);
+        } else if (ApplyTypeEnum.ORDER_COST_FIELD_EDIT_APPLY.getType().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())
+                        .build();
+            }
+            recordDO.setFields(applyDO.getFields());
+            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,34 +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.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+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.util.stream.Collectors;
 /**
@@ -45,6 +66,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查询单条数据
@@ -108,6 +139,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 cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ProjectApplyTypeEnum;
+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.OrderCostInfoDO;
+import com.order.erp.domain.dto.order.ProjectBaseInfoDO;
+import com.order.erp.domain.model.ProjectApplyDO;
+import com.order.erp.domain.model.ProjectFieldLockRecord;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.ProjectBaseInfoMapper;
+import com.order.erp.service.IProjectFieldLockRecordService;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.impl.ProjectApplyServiceImpl;
+import com.order.erp.service.order.IProjectBaseInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.service.order.OrderBaseInfoService;
+import com.order.erp.service.order.OrderProfitAnalysisService;
+import org.apache.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.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.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-12-18
+ */
+@Service
+public class ProjectBaseInfoServiceImpl extends ServiceImpl<ProjectBaseInfoMapper, ProjectBaseInfoDO> implements IProjectBaseInfoService {
+    @Autowired
+    private ProjectApplyServiceImpl projectFieldLockApplyService;
+    @Autowired
+    private DataScope dataScope;
+    @Autowired
+    private IProjectFieldLockRecordService projectionFieldLockRecordService;
+    @Autowired
+    private OrderBaseInfoService orderBaseInfoService;
+    @Autowired
+    private OrderProfitAnalysisService projectProfitAnalysisService;
+    @Autowired
+    private SystemSettingService systemSettingService;
+
+    @Override
+    public ServerResult edit(ProjectBaseInfoVO vo) {
+        Long id = vo.getId();
+        ProjectBaseInfoDO byId = this.getById(id);
+        if (Objects.isNull(byId)) {
+            byId = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
+        }else {
+            BeanUtil.copyProperties(vo, byId);
+        }
+        return ServerResult.success(this.saveOrUpdate(byId));
+    }
+    @Override
+    public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
+        List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectApplyDO::getProjectId, vo.getProjectId())
+                .eq(ProjectApplyDO::getApplyUserId, dataScope.getLoginUserId())
+                .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+        Long projectId = vo.getProjectId();
+        vo.setProjectId(null);
+        ProjectApplyDO build = ProjectApplyDO.builder()
+                .projectId(projectId)
+                .applyUserId(dataScope.getLoginUserId())
+                .fields(JSONObject.toJSONString(vo))
+                .type(ProjectApplyTypeEnum.FIELD_EDIT_APPLY)
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .build();
+        projectFieldLockApplyService.save(build);
+        return ServerResult.success();
+    }
+
+
+
+
+    @Override
+    public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) {
+        Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
+                .eq(ProjectApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .orderByDesc(ProjectApplyDO::getCreateTime)
+                .page(new Page<>(vo.getPage(), vo.getPageSize()));
+        List<ProjectApplyDO> records = page.getRecords();
+        if(CollectionUtils.isEmpty(records)){
+            return buildPageResult(page, Collections.emptyList());
+        }
+        List<Long> projectIds = records.stream().map(ProjectApplyDO::getProjectId).collect(Collectors.toList());
+        List<ProjectBaseInfoDO> projectBaseInfoDOS = this.listByIds(projectIds);
+        Map<Long,String> projectId2ProjectNoPrefixMap = projectBaseInfoDOS.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getId, ProjectBaseInfoDO::getProjectNoPrefix));
+        List<ProjectApplyVO> collect = records.stream().map(e -> {
+            ProjectApplyVO projectApplyVO = BeanUtil.copyProperties(e, ProjectApplyVO.class);
+            projectApplyVO.setProjectNoPrefix(projectId2ProjectNoPrefixMap.get(e.getProjectId()));
+            return projectApplyVO;
+        }).collect(Collectors.toList());
+        return ServerResult.success(buildPageResult(page, collect));
+    }
+
+    @Override
+    public ServerResult audit(AuditVO vo) {
+        ProjectApplyDO applyDO = projectFieldLockApplyService.getById(vo.getId());
+        applyDO.setAuditUserId(dataScope.getLoginUserId());
+
+         if(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(vo.getStatus())){
+             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+             ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
+                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                     .eq(ProjectFieldLockRecord::getProjectId, applyDO.getProjectId())
+                     .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
+                     .orderByDesc(ProjectFieldLockRecord::getId)
+                     .last("limit 1"));
+             if (Objects.isNull(recordDO)) {
+                 recordDO = ProjectFieldLockRecord.builder()
+                         .projectId(applyDO.getProjectId())
+                         .userId(applyDO.getApplyUserId())
+                         .build();
+             }
+             recordDO.setFields(applyDO.getFields());
+             if (Objects.isNull(recordDO.getId())) {
+                 projectionFieldLockRecordService.save(recordDO);
+             } else {
+                 projectionFieldLockRecordService.updateById(recordDO);
+             }
+         }
+        projectFieldLockApplyService.updateById(applyDO);
+        return ServerResult.success();
+    }
+
+
+    @Override
+    public ServerResult<Page<InnerProfitInfoVO>> listInnerProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
+        Page<OrderBaseInfoDO> page = pageProjectNoPrefix(queryVO);
+        List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOS(page, queryVO);
+        List<InnerProfitInfoVO> innerProfitInfoVOs = buildInnerProfitInfos(orderInfoResultVOS);
+        return buildPageResult(page, innerProfitInfoVOs);
+    }
+
+    @Override
+    public ServerResult<Page<BusinessProfitInfoVO>> listBusinessProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
+        Page<OrderBaseInfoDO> page = pageProjectNoPrefix(queryVO);
+        List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOS(page, queryVO);
+        List<BusinessProfitInfoVO> businessProfitInfoVOs = buildBusinessProfitInfos(orderInfoResultVOS);
+        return buildPageResult(page, businessProfitInfoVOs);
+    }
+
+    /**
+     * 分页查询项目号前8位
+     */
+    private Page<OrderBaseInfoDO> pageProjectNoPrefix(OrderBaseInfoQueryVO queryVO) {
+        LambdaQueryWrapper<OrderBaseInfoDO> orderBaseInfoDOLambdaQueryWrapper = orderBaseInfoService.buildQueryByParam(queryVO).select(OrderBaseInfoDO::getId);
+        return orderBaseInfoService.page(new Page<>(queryVO.getPage(), queryVO.getPageSize()),
+                new QueryWrapper<OrderBaseInfoDO>()
+                        .select("LEFT(project_no, 8) as project_no")
+                        .func(!orderBaseInfoDOLambdaQueryWrapper.isEmptyOfWhere(), queryWrapper -> {
+                            List<OrderBaseInfoDO> list = orderBaseInfoService.list(orderBaseInfoDOLambdaQueryWrapper);
+                            List<Long> ids = list.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+                            if (CollUtil.isNotEmpty(ids)) {
+                                queryWrapper.in("id", ids);
+                            } else {
+                                queryWrapper.ne("1", 1);
+                            }
+                        })
+                        .groupBy("LEFT(project_no, 8)"));
+    }
+
+    /**
+     * 查询订单列表
+     */
+    private List<OrderInfoResultVO> getOrderInfoResultVOS(Page<OrderBaseInfoDO> page, OrderBaseInfoQueryVO queryVO) {
+        List<String> projectNoPrefix = page.getRecords().stream()
+                .map(OrderBaseInfoDO::getProjectNo)
+                .map(x -> x.substring(0, 8))
+                .collect(Collectors.toList());
+
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.list(orderBaseInfoService.buildQueryByParam(queryVO)
+                .and(CollUtil.isNotEmpty(projectNoPrefix),query -> {
+                    for (int i = 0; i < projectNoPrefix.size(); i++) {
+                        query.likeRight(OrderBaseInfoDO::getProjectNo, projectNoPrefix.get(i));
+                        if (i != projectNoPrefix.size() - 1) {
+                            query.or();
+                        }
+                    }
+                }))
+                ;
+
+        return orderBaseInfoService.wrapperOrderResultList(true, orderBaseInfoDOS);
+    }
+
+    /**
+     * 构建分页
+     */
+    private <T> ServerResult buildPageResult(Page<?> page, List<T> records) {
+        Page<T> webVOPage = new Page<>();
+        webVOPage.setRecords(records);
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    private List<InnerProfitInfoVO> buildInnerProfitInfos(List<OrderInfoResultVO> orderInfoResultVOS) {
+        Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
+                .collect(Collectors.groupingBy(
+                        order -> order.getProjectNo().substring(0, 8)
+                ));
+        Set<String> collect = orderInfoResultVOS.stream()
+                .map(OrderBaseInfoVO::getCustomerCode)
+                .collect(Collectors.toSet());
+        List<SystemSettingDO> systemSettingDOS = systemSettingService.lambdaQuery()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getRelationCode, "ProduceSettingItem")
+                .in(SystemSettingDO::getSettingValue, collect)
+                .list();
+        Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
+                .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
+        List<InnerProfitInfoVO> innerProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
+            List<OrderInfoResultVO> details = entry.getValue();
+            InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
+                    .customerCode(details.get(0).getCustomerCode())
+                    .projectNoPrefix(entry.getKey())
+                    .productionDepartment(details.get(0).getProductionDepartment())
+                    .build();
+
+            //数量
+            details.stream()
+                    .filter(vo -> Objects.nonNull(vo.getOrderCount()))
+                    .mapToInt(OrderInfoResultVO::getOrderCount)
+                    .reduce(Integer::sum)
+                    .ifPresent(innerProfitInfoVO::setOrderCount);
+
+            //生产科总价
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getProductionDepartmentTotalPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> {
+                        innerProfitInfoVO.setProductionDepartmentTotalPrice(price.doubleValue());
+                    });
+
+            //生产科预算金额
+            details.stream()
+                    .map(OrderInfoResultVO::getOrderCostInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderCostInfoVO::getProductionDepartmentPredictPrice)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(innerProfitInfoVO::setProductionDepartmentPredictPrice);
+            //实际发生费用
+            details.stream()
+                    .map(OrderInfoResultVO::getOrderCostInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderCostInfoVO::getProductionActualPrice)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(innerProfitInfoVO::setProductionActualPrice);
+
+            if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentPredictPrice())
+                    && Objects.nonNull(innerProfitInfoVO.getProductionActualPrice())) {
+                //预算占比=实际发生费用/预算金额
+                innerProfitInfoVO.setPredictRatio(innerProfitInfoVO.getProductionActualPrice().divide(innerProfitInfoVO.getProductionDepartmentPredictPrice(), 4, RoundingMode.HALF_UP));
+                if (innerProfitInfoVO.getProductionDepartmentPredictPrice().compareTo(BigDecimal.ZERO) != 0) {
+                    //预算占比与实际比占比差:1-预算占比
+                    innerProfitInfoVO.setPredictAndActualRatio(new BigDecimal(1).subtract(innerProfitInfoVO.getPredictRatio()));
+                }
+            }
+
+            //事前毛利润 = 生产总额-预算金额
+            if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentTotalPrice())
+                    && Objects.nonNull(innerProfitInfoVO.getProductionDepartmentPredictPrice())) {
+                innerProfitInfoVO.setBeforeGrossProfit(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice()).subtract(innerProfitInfoVO.getProductionDepartmentPredictPrice()));
+                //事前毛利润率 = 事前毛利/生产科总价
+                if (innerProfitInfoVO.getProductionDepartmentTotalPrice().compareTo(0.0) != 0) {
+                    innerProfitInfoVO.setBeforeGrossProfitRate(innerProfitInfoVO.getBeforeGrossProfit().divide(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
+                }
+            }
+            //事后毛利率 = 总价-实际发生费用
+            if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentTotalPrice())
+                    && Objects.nonNull(innerProfitInfoVO.getProductionActualPrice())) {
+                innerProfitInfoVO.setGrossProfit(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice()).subtract(innerProfitInfoVO.getProductionActualPrice()));
+                if (innerProfitInfoVO.getProductionDepartmentTotalPrice().compareTo(0.0) != 0) {
+                    innerProfitInfoVO.setGrossProfitRate(innerProfitInfoVO.getGrossProfit().divide(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
+                }
+            }
+
+            //hod时间差
+            LocalDateTime earliest = details.stream()
+                    .map(OrderInfoResultVO::getOrderHodTime)
+                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .min(Comparator.naturalOrder())
+                    .orElse(null);
+            LocalDateTime latest = details.stream()
+                    .map(OrderInfoResultVO::getOrderHodTime)
+                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .max(Comparator.naturalOrder())
+                    .orElse(null);
+            innerProfitInfoVO.setProduceStartTime(earliest);
+            innerProfitInfoVO.setProduceEndTime(latest);
+            SystemSettingDO systemSettingDO = systemSettingDOSMap.get(innerProfitInfoVO.getCustomerCode());
+            if (Objects.nonNull(systemSettingDO)) {
+                String relationValue = systemSettingDO.getRelationValue();
+                ObjectMapper objectMapper = new ObjectMapper();
+                try {
+                    // 将 JSON 字符串解析为 List<Map<String, String>>
+                    List<Map<String, String>> relations = objectMapper.readValue(relationValue, objectMapper.getTypeFactory().constructCollectionType(List.class, Map.class));
+                    // 提取 fixCost 和 ratio 的 relationValue
+                    String fixCostValue = null;
+                    String ratioValue = null;
+
+                    for (Map<String, String> relation : relations) {
+                        if ("fixCost".equals(relation.get("relationCode"))) {
+                            fixCostValue = relation.get("relationValue");
+                        } else if ("ratio".equals(relation.get("relationCode"))) {
+                            ratioValue = relation.get("relationValue");
+                        }
+                    }
+                    if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(fixCostValue)
+                            && Objects.nonNull(earliest)
+                            && Objects.nonNull(latest)) {
+                        Duration duration = Duration.between(earliest, latest);
+                        //内部生产固定成本￥
+                        innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf(duration.toDays() * Double.parseDouble(fixCostValue)));
+                    }
+                    if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(ratioValue)
+                            && Objects.nonNull(innerProfitInfoVO.getPredictRatio())
+                            && innerProfitInfoVO.getPredictRatio().compareTo(BigDecimal.valueOf(1.05)) < 0) {
+                        //内部生产提成￥
+                        innerProfitInfoVO.setInnerProductionCommission(BigDecimal.valueOf(details.size()).multiply(BigDecimal.valueOf(Double.parseDouble(ratioValue))));
+                    }
+                    //内部生产净利润 = 总价-实际费用-固定成本-提成
+                    if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentTotalPrice())
+                            && Objects.nonNull(innerProfitInfoVO.getProductionActualPrice())
+                            && Objects.nonNull(innerProfitInfoVO.getInnerProductionFixedCost())
+                            && Objects.nonNull(innerProfitInfoVO.getInnerProductionCommission())) {
+                        innerProfitInfoVO.setInnerProductionProfit(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice())
+                                .subtract(innerProfitInfoVO.getProductionActualPrice())
+                                .subtract(innerProfitInfoVO.getInnerProductionFixedCost())
+                                .subtract(innerProfitInfoVO.getInnerProductionCommission()));
+                    }
+                    //内部生产净利润率 = 净利润/总价
+                    if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentTotalPrice())
+                            && Objects.nonNull(innerProfitInfoVO.getInnerProductionProfit())) {
+                        innerProfitInfoVO.setInnerProductionProfitRate(innerProfitInfoVO.getInnerProductionProfit().divide(BigDecimal.valueOf(innerProfitInfoVO.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
+                    }
+                } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            return innerProfitInfoVO;
+        }).collect(Collectors.toList());
+        return innerProfitInfoVOs;
+    }
+
+    private List<BusinessProfitInfoVO> buildBusinessProfitInfos(List<OrderInfoResultVO> orderInfoResultVOS) {
+        List<String> projectNoPrefix = orderInfoResultVOS.stream()
+                .map(OrderInfoResultVO::getProjectNo)
+                .map(projectNo -> projectNo.substring(0, 8))
+                .distinct()
+                .collect(Collectors.toList());
+        Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
+                .collect(Collectors.groupingBy(
+                        order -> order.getProjectNo().substring(0, 8)
+                ));
+        List<ProjectBaseInfoDO> list = this.lambdaQuery()
+                .func(query -> {
+                    if (CollUtil.isNotEmpty(projectNoPrefix)) {
+                        query.in(ProjectBaseInfoDO::getProjectNoPrefix, projectNoPrefix);
+                    } else {
+                        query.apply("1!=1");
+                    }
+                })
+                .list();
+        Map<String, ProjectBaseInfoDO> noPrefix2ProjectProfitAnalysisDOMap = list.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getProjectNoPrefix, Function.identity()));
+        Map<Long,String> projectId2ProjectNoPrefixMap = list.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getId, ProjectBaseInfoDO::getProjectNoPrefix));
+        Set<String> collect = orderInfoResultVOS.stream()
+                .map(OrderBaseInfoVO::getCustomerCode)
+                .collect(Collectors.toSet());
+        List<SystemSettingDO> systemSettingDOS = systemSettingService.lambdaQuery()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getRelationCode, "costSettingItem")
+                .in(SystemSettingDO::getSettingValue, collect)
+                .list();
+        Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
+                .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
+        ObjectMapper objectMapper = new ObjectMapper();
+        BigDecimal systemExchangeRate = systemSettingService.getExchangeRate();
+        List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
+                .lambdaQuery()
+                .func(query -> {
+                    Set<Long> projectIds =  list.stream().map(ProjectBaseInfoDO::getId).collect(Collectors.toSet());
+                    if(CollUtil.isNotEmpty(projectIds)){
+                        query.in(ProjectFieldLockRecord::getProjectId,projectIds);
+
+                    }else {
+                        query.apply("1!=1");
+                    }
+                })
+                .list();
+        Map<String,ProjectBaseInfoLockFieldVO> prjectNo2LockRecordMap  = lockRecords.stream()
+                .filter(record -> projectId2ProjectNoPrefixMap.containsKey(record.getProjectId()))
+                .collect(Collectors.toMap(record -> projectId2ProjectNoPrefixMap.get(record.getProjectId()), record -> {
+                    try {
+                        return objectMapper.readValue(record.getFields(), ProjectBaseInfoLockFieldVO.class);
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                }));
+
+        List<BusinessProfitInfoVO> businessProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
+            List<OrderInfoResultVO> details = entry.getValue();
+            BusinessProfitInfoVO businessProfitInfoVO = BusinessProfitInfoVO.builder()
+                    .customerCode(details.get(0).getCustomerCode())
+                    .projectNoPrefix(entry.getKey())
+                    .lockFields(prjectNo2LockRecordMap.get(entry.getKey()))
+                    .build();
+
+            //客户总金额￥
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getCustomerRmbTotalPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> businessProfitInfoVO.setCustomerRmbTotalPrice(price.doubleValue()));
+
+            //客户总金额$
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getCustomerTotalPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> businessProfitInfoVO.setCustomerTotalPrice(price.doubleValue()));
+
+            //生产科总价￥
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getProductionDepartmentTotalPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> businessProfitInfoVO.setProductionDepartmentTotalPrice(price.doubleValue()));
+
+            //包装费用合计$
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getPacketTotalPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> businessProfitInfoVO.setPacketTotalPrice(price.doubleValue()));
+
+            //包装费用合计￥
+            businessProfitInfoVO.setPacketRmbTotalPrice(Optional.ofNullable(businessProfitInfoVO.getPacketTotalPrice())
+                    .orElse(0.0) * 6.2);
+            //包装费用实际金额
+            details.stream()
+                    .map(OrderInfoResultVO::getOrderCostInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderCostInfoVO::getPacketActualRmbTotalPrice)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(packetActualRmbTotalPrice -> {
+                        businessProfitInfoVO.setPacketActualRmbTotalPrice(packetActualRmbTotalPrice.setScale(4, RoundingMode.HALF_UP));
+                    });
+            //订单数
+            details.stream()
+                    .mapToInt(OrderInfoResultVO::getOrderCount)
+                    .filter(Objects::nonNull)
+                    .reduce(Integer::sum)
+                    .ifPresent(businessProfitInfoVO::setOrderCount);
+            if (Objects.nonNull(businessProfitInfoVO.getOrderCount())
+                    && Objects.nonNull(businessProfitInfoVO.getPacketActualRmbTotalPrice())
+            ) {
+                //实际跟单单价
+                businessProfitInfoVO.setActualOrderRmbPrice(businessProfitInfoVO.getPacketActualRmbTotalPrice().divide(new BigDecimal(businessProfitInfoVO.getOrderCount()), 4, RoundingMode.HALF_UP));
+                //折换成美金
+                businessProfitInfoVO.setActualOrderPrice(businessProfitInfoVO.getActualOrderRmbPrice().divide(BigDecimal.valueOf(6.2), 4, RoundingMode.HALF_UP));
+            }
+            if (Objects.nonNull(businessProfitInfoVO.getPacketActualRmbTotalPrice())
+                    && Objects.nonNull(businessProfitInfoVO.getPacketRmbTotalPrice())) {
+                //包装费用收益￥
+                businessProfitInfoVO.setPacketProfitRmbPrice(BigDecimal.valueOf(businessProfitInfoVO.getPacketRmbTotalPrice()).subtract(businessProfitInfoVO.getPacketActualRmbTotalPrice()));
+            }
+
+            //hod时间差
+            LocalDateTime earliest = details.stream()
+                    .map(OrderInfoResultVO::getOrderHodTime)
+                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .min(Comparator.naturalOrder())
+                    .orElse(null);
+            LocalDateTime latest = details.stream()
+                    .map(OrderInfoResultVO::getOrderHodTime)
+                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
+                    .max(Comparator.naturalOrder())
+                    .orElse(null);
+            businessProfitInfoVO.setProduceStartTime(earliest);
+            businessProfitInfoVO.setProduceEndTime(latest);
+            //研发复制费合计￥  固定成本￥ 西班牙已发提成￥ 已发提成￥  实际汇率￥
+            if (Objects.nonNull(noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey()))) {
+                ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
+                //研发复制费用
+                businessProfitInfoVO.setDevelopmentCopyRmbTotalPrice(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice());
+                //西班牙已付提成
+                businessProfitInfoVO.setSpainPaidRmbCommission(projectBaseInfoDO.getSpainPaidRmbCommission());
+                //已付提成
+                businessProfitInfoVO.setPaidRmbCommission(projectBaseInfoDO.getPaidRmbCommission());
+                //实际汇率
+                businessProfitInfoVO.setActualExchangeRate(projectBaseInfoDO.getActualExchangeRate());
+                //项目开始时间
+                businessProfitInfoVO.setProjectStartTime(projectBaseInfoDO.getProjectStartTime());
+                //项目结束时间
+                businessProfitInfoVO.setProjectEndTime(projectBaseInfoDO.getProjectEndTime());
+                //生产开始时间
+                if (Objects.nonNull(projectBaseInfoDO.getProjectStartTime())
+                        && Objects.nonNull(projectBaseInfoDO.getProjectEndTime())
+                        && Objects.nonNull(systemSettingDOSMap.get(details.get(0).getCustomerCode()))) {
+
+                    //获取固定成本、提成比率、西班牙提成比例
+                    long between = ChronoUnit.DAYS.between(projectBaseInfoDO.getProjectStartTime(), projectBaseInfoDO.getProjectEndTime());
+                    SystemSettingDO systemSettingDO = systemSettingDOSMap.get(details.get(0).getCustomerCode());
+                    String relationValue = systemSettingDO.getRelationValue();
+                    List<Map<String, String>> relations = null;
+                    try {
+                        relations = objectMapper.readValue(relationValue, objectMapper.getTypeFactory().constructCollectionType(List.class, Map.class));
+                    } catch (JsonProcessingException e) {
+                        throw new RuntimeException(e);
+                    }
+                    String fixCostValue = null;
+                    String ratio = null;
+                    String spainRatio = null;
+                    for (Map<String, String> relation : relations) {
+                        if ("fixCost".equals(relation.get("relationCode"))) {
+                            fixCostValue = relation.get("relationValue");
+                        } else if ("ratio".equals(relation.get("relationCode"))) {
+                            ratio = relation.get("relationValue");
+                        } else if ("spainRatio".equals(relation.get("relationCode"))) {
+                            spainRatio = relation.get("relationValue");
+                        }
+                    }
+                    //固定成本
+                    businessProfitInfoVO.setFixedCost(BigDecimal.valueOf(between * Double.parseDouble(fixCostValue)));
+                    if (Objects.nonNull(spainRatio)
+                            && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
+                        //西班牙提成
+                        businessProfitInfoVO.setSpainRmbCommission(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice()).multiply(BigDecimal.valueOf(Double.parseDouble(spainRatio))));
+                    }
+                    if (Objects.nonNull(businessProfitInfoVO.getSpainRmbCommission())
+                            && Objects.nonNull(projectBaseInfoDO.getSpainPaidRmbCommission())) {
+                        //西班牙未发提成
+                        businessProfitInfoVO.setSpainUnpaidRmbCommission(businessProfitInfoVO.getSpainRmbCommission().subtract(projectBaseInfoDO.getSpainPaidRmbCommission()));
+                    }
+
+                    if (Objects.nonNull(ratio)
+                            && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
+                        //中国团队提成
+                        businessProfitInfoVO.setRmbCommission(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice()).multiply(BigDecimal.valueOf(Double.parseDouble(ratio))));
+                    }
+                    if (Objects.nonNull(businessProfitInfoVO.getRmbCommission())
+                            && Objects.nonNull(projectBaseInfoDO.getPaidRmbCommission())) {
+                        //未发提成
+                        businessProfitInfoVO.setUnpaidRmbCommission(businessProfitInfoVO.getRmbCommission().subtract(projectBaseInfoDO.getPaidRmbCommission()));
+                    }
+                }
+                if (Objects.nonNull(businessProfitInfoVO.getActualExchangeRate())
+                        && Objects.nonNull(businessProfitInfoVO.getCustomerTotalPrice())) {
+                    businessProfitInfoVO.setExchangeRateProfit(BigDecimal.valueOf(businessProfitInfoVO.getCustomerTotalPrice())
+                            .multiply(businessProfitInfoVO.getActualExchangeRate().subtract(systemExchangeRate)));
+                }
+            }
+            //支出合计
+            businessProfitInfoVO.setRmbTotalExpense(Optional.ofNullable(businessProfitInfoVO.getSpainPaidRmbCommission()).orElse(BigDecimal.ZERO)
+                    .add(Optional.ofNullable(businessProfitInfoVO.getPaidRmbCommission()).orElse(BigDecimal.ZERO))
+                    .add(Optional.ofNullable(businessProfitInfoVO.getFixedCost()).orElse(BigDecimal.ZERO))
+                    .add(Optional.ofNullable(businessProfitInfoVO.getDevelopmentCopyRmbTotalPrice()).orElse(BigDecimal.ZERO))
+                    .add(BigDecimal.valueOf(Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).orElse(0.0)))
+                    .add(BigDecimal.valueOf(Optional.ofNullable(businessProfitInfoVO.getProductionDepartmentTotalPrice()).orElse(0.0))));
+            if (Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())
+                    && Objects.nonNull(businessProfitInfoVO.getProductionDepartmentTotalPrice())
+                    && Objects.nonNull(businessProfitInfoVO.getPacketRmbTotalPrice())) {
+                //毛利润
+                businessProfitInfoVO.setProfit(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice())
+                        .subtract(BigDecimal.valueOf(businessProfitInfoVO.getProductionDepartmentTotalPrice()))
+                        .subtract(BigDecimal.valueOf(businessProfitInfoVO.getPacketRmbTotalPrice())));
+            }
+            if (Objects.nonNull(businessProfitInfoVO.getProfit())
+                    && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
+                //毛利润率
+                businessProfitInfoVO.setProfitRate(businessProfitInfoVO.getProfit()
+                        .divide(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice()), 4, RoundingMode.HALF_UP));
+            }
+            if (Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())
+                    && Objects.nonNull(businessProfitInfoVO.getRmbTotalExpense())) {
+                //研发贸易净利润
+                businessProfitInfoVO.setDevelopmentProfit(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice())
+                        .subtract(businessProfitInfoVO.getRmbTotalExpense())
+                );
+                //研发贸易净利润率
+                businessProfitInfoVO.setDevelopmentProfitRate(businessProfitInfoVO.getDevelopmentProfit()
+                        .divide(BigDecimal.valueOf(businessProfitInfoVO.getCustomerRmbTotalPrice()), 4, RoundingMode.HALF_UP));
+            }
+            //综合收益
+            businessProfitInfoVO.setComprehensiveProfit(Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).orElse(BigDecimal.ZERO)
+                    .add(Optional.ofNullable(businessProfitInfoVO.getExchangeRateProfit()).orElse(BigDecimal.ZERO))
+                    .add(Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).orElse(BigDecimal.ZERO)));
+            return businessProfitInfoVO;
+        }).collect(Collectors.toList());
+        return businessProfitInfoVOs;
+    }
+
+    @Override
+    public void exportBusinessProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception {
+        ServerResult serverResult = listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).projectNoLikeRight(projectNoPrefix).build());
+        Page<BusinessProfitInfoVO> page = (Page<BusinessProfitInfoVO>) serverResult.getData();
+        List<BusinessProfitInfoVO> orderInfoResultVOS = page.getRecords();
+        BusinessProfitInfoVO businessProfitInfoVO = orderInfoResultVOS.get(0);
+        exportBusinessProfitExcel(response, businessProfitInfoVO);
+    }
+    public void exportBusinessProfitExcel(HttpServletResponse response, BusinessProfitInfoVO businessProfitInfoVO) throws Exception {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("业务净利润分析");
+
+        // 设置默认列宽
+        sheet.setDefaultColumnWidth(10);
+
+        // 创建字体和样式
+        XSSFFont font = workbook.createFont();
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 10);
+
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setFont(font);
+        cellStyle.setWrapText(true);
+
+
+        createMergedRow(sheet, cellStyle, 0, 3, 0, 9, "业务净利润分析表");
+        createMergedRow(sheet, cellStyle, 4, 5, 0, 1, "项目号");
+        createMergedRow(sheet, cellStyle, 4, 5, 2, 4, Optional.ofNullable(businessProfitInfoVO.getProjectNoPrefix()).orElse("-"));
+        createMergedRow(sheet, cellStyle, 4, 5, 5, 6, "开始时间");
+        createMergedRow(sheet, cellStyle, 4, 5, 7, 9, "结束时间");
+        createMergedRow(sheet, cellStyle, 6, 7, 0, 1, "");
+        createMergedRow(sheet, cellStyle, 6, 7, 2, 4, "项目开始时间");
+        createMergedRow(sheet, cellStyle, 6, 7, 5, 6, Optional.ofNullable(dateTimeFormatter.format(businessProfitInfoVO.getProjectStartTime())).orElse("-"));
+        createMergedRow(sheet, cellStyle, 6, 7, 7, 9, Optional.ofNullable(dateTimeFormatter.format(businessProfitInfoVO.getProjectEndTime())).orElse("-"));
+        createMergedRow(sheet, cellStyle, 8, 9, 0, 1, "");
+        createMergedRow(sheet, cellStyle, 8, 9, 2, 4, "生产进行时间");
+        createMergedRow(sheet, cellStyle, 8, 9, 5, 6, Optional.ofNullable(dateTimeFormatter.format(businessProfitInfoVO.getProduceStartTime())).orElse("-"));
+        createMergedRow(sheet, cellStyle, 8, 9, 7, 9, Optional.ofNullable(dateTimeFormatter.format(businessProfitInfoVO.getProduceEndTime())).orElse("-"));
+        createMergedRow(sheet, cellStyle, 10, 11, 0, 1, "客户编码");
+        createMergedRow(sheet, cellStyle, 10, 11, 2, 4, Optional.ofNullable(businessProfitInfoVO.getCustomerCode()).orElse("-"));
+        createMergedRow(sheet, cellStyle, 10, 11, 5, 6, "");
+        createMergedRow(sheet, cellStyle, 10, 11, 7, 9, "备注");
+        createMergedRow(sheet, cellStyle, 12, 13, 0, 4, "客户总金额计算");
+        createMergedRow(sheet, cellStyle, 12, 13, 5, 6, Optional.ofNullable(businessProfitInfoVO.getCustomerRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 12, 13, 7, 9, Optional.ofNullable(businessProfitInfoVO.getCustomerTotalPrice()).map(price -> "$" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 14, 15, 0, 4, "生产科总价合计");
+        createMergedRow(sheet, cellStyle, 14, 15, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProductionDepartmentTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 14, 15, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 16, 17, 0, 4, "包装费用合计");
+        createMergedRow(sheet, cellStyle, 16, 17, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 16, 17, 7, 9, Optional.ofNullable(businessProfitInfoVO.getPacketTotalPrice()).map(price -> "$" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 18, 19, 0, 4, "研发复制费合计");
+        createMergedRow(sheet, cellStyle, 18, 19, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentCopyRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 18, 19, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 20, 21, 0, 4, "固定成本");
+        createMergedRow(sheet, cellStyle, 20, 21, 5, 6, Optional.ofNullable(businessProfitInfoVO.getFixedCost()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 20, 21, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 22, 23, 0, 4, "西班牙提成");
+        createMergedRow(sheet, cellStyle, 22, 23, 5, 6, Optional.ofNullable(businessProfitInfoVO.getSpainRmbCommission()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 22, 23, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 24, 25, 0, 4, "中国团队提成");
+        createMergedRow(sheet, cellStyle, 24, 25, 5, 6, Optional.ofNullable(businessProfitInfoVO.getRmbCommission()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 24, 25, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 26, 27, 0, 4, "支出合计");
+        createMergedRow(sheet, cellStyle, 26, 27, 5, 6, Optional.ofNullable(businessProfitInfoVO.getRmbTotalExpense()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 26, 27, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 28, 29, 0, 4, "毛利润");
+        createMergedRow(sheet, cellStyle, 28, 29, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfit()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 28, 29, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 30, 31, 0, 4, "毛利率");
+        createMergedRow(sheet, cellStyle, 30, 31, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 30, 31, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 32, 33, 0, 4, "研发贸易净利润");
+        createMergedRow(sheet, cellStyle, 32, 33, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 32, 33, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 34, 35, 0, 4, "研发贸易净利润率");
+        createMergedRow(sheet, cellStyle, 34, 35, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 34, 35, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 36, 37, 0, 4, "包装费用合计金额");
+        createMergedRow(sheet, cellStyle, 36, 37, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 36, 37, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 38, 39, 0, 4, "包装费用实际金额");
+        createMergedRow(sheet, cellStyle, 38, 39, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketActualRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 38, 39, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 40, 41, 0, 4, "订单总数量");
+        createMergedRow(sheet, cellStyle, 40, 41, 5, 6, Optional.ofNullable(businessProfitInfoVO.getOrderCount()).map(String::valueOf).orElse("-"));
+        createMergedRow(sheet, cellStyle, 40, 41, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 42, 43, 0, 4, "实际跟单单价=实际跟单费用/件数");
+        createMergedRow(sheet, cellStyle, 42, 43, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 42, 43, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 44, 45, 0, 4, "实际跟单单价折算美金");
+        createMergedRow(sheet, cellStyle, 44, 45, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualOrderPrice()).map(price -> "$" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 44, 45, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 46, 47, 0, 4, "包装费用收益");
+        createMergedRow(sheet, cellStyle, 46, 47, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 46, 47, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 48, 49, 0, 4, "包装费用净利润率");
+        createMergedRow(sheet, cellStyle, 48, 49, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 48, 49, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 50, 51, 0, 4, "实际汇率");
+        createMergedRow(sheet, cellStyle, 50, 51, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualExchangeRate()).map(String::valueOf).orElse("-"));
+        createMergedRow(sheet, cellStyle, 50, 51, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 52, 53, 0, 4, "汇率收益");
+        createMergedRow(sheet, cellStyle, 52, 53, 5, 6, Optional.ofNullable(businessProfitInfoVO.getExchangeRateProfit()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 52, 53, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 54, 55, 0, 4, "综合收益");
+        createMergedRow(sheet, cellStyle, 54, 55, 5, 6, Optional.ofNullable(businessProfitInfoVO.getComprehensiveProfit()).map(price -> "￥" + price).orElse("-"));
+        createMergedRow(sheet, cellStyle, 54, 55, 7, 9,"");
+
+        // 设置响应头
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Content-Disposition", "attachment;filename=BusinessProfitAnalysis.xlsx");
+        try (OutputStream out = response.getOutputStream()) {
+            workbook.write(out);
+        } finally {
+            workbook.close();
+        }
+    }
+
+    @Override
+    public void exportInnerProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception {
+        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).projectNoLikeRight(projectNoPrefix).build());
+        Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
+        List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
+        InnerProfitInfoVO ProfitInfoVO = profitInfoVOS.get(0);
+        exportInnerProfitExcel(response, ProfitInfoVO);
+    }
+
+    public void exportInnerProfitExcel(HttpServletResponse response, InnerProfitInfoVO vo) throws Exception {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("内部生产净利润分析");
+        sheet.setDefaultColumnWidth(10);
+
+        // 设置字体和样式
+        XSSFFont font = workbook.createFont();
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 10);
+
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setFont(font);
+        cellStyle.setWrapText(true);
+
+        // 第一部分：表头
+        createMergedRow(sheet, cellStyle, 0, 3, 0, 9, "内部生产净利润分析表");
+
+        // 第二部分：项目信息
+        createMergedRow(sheet, cellStyle, 4, 5, 0, 1, "项目号");
+        createMergedRow(sheet, cellStyle, 4, 5, 2, 3, Optional.ofNullable(vo.getProjectNoPrefix()).orElse("-"));
+        createMergedRow(sheet, cellStyle, 4, 5, 4, 5, "开始时间");
+        createMergedRow(sheet, cellStyle, 4, 5, 6, 7, "结束时间");
+        createMergedRow(sheet, cellStyle, 4, 5, 8, 9, "生产持续时间");
+
+        String projectStartTime = Optional.ofNullable(vo.getProduceStartTime()).map(dateTimeFormatter::format).orElse("-");
+        String projectEndTime = Optional.ofNullable(vo.getProduceEndTime()).map(dateTimeFormatter::format).orElse("-");
+        String duration = (vo.getProduceStartTime() != null && vo.getProduceEndTime() != null)
+                ? String.valueOf(Duration.between(vo.getProduceStartTime(), vo.getProduceEndTime()).toDays())
+                : "-";
+        createMergedRow(sheet, cellStyle, 6, 7, 0, 1, "");
+        createMergedRow(sheet, cellStyle, 6, 7, 2, 3, "生产起止时间");
+        createMergedRow(sheet, cellStyle, 6, 7, 4, 5, projectStartTime);
+        createMergedRow(sheet, cellStyle, 6, 7, 6, 7, projectEndTime);
+        createMergedRow(sheet, cellStyle, 6, 7, 8, 9, duration);
+
+        // 第三部分：客户和订单信息
+        createMergedRow(sheet, cellStyle, 8, 9, 0, 1, "客户编码");
+        createMergedRow(sheet, cellStyle, 8, 9, 2, 3, Optional.ofNullable(vo.getCustomerCode()).orElse("-"));
+        createMergedRow(sheet, cellStyle, 8, 9, 4, 5, "明细");
+        createMergedRow(sheet, cellStyle, 8, 9, 6, 7, "金额");
+        createMergedRow(sheet, cellStyle, 8, 9, 8, 9, "订单数量");
+
+        // 第四部分：生产科总价合计
+        createMergedRow(sheet, cellStyle, 10, 11, 0, 3, "生产科总价合计");
+        createMergedRow(sheet, cellStyle, 10, 11, 4, 5, "￥" + Optional.ofNullable(vo.getProductionDepartmentTotalPrice()).orElse(0.0));
+        createMergedRow(sheet, cellStyle, 10, 11, 6, 7, "￥" + Optional.ofNullable(vo.getProductionDepartmentTotalPrice()).orElse(0.0));
+        createMergedRow(sheet, cellStyle, 10, 11, 8, 9, Optional.ofNullable(vo.getOrderCount()).map(String::valueOf).orElse("-"));
+
+        // 第五部分：预算与实际
+        createMergedRow(sheet, cellStyle, 12, 13, 0, 3, "生产科预算金额");
+        createMergedRow(sheet, cellStyle, 12, 13, 4, 5, "￥" + Optional.ofNullable(vo.getProductionDepartmentPredictPrice()).map(String::valueOf).orElse("-"));
+        createMergedRow(sheet, cellStyle, 12, 13, 6, 7, "预算占比");
+        createMergedRow(sheet, cellStyle, 12, 13, 8, 9, "预算占比与实际占比差");
+
+        createMergedRow(sheet, cellStyle, 14, 15, 0, 3, "实际发生费用");
+        createMergedRow(sheet, cellStyle, 14, 15, 4, 5, "￥" + Optional.ofNullable(vo.getProductionActualPrice()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 14, 15, 6, 7, Optional.ofNullable(vo.getPredictRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 14, 15, 8, 9, Optional.ofNullable(vo.getPredictAndActualRatio()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+
+        // 第六部分：毛利润
+        createMergedRow(sheet, cellStyle, 16, 17, 0, 3, "内部生产毛利润");
+        createMergedRow(sheet, cellStyle, 16, 17, 4, 5, "￥" + Optional.ofNullable(vo.getBeforeGrossProfit()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 16, 16, 6, 7, "事前毛利润");
+        createMergedRow(sheet, cellStyle, 16, 16, 8, 9, "事前毛利率");
+        createMergedRow(sheet, cellStyle, 17, 17, 6, 7, Optional.ofNullable(vo.getBeforeGrossProfit()).orElse(BigDecimal.ZERO).toString());
+        createMergedRow(sheet, cellStyle, 17, 17, 8, 9, Optional.ofNullable(vo.getBeforeGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+
+        // 第七部分：固定成本与净利润
+        createMergedRow(sheet, cellStyle, 18, 19, 0, 3, "内部生产固定成本");
+        createMergedRow(sheet, cellStyle, 18, 19, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionFixedCost()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 18, 18, 6, 7, "事后毛利润");
+        createMergedRow(sheet, cellStyle, 18, 18, 8, 9, "事后毛利率");
+        createMergedRow(sheet, cellStyle, 19, 19, 6, 7, Optional.ofNullable(vo.getGrossProfit()).orElse(BigDecimal.ZERO).toString());
+        createMergedRow(sheet, cellStyle, 19, 19, 8, 9, Optional.ofNullable(vo.getGrossProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+
+        // 第八部分：提成与净利润
+        createMergedRow(sheet, cellStyle, 20, 21, 0, 3, "内部生产提成");
+        createMergedRow(sheet, cellStyle, 20, 21, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionCommission()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 20, 21, 6, 7, "净利润");
+        createMergedRow(sheet, cellStyle, 20, 21, 8, 9, "");
+
+        createMergedRow(sheet, cellStyle, 22, 23, 0, 3, "内部生产净利润");
+        createMergedRow(sheet, cellStyle, 22, 23, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionProfit()).orElse(BigDecimal.ZERO));
+        createMergedRow(sheet, cellStyle, 22, 23, 6, 7, Optional.ofNullable(vo.getInnerProductionProfitRate()).map(r -> r.multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 22, 23, 8, 9, "");
+
+        // 设置响应头
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Content-Disposition", "attachment;filename=BusinessProfitAnalysis.xlsx");
+        try (OutputStream out = response.getOutputStream()) {
+            workbook.write(out);
+        } finally {
+            workbook.close();
+        }
+    }
+
+    private void createMergedRow(Sheet sheet, CellStyle cellStyle, int startRow, int endRow, int startCol, int endCol, String value) {
+        for (int i = startRow; i <= endRow; i++) {
+            Row row = sheet.getRow(i);
+            if (row == null) {
+                row = sheet.createRow(i);
+            }
+            for (int j = startCol; j <= endCol; j++) {
+                Cell cell = row.createCell(j);
+                cell.setCellStyle(cellStyle);
+                if (i == startRow && j == startCol) {
+                    cell.setCellValue(value);
+                }
+            }
+        }
+        sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, startCol, endCol));
+    }
+
+}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.OrderCostFieldLockRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.order.erp.domain.model.OrderCostFieldLockRecord">
+        <id column="id" property="id" />
+        <result column="fields" property="fields" />
+        <result column="user_id" property="userId" />
+        <result column="order_id" property="orderId" />
+        <result column="enable_flag" property="enableFlag" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+        <result column="version" property="version" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, fields, user_id, order_id, enable_flag, create_time, create_by, modify_time, modify_by, version
+    </sql>
+
+</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.order.OrderCostInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.order.erp.domain.dto.order.OrderCostInfoDO">
+        <id column="id" property="id" />
+        <result column="production_department_predict_price" property="productionDepartmentPredictPrice" />
+        <result column="production_actual_price" property="productionActualPrice" />
+        <result column="packet_actual_rmb_total_price" property="packetActualRmbTotalPrice" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, production_department_predict_price, production_actual_price, packet_actual_rmb_total_price
+    </sql>
+
+</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.ProjectApplyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.order.erp.domain.model.ProjectApplyDO">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="apply_user_id" property="applyUserId" />
+        <result column="audit_user_id" property="auditUserId" />
+        <result column="fields" property="fields" />
+        <result column="status" property="status" />
+        <result column="audit_remark" property="auditRemark" />
+        <result column="audit_role_codes" property="auditRoleCodes" />
+        <result column="apply_remark" property="applyRemark" />
+        <result column="enable_flag" property="enableFlag" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+        <result column="version" property="version" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, apply_user_id, audit_user_id, fields, status, audit_remark, audit_role_codes, apply_remark, enable_flag, create_time, create_by, modify_time, modify_by, version
+    </sql>
+
+</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.ProjectFieldLockRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.order.erp.domain.model.ProjectFieldLockRecord">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="user_id" property="userId" />
+        <result column="fields" property="fields" />
+        <result column="enable_flag" property="enableFlag" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="modify_time" property="modifyTime" />
+        <result column="modify_by" property="modifyBy" />
+        <result column="version" property="version" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, user_id, fields, enable_flag, create_time, create_by, modify_time, modify_by, version
+    </sql>
+
+</mapper>