test测试

chenhang4442024
1 parent 1b7ae743
Showing 49 changed files with 2005 additions and 62 deletions
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/controller/OrderCostDetailedOptLogController.java
src/main/java/com/order/erp/controller/ProjectBaseDevelopOptLogController.java
src/main/java/com/order/erp/controller/ProjectController.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/OrderCostApplyTpeEnum.java
src/main/java/com/order/erp/domain/OrderOptTypeEnum.java
src/main/java/com/order/erp/domain/ProfitStatusEnum.java
src/main/java/com/order/erp/domain/ProjectApplyTypeEnum.java
src/main/java/com/order/erp/domain/ProjectBaseSettingTypeEnum.java
src/main/java/com/order/erp/domain/ProjectOptTypeEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderCostDetailedOptLogDO.java
src/main/java/com/order/erp/domain/dto/order/OrderCostInfoDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseAfterReviewSettingDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseDevelopOptLogDO.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseInfoDO.java
src/main/java/com/order/erp/domain/vo/order/BusinessCostExportSelect.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/InnerProfitDetailExportSelect.java
@@ -40,21 +40,48 @@ public class OrderCostController {
         queryVO.setProductionDepartment(Collections.singletonList("内部"));
         return orderCostInfoService.listInnerProfitDetailByPage(queryVO);
     }
+
     @PostMapping("/BusinessProfitDetail/listByPage")
     @ApiOperation("包装费用明细表")
     public ServerResult<Page<BusinessProfitDetailVO>> listBusinessProfitDetailsByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
         return orderCostInfoService.listBusinessProfitDetailByPage(queryVO);
     }
+
     @PostMapping("/edit")
     @ApiOperation("编辑")
-    public ServerResult edit(@RequestBody  OrderCostInfoVO vo) throws Exception {
+    public ServerResult edit(@RequestBody OrderCostInfoVO vo) throws Exception {
         return orderCostInfoService.edit(vo);
     }
     @PostMapping("/applyEditFileds")
     @ApiOperation("申请编辑字段")
-    public ServerResult applyEditFileds(@RequestBody OrderCostInfolockFieldVO vo) throws Exception {
-       return orderCostInfoService.applyEditFileds(vo);
+    public ServerResult applyEditFileds(@RequestBody OrderCostInfolockFieldVO vo) {
+        return orderCostInfoService.applyEditFileds(vo);
+    }
+
+    @PostMapping("/businessProfitDetail/exportExcel")
+    @ApiOperation("包装费用明细表多个导出")
+    public void exportBusinessProfitDetailExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        orderCostInfoService.exportBusinessProfitDetailExcel(response, queryVO);
+    }
+
+    @PostMapping("/innerProfitDetail/exportExcel")
+    @ApiOperation("内部生产费用明细表多个导出")
+    public void exportInnerProfitDetailExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        orderCostInfoService.exportInnerProfitDetailExcel(response, queryVO);
+    }
+
+    @PostMapping("/setPackStatus")
+    @ApiOperation("设置包装费用明细表的状态")
+    public void setPackStatus(@RequestBody OrderCostInfoVO vo) {
+        orderCostInfoService.setPackStatus(vo);
+    }
+
+
+    @PostMapping("/setInnerStatus")
+    @ApiOperation("设置内部生产明细表的状态")
+    public void setInnerProduceStatus(@RequestBody OrderCostInfoVO vo) {
+        orderCostInfoService.setInnerProduceStatus(vo);
     }
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+import com.order.erp.service.order.OrderCostDetailedOptLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 净利润分析板块(包装费用明细表/内部生产明细表)--用户操作日志记录
+ * */
+@RestController
+@RequestMapping("/orderCostDetailedOptLog")
+public class OrderCostDetailedOptLogController {
+    @Autowired
+    private OrderCostDetailedOptLogService orderCostDetailedOptLogService;
+    @PostMapping("/listByPage")
+    public ServerResult listByPage(@RequestBody OrderCostDetailedOptedLogQueryVO queryVO){
+       return orderCostDetailedOptLogService.listByPage(queryVO);
+    }
+}
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+
+import com.order.erp.service.order.ProjectBaseDevelopOptLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 净利润分析板块(业务研发净利润/内部生产净利润)--用户操作日志记录
+ * */
+@RestController
+@RequestMapping("/projectOptLog")
+public class ProjectBaseDevelopOptLogController {
+    @Autowired
+    private ProjectBaseDevelopOptLogService projectBaseDevelopOptLogService;
+    /**
+    * 分页查询
+     * */
+    @PostMapping("/listByPage")
+    public ServerResult listByPage(@RequestBody ProjectOptLogQueryVO queryVO){
+        return projectBaseDevelopOptLogService.listByPage(queryVO);
+    }
+
+}
@@ -70,7 +70,7 @@ public class ProjectController {
     }
     @PostMapping("/businessProfit/export")
-    @ApiOperation("业务研发净利润分析表导出")
+    @ApiOperation("业务研发净利润分析表单个导出")
     public void exportBusinessProfitInfo(HttpServletResponse response, @RequestParam("projectNoPrefix") String projectNoPrefix) throws Exception {
         projectBaseInfoService.exportBusinessProfitInfo(response, projectNoPrefix);
     }
@@ -81,4 +81,29 @@ public class ProjectController {
         projectBaseInfoService.exportInnerProfitInfo(response, projectNoPrefix);
     }
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/businessProfit/exportExcel")
+    @ApiOperation("业务研发净利润分析表多个导出")
+    public void exportBusinessProfitExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        projectBaseInfoService.exportBusinessProfitExcel(response, queryVO);
+    }
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/innerProfitInfo/exportExcel")
+    @ApiOperation("内部生产净利润分析表多个导出")
+    public void exportInnerProfitInfoExcel(HttpServletResponse response, @RequestBody ProjectBaseInfoQueryVO queryVO) throws Exception {
+        projectBaseInfoService.exportInnerProfitInfoExcel(response, queryVO);
+    }
+
+    @PostMapping("/businessProfit/setStatus")
+    @ApiOperation("业务研发净利润分析表审核状态设置")
+    public void setProjectBaseInfoDevelopmentStatus(@RequestBody OrderBaseInfoVO vo)  {
+        projectBaseInfoService.setProjectBaseInfoDevelopmentStatus(vo);
+    }
+    //直接通过查询传递多个projectNo去查询。
+    @PostMapping("/innerProfitInfo/setStatus")
+    @ApiOperation("内部生产净利润分析表审核状态设置")
+    public void setInnerProductionStatus(@RequestBody OrderBaseInfoVO vo)  {
+        projectBaseInfoService.setInnerProductionStatus(vo);
+    }
+
 }
@@ -24,10 +24,6 @@ public enum ApplyTypeEnum {
     CHECK_BILL_APPLY(40, "应付账单申请"),
     DEPARTMENT_INVOICE_APPLY(50,"生产科发票申请"),
-
-    ORDER_PACKET_COST_FIELD_EDIT_APPLY(60,"订单包装费用明细字段申请"),
-
-    ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY(70,"订单生产费用明细字段申请"),
     ;
     private Integer type;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum OrderCostApplyTpeEnum {
+
+    ORDER_PACKET_COST_FIELD_EDIT_APPLY(60,"订单包装费用明细字段申请"),
+
+    ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY(70,"订单生产费用明细字段申请"),
+    ;
+
+    private Integer type;
+    private String desc;
+
+    public static String getNameByType(Integer type) {
+        for (OrderCostApplyTpeEnum e : OrderCostApplyTpeEnum.values()) {
+            if (e.getType().equals(type)) {
+                return e.getDesc();
+            }
+        }
+        return null;
+    }
+}
@@ -29,6 +29,21 @@ public enum OrderOptTypeEnum {
     ORDER_INSPECT_EDIT_APPLY(60, "质检信息编辑"),
+    //后续添加部分(净利润分析板块)
+    PROJECT_DEVELOPMENT_PROFIT_EDIT(70,"业务研发净利润编辑"),
+    PROJECT_DEVELOPMENT_PROFIT_ADD(75,"业务研发净利润创建"),
+//    PROJECT_DEVELOPMENT_FIELD_EDIT_APPLY(77,"业务研发净利润字段编辑申请"),
+    PROJECT_COST_EDIT(80,"包装费用明细编辑"),
+    PROJECT_COST_ADD(85,"包装费用明细创建"),
+//    PROJECT_COST_FIELD_EDIT_APPLY(87,"包装费用明细表字段编辑申请"),
+    PROJECT_INNER_PRODUCE_EDIT(90,"内部生产净利润编辑"),
+    PROJECT_INNER_PRODUCE_ADD(95,"内部生产净利润创建"),
+//    PROJECT_INNER_PRODUCE_FIELD_EDIT_APPLY(97,"内部生产净利润字段编辑申请"),
+    PROJECT_INNER_PRODUCE_PROFIT_EDIT(100,"内部生产明细表编辑"),
+    PROJECT_INNER_PRODUCE_PROFIT_ADD(105,"内部生产明细表创建"),
+//    PROJECT_INNER_PRODUCE_PROFIT_FIELD_EDIT_APPLY(107,"内部研发净明细表字段编辑申请"),
+
+
     ;
     private Integer type;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+/**
+ * 净利润板块的各个表的状态字段。
+ * */
+@Getter
+@AllArgsConstructor
+public enum ProfitStatusEnum {
+     Not_COMPLETED(-1, "未完成"),
+    PENDING_APPROVAL(0, "待审核"),
+    APPROVED(1, "已审核"),
+    ;
+    private Integer status;
+    private String desc;
+}
@@ -22,4 +22,12 @@ public enum ProjectApplyTypeEnum {
     private Integer type;
     private String desc;
+    public static String getDescByName(String type) {
+        for (ProjectApplyTypeEnum value : ProjectApplyTypeEnum.values()) {
+            if (value.name().equals(type)) {
+                return value.getDesc();
+            }
+        }
+        return null;
+    }
 }
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ProjectBaseSettingTypeEnum {
+    COMMISSION_COST(1, "提成成本配置"),
+    FIXED_COST_OF_PRODUCTION_DEPARTMENT(2, "生产科固定成本配置"),
+    ;
+    private Integer type;
+
+    private String desc;
+}
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+/**
+ * 净利润分析板块下的项目类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum ProjectOptTypeEnum {
+    BUSINESS_NET_PROFIT_TYPE(10, "业务研发净利润类型"),
+
+    PACKAGING_COST_TYPE(20, "包装费用类型"),
+
+    INTERNAL_BUSINESS_NET_PROFIT_TYPE(30, "内部生产净利润类型"),
+
+    INTERNAL_PRODUCE_DETAILS_TYPE(40, "内部生产明细表类型"),
+    ;
+
+    private Integer type;
+
+    private String desc;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 包装费用,内部生产明细操作日志表(OrderCostDetailedOptLogDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:14:46
+ */
+@TableName("order_cost_detailed_opt_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostDetailedOptLogDO  extends BaseDO implements Serializable {
+       private Long id;
+       private Long orderId;
+       /**
+       * 用户id
+       */
+       private Long userId;
+       /**
+        * 操作类型
+        */
+       private Integer type;
+
+       /**
+        * 操作类型描述
+        */
+       private String optType;
+       /**
+       * 操作字段 json字符串
+       */
+       private String fields;
+}
@@ -43,6 +43,9 @@ public class OrderCostInfoDO extends BaseDO implements Serializable {
     private BigDecimal productionActualPrice;
     private BigDecimal packetActualRmbTotalPrice;
-
+    //包装费用明细表状态。
+    private Integer packStatus;
+    //内部生产明细表状态。
+    private Integer innerProduceStatus;
 }
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+/**
+ * 存储,内部业务研发净利润审核通过的配置,以及内部生产净利润审核通过的配置      因为这个配置是每年都会改变,所以需要保存当时审核年份的配置,防止切换到其他年份配置更改之后,之前的数据又会被重新计算。
+ * */
+@TableName("project_base_after_review_setting")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseAfterReviewSettingDO {
+    private Long id;
+    /**
+     * 存储项目号,可能存储项目号的前八位(业务研发净利润专属),也可能存储完整的项目号(内部生产净利润)
+     * */
+    private String projectNoPrefix;
+    /**
+     * type=1代表为提成成本配置,type=2代表为生产科固定成本配置
+     * */
+    private Integer type;
+
+    /**
+     * 审核通过时的配置数据。 --提成成本配置或者生产科固定成本中的固定成本。 type=1代表为提成成本配置,type=2代表为生产科固定成本配置
+     * */
+    private BigDecimal fixedCost;
+    /**
+     * 审核通过时的配置数据。 --提成成本配置中的提成比例。
+     * */
+    private BigDecimal commissionRate;
+
+    /**
+     * 审核通过时的配置数据。 --提成成本配置中的西班牙提成比例。
+     * */
+    private BigDecimal spainCommissionRate;
+
+    /**
+     * 审核通过时的配置数据。 --生产科固定成本配置中的提成单价。
+     * */
+    private BigDecimal commissionUnitPrice;
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 用户业务研发,内部生产操作日志表(ProjectBaseDevelopOptLogDO)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:14:46
+ */
+@TableName("project_base_develop_opt_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseDevelopOptLogDO extends BaseDO implements Serializable {
+    private static final long serialVersionUID = -79481441736960701L;
+
+    private Long id;
+    /**
+     * 项目号前八位前缀 或者前十位前缀
+     */
+    private String projectNoPrefix;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 操作类型
+     */
+    private Integer type;
+
+    /**
+     * 操作类型描述
+     */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     */
+    private String fields;
+
+}
@@ -33,24 +33,47 @@ public class ProjectBaseInfoDO extends BaseDO implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-
+   /**
+    * 项目号的前缀  例如:A05-2303-2391,projectNoPrefix就是A05-2303。
+    * */
     private String projectNoPrefix;
-
+   /**
+    * 研发复制费合计￥
+    * */
     private BigDecimal developmentCopyRmbTotalPrice;
-
+    /**
+     * 项目开始时间
+     * */
     private LocalDateTime projectStartTime;
-
+    /**
+     * 项目结束时间
+     * */
     private LocalDateTime projectEndTime;
     private LocalDateTime projectInnerProfitInfoStartTime;
     private LocalDateTime projectInnerProfitInfoEndTime;
-
+    /**
+     * 西班牙已发提成
+     * */
     private BigDecimal spainPaidRmbCommission;
-
+    /**
+     * 中国团队已发提成
+     * */
     private BigDecimal paidRmbCommission;
-
+    /**
+     * 实际汇率
+     * */
     private BigDecimal actualExchangeRate;
+    /**
+     * 业务研发净利润分析表审核状态
+     * */
+    private Integer developmentStatus;
+    /**
+     * 内部生产净利润分析表审核状态
+     * */
+    private Integer innerProductionStatus;
+
 }
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessCostExportSelect {
+    /**
+     * 包装费用$
+     */
+    @ApiModelProperty(value = "包装费用（美元）")
+    private String packetPrice;
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private String packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private String packetRmbTotalPrice;
+
+    /**
+     * 包装费用实际金额
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private String packetActualRmbTotalPrice;
+
+    /**
+     * 实际跟单单价￥
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private String packetActualRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private String packetActualPrice;
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private String packetProfitRmbPrice;
+
+    /**
+     * 包装费用利润率
+     */
+    @ApiModelProperty(value = "包装费用利润率")
+    private String packetProfitRate;
+
+}
@@ -111,6 +111,11 @@ public class BusinessProfitDetailVO implements Serializable {
      */
     @ApiModelProperty(value = "包装费用利润率")
     private BigDecimal packetProfitRate;
+    /**
+     * 包装费用明细表状态
+     */
+    @ApiModelProperty(value = "包装费用明细表状态")
+    private Integer packStatus;
     /**
      * 锁定字段信息
@@ -7,6 +7,8 @@ import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
 /**
  * 业务/研发净利润分析
@@ -35,6 +37,9 @@ public class BusinessProfitInfoVO implements Serializable {
     @ApiModelProperty(value = "项目号")
     private String projectNoPrefix;
+    @ApiModelProperty(value = "完整项目号,用于当做id来使用,因为没有返回id所以无法确实操作的是那一条数据,所以需要完整的项目号来确认是哪一条数据")
+    private Set<String> detailProjectNo;
+
     /**
      * 客户总价￥
      */
@@ -233,6 +238,19 @@ public class BusinessProfitInfoVO implements Serializable {
     @ApiModelProperty(value = "综合收益")
     private BigDecimal comprehensiveProfit;
+
+    /**
+     * 业务研发净利润状态
+     */
+    @ApiModelProperty(value = "业务研发净利润状态")
+    private Integer developmentStatus;
+
+    /**
+     * 内部生产净利润状态
+     */
+    @ApiModelProperty(value = "内部生产净利润状态")
+    private Integer innerProductionStatus;
+
     /**
      * 项目开始时间
      */
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitDetailExportSelect {
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private String productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private String  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private String  productionDepartmentTotalPrice;
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private String  productionDepartmentPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private String  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private String  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private String  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利率")
+    private String  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private String  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利率")
+    private String  grossProfitRate;
+
+}
@@ -64,6 +64,12 @@ public class InnerProfitDetailVO implements Serializable {
     @ApiModelProperty(value = "生产科预算金额")
     private BigDecimal productionDepartmentPredictPrice;
+    /**
+     * 生产科预算单价,由生产科预算金额/数量。
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private BigDecimal productionDepartmentPredictUnitprice;
+
     /**
      * 实际发生费用 手动输入
@@ -120,6 +126,11 @@ public class InnerProfitDetailVO implements Serializable {
      */
     @ApiModelProperty(value = "事后毛利润")
     private BigDecimal  grossProfitRate;
+    /**
+     * 内部生产明细表状态
+     */
+    @ApiModelProperty(value = "内部生产明细表状态")
+    private Integer innerProduceStatus ;
     private OrderCostInfolockFieldVO lockFields;
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitInfoExportSelect {
+
+
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @ApiModelProperty(value = "生产科预算金额")
+    private String productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @ApiModelProperty(value = "实际发生费用")
+    private String  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科单价")
+    private String  productionDepartmentUnitPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    @ApiModelProperty(value = "生产科总价")
+    private String  productionDepartmentTotalPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    @ApiModelProperty(value = "预算占比")
+    private String  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    @ApiModelProperty(value = "预算占比与实际占比差")
+    private String  predictAndActualRatio;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-预算金额
+     */
+    @ApiModelProperty(value = "事前毛利润")
+    private String  beforeGrossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事前毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事前毛利率")
+    private String  beforeGrossProfitRate;
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    @ApiModelProperty(value = "事后毛利润")
+    private String  grossProfit;
+
+    /**
+     * 内部生产毛利润率计算：事后毛利润/生产科总价
+     */
+    @ApiModelProperty(value = "事后毛利率")
+    private String  grossProfitRate;
+
+    /**
+     * 内部生产固定成本
+     */
+    @ApiModelProperty(value = "内部生产固定成本")
+    private String  innerProductionFixedCost;
+
+    /**
+     * 内部生产提成
+     */
+    @ApiModelProperty(value = "内部生产提成")
+    private String  innerProductionCommission;
+    /**
+     * 内部生产净利润
+     */
+    @ApiModelProperty(value = "内部生产净利润")
+    private String  innerProductionProfit;
+    /**
+     * 内部生产净利润率
+     */
+    @ApiModelProperty(value = "内部生产净利润率")
+    private String  innerProductionProfitRate;
+}
@@ -140,6 +140,12 @@ public class InnerProfitInfoVO implements Serializable {
     @ApiModelProperty(value = "项目结束时间")
     private LocalDateTime produceEndTime;
+    /**
+     * 内部生产净利润分析表状态
+     */
+    @ApiModelProperty(value = "内部生产净利润分析表状态")
+    private Integer innerProductionStatus;
+
     private ProjectBaseInfoLockFieldVO lockFields;
 }
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostDetailedOptedLogQueryVO  extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+    private Long id;
+
+    /**
+     * 项目号前缀
+     * */
+    private Long orderId;
+
+    /**
+     * 业务类型  20:包装费用明细表创建/编辑   40:对应内部生产明细表创建/编辑
+     * */
+    private Integer type;
+}
@@ -42,6 +42,13 @@ public class OrderCostInfoVO implements Serializable {
     private BigDecimal productionActualPrice;
     private BigDecimal packetActualRmbTotalPrice;
-
+    private Integer orderCount;
+    //单价  之前前端是传递productionDepartmentPredictPrice,现在改为传递单价,所以传递productionDepartmentPredictUnitPrice。
+    private BigDecimal productionDepartmentPredictUnitPrice;
+
+    //内部生产费用明细表状态。
+    private Integer innerProduceStatus;
+    //包装费用费用明细表状态。
+    private Integer packStatus;
 }
@@ -40,6 +40,10 @@ public class OrderCostInfolockFieldVO implements Serializable {
     private String productionActualPrice;
     private String packetActualRmbTotalPrice;
+    /**
+     * 生产科预算单价。
+     * */
+    private String productionDepartmentPredictUnitPrice;
     private String applyRemark;
 }
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderCostOptLogResultVO implements Serializable {
+    private Long id;
+    /**
+     * 订单id
+     * */
+    private Long orderId;
+    /**
+     * 用户id
+     * */
+    private Long userId;
+    /**
+     * 用户名称
+     * */
+    private String userName;
+    /**
+     * 操作类型
+     * */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     * */
+    private String fields;
+
+    private LocalDateTime createTime;
+}
@@ -48,6 +48,9 @@ public class ProjectApplyVO extends BaseDO implements Serializable {
     @ApiModelProperty(value = "审批用户id")
     private Long auditUserId;
+    @ApiModelProperty(value = "申请类型")
+    private String type;
+
     @ApiModelProperty(value = "锁定字段 json字符串")
     private String fields;
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseInfoAuditStatus {
+    /**
+     * 设置状态时传递过来的projectNo可能只包含前八位(业务研发净利润分析),或者全部包含(内部生产净利润分析表)。
+     * */
+    private String projectNo;
+
+    /**
+     * 类型,用来判断是业务研发净利润分析表还是内部生产净利润分析表
+     * */
+    private String type;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectBaseInfoQueryVO extends BaseDO implements Serializable {
+    /**
+     * 业务研发净利润表以及内部生产明细表,用于条件查询的项目号,需要传递完整的项目号
+     * */
+    private List<String> detailProjectNo;
+
+    /**
+     * 包装费用明细表以及内部生产明细表,用于条件查询。
+     * */
+    private Set<Long> orderIds;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -客户编码。
+     * */
+    private List<String> customerCode;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -内部编号。
+     * */
+    private List<String> innerNo;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -生产科。
+     * */
+    private List<String> productionDepartment;
+
+    /**
+     * 筛选条件  不传orderId时就传递筛选条件 -项目号。
+     * */
+    private List<String> projectNo;
+
+    /**
+     * 业务研发净利润分析选择导出字段
+     * */
+    private ProjectExportSelect projectExportSelect;
+
+    /**
+     * 内部研发净利润分析选择导出字段
+     * */
+    private  InnerProfitInfoExportSelect innerProfitInfoExportSelect;
+
+    /**
+     * 包装费用明细表选择导出字段
+     * */
+    private BusinessCostExportSelect businessCostExportSelect;
+
+    /**
+     * 内部生产费用明细表选择导出字段
+     * */
+    private InnerProfitDetailExportSelect innerProfitDetailExportSelect;
+
+}
+package com.order.erp.domain.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectExportSelect {
+    /**
+     * 客户总价￥
+     */
+    @ApiModelProperty(value = "客户总价（人民币）")
+    private String customerRmbTotalPrice;
+
+    /**
+     * 客户总价$
+     */
+    @ApiModelProperty(value = "客户总价")
+    private String customerTotalPrice;
+
+    /**
+     * 生成科总价￥
+     */
+    @ApiModelProperty(value = "生产部门总价")
+    private String productionDepartmentTotalPrice;
+
+
+
+    /**
+     * 订单数量
+     */
+    @ApiModelProperty(value = "订单数量")
+    private String orderCount;
+
+
+    /**
+     * 包装费用合计$
+     */
+    @ApiModelProperty(value = "包装费用合计（美元）")
+    private String packetTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    @ApiModelProperty(value = "包装费用合计（人民币）")
+    private String packetRmbTotalPrice;
+
+
+    /**
+     * 包装费用实际金额$
+     */
+    @ApiModelProperty(value = "包装费用实际金额（人民币）")
+    private String packetActualRmbPrice;
+
+
+    /**
+     * 包装费用收益
+     */
+    @ApiModelProperty(value = "包装费用收益（人民币）")
+    private String packetProfitRmbPrice;
+
+
+    /**
+     * 研发复制费合计￥
+     */
+    @ApiModelProperty(value = "研发复制费合计（人民币）")
+    private String developmentCopyRmbTotalPrice;
+
+    /**
+     * 固定成本
+     */
+    @ApiModelProperty(value = "固定成本")
+    private String fixedCost;
+
+    /**
+     * 西班牙已发提成￥
+     */
+    @ApiModelProperty(value = "西班牙已发提成（人民币）")
+    private String spainPaidRmbCommission;
+
+    /**
+     * 西班牙提成￥
+     */
+    @ApiModelProperty(value = "西班牙提成（人民币）")
+    private String spainRmbCommission;
+
+    /**
+     * 西班牙未发提成￥
+     */
+    @ApiModelProperty(value = "西班牙未发提成（人民币）")
+    private String spainUnpaidRmbCommission;
+
+    /**
+     * 已发提成￥
+     */
+    @ApiModelProperty(value = "已发提成（人民币）")
+    private String paidRmbCommission;
+
+    /**
+     * 提成￥
+     */
+    @ApiModelProperty(value = "提成（人民币）")
+    private String rmbCommission;
+
+    /**
+     * 未发提成￥
+     */
+    @ApiModelProperty(value = "未发提成（人民币）")
+    private String unpaidRmbCommission;
+
+
+    /**
+     * 支出合计
+     */
+    @ApiModelProperty(value = "支出合计（人民币）")
+    private String rmbTotalExpense;
+
+    /**
+     * 毛利润
+     */
+    @ApiModelProperty(value = "毛利润")
+    private String profit;
+
+    /**
+     * 毛利率
+     */
+    @ApiModelProperty(value = "毛利率")
+    private String profitRate;
+
+    /**
+     * 研发净利润
+     */
+    @ApiModelProperty(value = "研发净利润")
+    private String developmentProfit;
+
+    /**
+     * 净利润率
+     */
+    @ApiModelProperty(value = "净利润率")
+    private String developmentProfitRate;
+
+    /**
+     * 实际跟单单价
+     */
+    @ApiModelProperty(value = "实际跟单单价（人民币）")
+    private String actualOrderRmbPrice;
+
+    /**
+     * 实际跟单单价$
+     */
+    @ApiModelProperty(value = "实际跟单单价（美元）")
+    private String actualOrderPrice;
+
+
+    /**
+     * 综合收益
+     */
+    @ApiModelProperty(value = "综合收益")
+    private String comprehensiveProfit;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectOptLogQueryVO extends BasePageVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private List<Long> ids;
+
+    private Long id;
+
+    /**
+     * 项目号前缀
+     * */
+    private String projectNoPrefix;
+
+    /**
+     * 业务类型  10:对应业务研发净利润创建/编辑   30:对应内部生产净利润创建/编辑
+     * */
+    private Integer type;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProjectOptLogResultVO implements Serializable {
+    private Long id;
+    /**
+     * 项目号前缀,前八位或者前十位。
+     */
+    private String projectNoPrefix;
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 操作类型
+     */
+    private String optType;
+    /**
+     * 操作字段 json字符串
+     */
+    private String fields;
+
+    private LocalDateTime createTime;
+
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+
+public interface OrderCostDetailedOptLogMapper extends BaseMapper<OrderCostDetailedOptLogDO> {
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+
+public interface ProjectBaseAfterReviewSettingMapper extends BaseMapper<ProjectBaseAfterReviewSettingDO> {
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+
+
+public interface ProjectBaseDevelopOptLogMapper extends BaseMapper<ProjectBaseDevelopOptLogDO> {
+}
@@ -6,6 +6,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderCostInfoVO;
 import com.order.erp.domain.vo.order.OrderCostInfolockFieldVO;
+import com.order.erp.domain.vo.order.ProjectBaseInfoQueryVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 /**
  * <p>
@@ -24,4 +28,8 @@ public interface IOrderCostInfoService extends IService&lt;OrderCostInfoDO&gt; {
     ServerResult listInnerProfitDetailByPage(OrderBaseInfoQueryVO queryVO);
     ServerResult listBusinessProfitDetailByPage(OrderBaseInfoQueryVO queryVO);
+    void exportBusinessProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception;
+    void exportInnerProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception;
+    void setPackStatus(OrderCostInfoVO vo);
+    void setInnerProduceStatus(OrderCostInfoVO vo);
 }
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.domain.vo.order.*;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 /**
  * <p>
@@ -32,4 +33,9 @@ public interface IProjectBaseInfoService extends IService&lt;ProjectBaseInfoDO&gt; {
     void exportBusinessProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception;
     void exportInnerProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception;
+    void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
+    void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception;
+
+    void setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo);
+    void setInnerProductionStatus(OrderBaseInfoVO vo);
 }
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+
+
+public interface OrderCostDetailedOptLogService extends IService<OrderCostDetailedOptLogDO> {
+   ServerResult listByPage(OrderCostDetailedOptedLogQueryVO queryVO);
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+
+public interface ProjectBaseAfterReviewSettingService extends IService<ProjectBaseAfterReviewSettingDO> {
+}
+package com.order.erp.service.order;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+
+import java.util.List;
+
+public interface ProjectBaseDevelopOptLogService extends IService<ProjectBaseDevelopOptLogDO> {
+    ServerResult listByPage(ProjectOptLogQueryVO queryVO);
+}
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.OrderCostDetailedOptedLogQueryVO;
+import com.order.erp.domain.vo.order.OrderCostOptLogResultVO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+import com.order.erp.domain.vo.order.ProjectOptLogResultVO;
+import com.order.erp.mapper.order.OrderCostDetailedOptLogMapper;
+import com.order.erp.service.admin.AdminUserService;
+import com.order.erp.service.order.OrderCostDetailedOptLogService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class OrderCostDetailedOptLogServiceImpl extends ServiceImpl<OrderCostDetailedOptLogMapper, OrderCostDetailedOptLogDO> implements OrderCostDetailedOptLogService{
+    @Resource
+    private AdminUserService userService;
+
+    @Override
+    public ServerResult listByPage(OrderCostDetailedOptedLogQueryVO queryVO) {
+        LambdaQueryWrapper<OrderCostDetailedOptLogDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<OrderCostDetailedOptLogDO> iPage = page(page, queryWrapper);
+
+        Page<OrderCostOptLogResultVO> webVOPage = new Page<>();
+        List<OrderCostDetailedOptLogDO> OrderCostDetailedOptLogDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(OrderCostDetailedOptLogDOS)) {
+            Set<Long> userIds = OrderCostDetailedOptLogDOS.stream().map(OrderCostDetailedOptLogDO::getUserId).collect(Collectors.toSet());
+            Map<Long, AdminUserDO> userDOMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                List<AdminUserDO> userDOS = userService.listByIds(userIds);
+                if (CollectionUtils.isNotEmpty(userDOS)) {
+                    userDOMap = userDOS.stream().collect(Collectors.toMap(AdminUserDO::getId, Function.identity()));
+                }
+            }
+            Map<Long, AdminUserDO> finalUserDOMap = userDOMap;
+            List<OrderCostOptLogResultVO> resultVOList = OrderCostDetailedOptLogDOS.stream().map(x -> {
+                OrderCostOptLogResultVO resultVO = new OrderCostOptLogResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                if (finalUserDOMap.containsKey(x.getUserId())) {
+                    resultVO.setUserName(finalUserDOMap.get(x.getUserId()).getUserName());
+                }
+                return resultVO;
+            }).collect(Collectors.toList());
+
+            webVOPage.setRecords(resultVOList);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    private LambdaQueryWrapper<OrderCostDetailedOptLogDO> buildQueryByParam(OrderCostDetailedOptedLogQueryVO queryVO) {
+        return new LambdaQueryWrapper<OrderCostDetailedOptLogDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(Objects.nonNull(queryVO.getOrderId()), OrderCostDetailedOptLogDO::getOrderId, queryVO.getOrderId())
+                .eq(Objects.nonNull(queryVO.getType()), OrderCostDetailedOptLogDO::getType, queryVO.getType())
+                .orderByDesc(OrderCostDetailedOptLogDO::getId);
+    }
+
+
+}
@@ -6,19 +6,22 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.config.DataScope;
-import com.order.erp.domain.ApplyStatusEnum;
-import com.order.erp.domain.ApplyTypeEnum;
-import com.order.erp.domain.OrderLockFieldEnum;
-import com.order.erp.domain.ProjectApplyTypeEnum;
+import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderCostDetailedOptLogDO;
 import com.order.erp.domain.dto.order.OrderCostInfoDO;
 import com.order.erp.domain.dto.order.OrderFieldLockApplyDO;
 import com.order.erp.domain.model.OrderCostFieldLockRecord;
@@ -26,17 +29,16 @@ import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderCostInfoMapper;
 import com.order.erp.service.IOrderCostFieldLockRecordService;
 import com.order.erp.service.SystemSettingService;
-import com.order.erp.service.order.IOrderCostInfoService;
+import com.order.erp.service.order.*;
 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 org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -55,8 +57,6 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     @Autowired
     private DataScope dataScope;
     @Resource
-    private OrderFieldLockRecordService orderFieldLockRecordService;
-    @Resource
     private OrderFieldLockApplyService orderFieldLockApplyService;
     @Autowired
     private OrderBaseInfoService orderBaseInfoService;
@@ -64,22 +64,32 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
     private IOrderCostFieldLockRecordService orderCostFieldLockRecordService;
     @Autowired
     private SystemSettingService systemSettingService;
+    @Autowired
+    private OrderCostDetailedOptLogService orderCostDetailedOptLogService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServerResult edit(OrderCostInfoVO vo) {
+        Integer type=null;
+        String  operationDesc=null;
         Long id = vo.getOrderId();
         Optional<OrderCostInfoDO> orderCostInfoDOOpt = this.lambdaQuery()
                 .eq(OrderCostInfoDO::getOrderId, id)
                 .last(" limit 1 ")
                 .oneOpt();
         OrderCostInfoDO orderCostInfoDO = null;
-        if (!orderCostInfoDOOpt.isPresent()) {
+        OrderCostInfoDO oldOrderCostInfoDO = null;
+        boolean isUpdate = orderCostInfoDOOpt.isPresent();
+        if (!isUpdate) {
+            //对象不存在。
             orderCostInfoDO = BeanUtil.copyProperties(vo, OrderCostInfoDO.class);
         } else {
             orderCostInfoDO = orderCostInfoDOOpt.get();
+            oldOrderCostInfoDO = BeanUtil.copyProperties(orderCostInfoDO, OrderCostInfoDO.class,"id","orderId","createTime","createBy","modifyTime","modifyBy","enableFlag");
             BeanUtil.copyProperties(vo, orderCostInfoDO, CopyOptions.create().ignoreNullValue());
         }
+        // 如果对于新旧数据一致时,则不会进行状态设置。  但是对于第一次创建数据应该怎么办呢？ 通过isUpdate来进行判断。  对象不存在时,就不需要判断数据是否一致,对象存在时,就需要进行判断数据是否一致。如果一致,则不要进行状态设置,反之则需要进行状态设置。
+
         Optional<OrderCostFieldLockRecord> orderCostFieldLockRecordOpt = orderCostFieldLockRecordService
                 .lambdaQuery()
                 .eq(OrderCostFieldLockRecord::getOrderId, id)
@@ -94,17 +104,49 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderCostInfolockFieldVO originOrderCostInfolockFieldVO = JSONObject.parseObject(Optional.ofNullable(orderCostFieldLockRecord.getFields()).orElse("{}"), OrderCostInfolockFieldVO.class);
         if(Objects.nonNull(vo.getPacketActualRmbTotalPrice())){
             originOrderCostInfolockFieldVO.setPacketActualRmbTotalPrice(OrderLockFieldEnum.LOCKED.name());
-        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictPrice())) {
+            type=ProjectOptTypeEnum.PACKAGING_COST_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_COST_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_COST_ADD.getDesc();
+            //编辑包装费用实际金额之后状态为待审核
+            /*需要考虑一个问题,假如状态为已通过,但是没有进行任何的修改而点击了确认,那么它的状态会由已审核变为待审核,所以需要进行判断一下,此次传递来的数据是否与上一次的数据一致,如果不一致则需要进行状态设置*/
+            if(isUpdate && ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getPackStatus())
+                    && oldOrderCostInfoDO.getPacketActualRmbTotalPrice().compareTo(vo.getPacketActualRmbTotalPrice()) == 0){
+            }else{
+                orderCostInfoDO.setPackStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
+            }
+        }else if(Objects.nonNull(vo.getProductionActualPrice())||Objects.nonNull(vo.getProductionDepartmentPredictUnitPrice())) {
+            //todo 以前是直接填写总价,现在是填写单价,然后乘以数量自动计算总价,需要前端传递一个数量参数过来。
+            vo.setProductionDepartmentPredictPrice(vo.getProductionDepartmentPredictUnitPrice().multiply(BigDecimal.valueOf(vo.getOrderCount())));
+            orderCostInfoDO.setProductionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice());
             originOrderCostInfolockFieldVO.setProductionActualPrice(OrderLockFieldEnum.LOCKED.name());
             originOrderCostInfolockFieldVO.setProductionDepartmentPredictPrice(OrderLockFieldEnum.LOCKED.name());
+            type=ProjectOptTypeEnum.INTERNAL_PRODUCE_DETAILS_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_INNER_PRODUCE_PROFIT_ADD.getDesc();
+            //编辑生产科预算金额和实际发生费用之后状态为待审核
+            /*也需要考虑问题,假如状态为已通过,但是没有进行任何修改二点击了确认,那么它的状态会由已审核变为待审核*/
+            if(isUpdate &&  ProfitStatusEnum.APPROVED.getStatus().equals(oldOrderCostInfoDO.getInnerProduceStatus()) &&
+                    oldOrderCostInfoDO.getProductionActualPrice().compareTo(vo.getProductionActualPrice()) ==0 &&
+                    //前端传递的是单价和数量,但是后端只是保存了总价,所以需要进行判断一下,此次传递来的数据和上一次的数据是否一致,如果不一致则需要进行状态设置
+                    oldOrderCostInfoDO.getProductionDepartmentPredictPrice().compareTo(vo.getProductionDepartmentPredictUnitPrice().multiply(BigDecimal.valueOf(vo.getOrderCount()))) ==0){
+            }else{
+                orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
+            }
         }
         orderCostFieldLockRecord.setFields(JSONObject.toJSONString(originOrderCostInfolockFieldVO));
         orderCostFieldLockRecordService.saveOrUpdate(orderCostFieldLockRecord);
-        return ServerResult.success(this.saveOrUpdate(orderCostInfoDO));
+        this.saveOrUpdate(orderCostInfoDO);
+        //进行日志记录。
+        OrderCostInfoVO orderCostInfoVO = buildOrderConstInfoVO(vo, id);
+        OrderCostDetailedOptLogDO orderConstOptLogDo = buildOrderConstOptLogDo(id, dataScope.getLoginUserId(),type ,operationDesc,JSONObject.toJSONString(orderCostInfoVO));
+        return ServerResult.success(orderCostDetailedOptLogService.save(orderConstOptLogDo));
     }
     @Override
     public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) {
+        Integer applyType=null;
         List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getOrderId, vo.getOrderId())
@@ -118,6 +160,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .packetActualRmbTotalPrice(vo.getPacketActualRmbTotalPrice())
                 .productionActualPrice(vo.getProductionActualPrice())
                 .productionDepartmentPredictPrice(vo.getProductionDepartmentPredictPrice())
+                .productionDepartmentPredictUnitPrice(vo.getProductionDepartmentPredictUnitPrice())
                 .build();
         OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
                 .orderId(vo.getOrderId())
@@ -126,9 +169,16 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                 .fields(JSONObject.toJSONString(lockField))
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .type(vo.getType())
-                .remark(ApplyTypeEnum.getNameByType(vo.getType()))
+                .remark(OrderCostApplyTpeEnum.getNameByType(vo.getType()))
                 .build();
         orderFieldLockApplyService.save(build);
+        //进行审批记录的保存。需要前端在申请字段申请时传递这条数据的id。
+        if(OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType().equals(vo.getType())){
+         applyType=OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY.getType();
+        }else{
+         applyType=OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY.getType();
+        }
+        orderCostDetailedOptLogService.save(buildOrderConstOptLogDo(vo.getOrderId(), dataScope.getLoginUserId(),applyType,OrderCostApplyTpeEnum.getNameByType(applyType),JSONObject.toJSONString(lockField)));
         return ServerResult.success();
     }
@@ -171,6 +221,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
             if(Objects.isNull(lockFields.getProductionDepartmentPredictPrice())){
                 lockFields.setProductionDepartmentPredictPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
             }
+            if(Objects.isNull(lockFields.getProductionDepartmentPredictUnitPrice())){
+                lockFields.setProductionDepartmentPredictUnitPrice(Objects.isNull(orderCostInfo) || Objects.isNull(orderCostInfo.getProductionDepartmentPredictUnitPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name());
+            }
             InnerProfitDetailVO vo = InnerProfitDetailVO.builder()
                     .orderId(record.getId())
                     .customerCode(record.getCustomerCode())
@@ -183,6 +236,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .productionDepartmentTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getProductionDepartmentTotalPrice())
                     .productionDepartmentPredictPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionDepartmentPredictPrice())
                     .productionActualPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getProductionActualPrice())
+                    .innerProduceStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getInnerProduceStatus()))  ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getInnerProduceStatus())
                     .lockFields(lockFields)
                     .build();
@@ -214,6 +268,9 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     vo.setGrossProfitRate(vo.getGrossProfit().divide(BigDecimal.valueOf(vo.getProductionDepartmentTotalPrice()), 4, RoundingMode.HALF_UP));
                 }
             }
+            if(Objects.nonNull(vo.getProductionDepartmentPredictPrice())){
+                vo.setProductionDepartmentPredictUnitprice(vo.getProductionDepartmentPredictPrice().divide(BigDecimal.valueOf(record.getOrderCount()), 2, RoundingMode.HALF_UP));
+            }
             return vo;
         }).collect(Collectors.toList());
         Page<InnerProfitDetailVO> webVOPage = new Page<>();
@@ -275,6 +332,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
                     .packetPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketPrice())
                     .packetTotalPrice(Objects.isNull(record.getProfitAnalysisInfo()) ? null : record.getProfitAnalysisInfo().getPacketTotalPrice())
                     .packetActualRmbTotalPrice(Objects.isNull(record.getOrderCostInfo()) ? null : record.getOrderCostInfo().getPacketActualRmbTotalPrice())
+                    .packStatus((Objects.isNull(record.getOrderCostInfo()) || Objects.isNull(record.getOrderCostInfo().getPackStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : record.getOrderCostInfo().getPackStatus())
                     .lockFields(lockFields)
                     .build();
             if (Objects.nonNull(vo.getPacketTotalPrice())) {
@@ -303,4 +361,211 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         return ServerResult.success(webVOPage);
     }
+    @Override
+    public void exportBusinessProfitDetailExcel(HttpServletResponse response,ProjectBaseInfoQueryVO queryVO) throws Exception {
+        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+           CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
+           CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
+           CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
+           CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
+                .page(1)
+                .pageSize(200); // 设置大一点，确保导出数据不遗漏
+
+      // 根据传入条件设置筛选字段
+        if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
+            builder.orderIds(queryVO.getOrderIds());
+        } else {
+            //如果orderIds为空就代表传递的是筛选条件。
+            if (CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
+                builder.projectNo(queryVO.getProjectNo());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getCustomerCode())) {
+                builder.customerCode(queryVO.getCustomerCode());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())) {
+                builder.productionDepartment(queryVO.getProductionDepartment());
+            }
+            if (CollectionUtils.isNotEmpty(queryVO.getInnerNo())) {
+                builder.innerNo(queryVO.getInnerNo());
+            }
+        }
+        ServerResult serverResult = listBusinessProfitDetailByPage(builder.build());
+        Page<BusinessProfitDetailVO> page = (Page<BusinessProfitDetailVO>) serverResult.getData();
+        List<BusinessProfitDetailVO> businessProfitDetailVOS = page.getRecords();
+        System.out.println("订单数量:"+businessProfitDetailVOS.size());
+        if(CollectionUtils.isNotEmpty(businessProfitDetailVOS)){
+            List<Map<String, Object>> list = buildBusinessProfitExportExcel(businessProfitDetailVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+                System.out.println("导出成功");
+            }
+        }
+        System.out.println(businessProfitDetailVOS);
+    }
+
+    @Override
+    public void exportInnerProfitDetailExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
+        if(CollectionUtils.isEmpty(queryVO.getOrderIds()) &&
+                CollectionUtils.isEmpty(queryVO.getProjectNo()) &&
+                CollectionUtils.isEmpty(queryVO.getCustomerCode()) &&
+                CollectionUtils.isEmpty(queryVO.getInnerNo()) &&
+                CollectionUtils.isEmpty(queryVO.getProductionDepartment())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
+                .page(1)
+                .pageSize(200); //设置大一点，确保导出数据不遗漏
+        if(CollectionUtils.isNotEmpty(queryVO.getOrderIds())){
+            builder.orderIds(queryVO.getOrderIds());
+        }else{
+            //如果orderIds为空就代表传递的是筛选条件。
+            if(CollectionUtils.isNotEmpty(queryVO.getProjectNo())){
+                builder.projectNo(queryVO.getProjectNo());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getCustomerCode())){
+                builder.customerCode(queryVO.getCustomerCode());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getProductionDepartment())){
+                builder.productionDepartment(queryVO.getProductionDepartment());
+            }
+            if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                builder.innerNo(queryVO.getInnerNo());
+            }
+        }
+        //这里设置为100是故意设置大一点,防止导出多条数据。
+        ServerResult<Page<InnerProfitDetailVO>> serverResult= listInnerProfitDetailByPage(builder.build());
+        Page<InnerProfitDetailVO> page=(Page<InnerProfitDetailVO>) serverResult.getData();
+        List<InnerProfitDetailVO> innerProfitDetailVOS = page.getRecords();
+        System.out.println("订单数量"+innerProfitDetailVOS.size());
+        if(CollectionUtils.isNotEmpty(innerProfitDetailVOS)){
+            List<Map<String, Object>> list = buildInnerProfitDetailExcel(innerProfitDetailVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+                System.out.println("导出成功");
+            }
+        }
+    }
+
+    @Override
+    public void setPackStatus(OrderCostInfoVO vo) {
+        //首先判断orderId是否为空。
+        if(Objects.isNull(vo.getOrderId())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
+                .last("limit 1"));
+        if(Objects.isNull(orderCostInfoDO)){
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+        orderCostInfoDO.setPackStatus(ProfitStatusEnum.APPROVED.getStatus());
+        updateById(orderCostInfoDO);
+    }
+
+    @Override
+    public void setInnerProduceStatus(OrderCostInfoVO vo) {
+        if(Objects.isNull(vo.getOrderId())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        OrderCostInfoDO orderCostInfoDO = getOne(new LambdaQueryWrapper<OrderCostInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderCostInfoDO::getOrderId, vo.getOrderId())
+                .last("limit 1"));
+        if(Objects.isNull(orderCostInfoDO)){
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+       orderCostInfoDO.setInnerProduceStatus(ProfitStatusEnum.APPROVED.getStatus());
+        updateById(orderCostInfoDO);
+    }
+
+
+    private OrderCostDetailedOptLogDO buildOrderConstOptLogDo(Long orderId, Long userId , Integer type, String optType, String field){
+        return OrderCostDetailedOptLogDO.builder()
+                .orderId(orderId)
+                .userId(userId)
+                .type(type)
+                .optType(optType)
+                .fields(field)
+                .build();
+    }
+    private OrderCostInfoVO buildOrderConstInfoVO(OrderCostInfoVO vo,Long orderId){
+        OrderCostInfoVO orderCostInfoVO = new OrderCostInfoVO();
+        BeanUtils.copyProperties(vo, orderCostInfoVO, "id");
+        orderCostInfoVO.setId(orderId);
+        return orderCostInfoVO;
+    }
+
+    private List<Map<String,Object>> buildBusinessProfitExportExcel(List<BusinessProfitDetailVO> businessProfitDetailVOS,ProjectBaseInfoQueryVO queryVO){
+        List<Map<String,Object>> list= new ArrayList<>();
+        for(BusinessProfitDetailVO vo:businessProfitDetailVOS){
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            map.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
+            map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
+            map.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
+            map.put("图片地址",Objects.nonNull(vo.getPicUrl()) ? vo.getPicUrl() : "");
+            map.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+            map.put("包装费用$",Objects.nonNull(vo.getPacketPrice()) ? String.format("%.2f",vo.getPacketPrice()) : "");
+            map.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : "");
+            map.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
+            map.put("包装费用实际金额￥",Objects.nonNull(vo.getPacketActualRmbTotalPrice()) ? vo.getPacketActualRmbTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("实际跟单单价$",Objects.nonNull(vo.getPacketActualPrice()) ? vo.getPacketActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            map.put("包装费用净利润率",Objects.nonNull(vo.getPacketProfitRate()) ? vo.getPacketProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+//            if(StringUtils.isNotBlank(queryVO.getBusinessCostExportSelect().getPacketPrice()) &&
+//                OrderLockFieldEnum.SELECTED.name().equals(queryVO.getBusinessCostExportSelect().getPacketPrice())){
+//
+//            }
+            list.add(map);
+        }
+        return list;
+    }
+
+    private List<Map<String,Object>> buildInnerProfitDetailExcel(List<InnerProfitDetailVO> innerProfitDetailVOS, ProjectBaseInfoQueryVO queryVO){
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (InnerProfitDetailVO vo:innerProfitDetailVOS){
+            Map<String, Object> hashMap = new LinkedHashMap<>();
+            hashMap.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            hashMap.put("项目号",Objects.nonNull(vo.getProjectNo()) ? vo.getProjectNo() : "");
+            hashMap.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
+            hashMap.put("内部编号",Objects.nonNull(vo.getInnerNo()) ? vo.getInnerNo() : "");
+            hashMap.put("图片地址",Objects.nonNull(vo.getPicUrl()) ? vo.getPicUrl() : "");
+            hashMap.put("订单数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+            hashMap.put("生产科单价￥",Objects.nonNull(vo.getProductionDepartmentPrice()) ? String.format("%.2f",vo.getProductionDepartmentPrice()) : "");
+            hashMap.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");
+            hashMap.put("生产科预算金额￥",Objects.nonNull(vo.getProductionDepartmentPredictPrice()) ? vo.getProductionDepartmentPredictPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("实际发生费用￥",Objects.nonNull(vo.getProductionActualPrice()) ? vo.getProductionActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("预算占比",Objects.nonNull(vo.getPredictRatio()) ? vo.getPredictRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("预算占比与实际占比差",Objects.nonNull(vo.getPredictAndActualRatio()) ? vo.getPredictAndActualRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事前毛利润",Objects.nonNull(vo.getBeforeGrossProfit()) ? vo.getBeforeGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事前毛利率",Objects.nonNull(vo.getBeforeGrossProfitRate()) ? vo.getBeforeGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            hashMap.put("事后毛利润",Objects.nonNull(vo.getGrossProfit()) ? vo.getGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("事后毛利率",Objects.nonNull(vo.getGrossProfitRate()) ? vo.getGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+            /*if(StringUtils.isNotBlank(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice()) &&
+            OrderLockFieldEnum.SELECTED.name().equals(queryVO.getInnerProfitDetailExportSelect().getProductionDepartmentPrice())){
+
+            }*/
+            list.add(hashMap);
+        }
+        return list;
+    }
+
 }
@@ -134,9 +134,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 (Stream.of(ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
-                                    ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
-                            .map(ApplyTypeEnum::getType)
+                    // todo
+                    if (Stream.of(OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
+                                    OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
+                            .map(OrderCostApplyTpeEnum::getType)
                             .anyMatch(type -> type.equals(x.getType()))) {
                         OrderCostInfolockFieldVO orderCostInfolockFieldVO = JSONObject.parseObject(fields, OrderCostInfolockFieldVO.class);
                         resultVO.setFieldInfos(OrderLockFieldVO.builder().costInfolockFieldVO(orderCostInfolockFieldVO).build());
@@ -824,9 +825,10 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 }
             }
             checkBillOrderService.updateById(invoiceInfoDO);
-        } else if (Stream.of(ApplyTypeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
-                        ApplyTypeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
-                .map(ApplyTypeEnum::getType)
+            //todo
+        } else if (Stream.of(OrderCostApplyTpeEnum.ORDER_PACKET_COST_FIELD_EDIT_APPLY,
+                        OrderCostApplyTpeEnum.ORDER_PRODUCTION_COST_FIELD_EDIT_APPLY)
+                .map(OrderCostApplyTpeEnum::getType)
                 .anyMatch(x -> x.equals(applyDO.getType()))) {
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.domain.dto.order.ProjectBaseAfterReviewSettingDO;
+import com.order.erp.mapper.order.ProjectBaseAfterReviewSettingMapper;
+import com.order.erp.service.order.ProjectBaseAfterReviewSettingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ProjectBaseAfterReviewSettingServiceImpl extends ServiceImpl<ProjectBaseAfterReviewSettingMapper, ProjectBaseAfterReviewSettingDO> implements ProjectBaseAfterReviewSettingService {
+}
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.order.ProjectBaseDevelopOptLogDO;
+import com.order.erp.domain.vo.order.ProjectOptLogQueryVO;
+import com.order.erp.domain.vo.order.ProjectOptLogResultVO;
+import com.order.erp.mapper.order.ProjectBaseDevelopOptLogMapper;
+import com.order.erp.service.admin.AdminUserService;
+
+import com.order.erp.service.order.ProjectBaseDevelopOptLogService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Service
+public class ProjectBaseDevelopOptLogServiceImpl extends ServiceImpl<ProjectBaseDevelopOptLogMapper, ProjectBaseDevelopOptLogDO> implements ProjectBaseDevelopOptLogService {
+    @Resource
+    private AdminUserService userService;
+
+    @Override
+    public ServerResult listByPage(ProjectOptLogQueryVO queryVO) {
+        LambdaQueryWrapper<ProjectBaseDevelopOptLogDO> queryWrapper = buildQueryByParam(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<ProjectBaseDevelopOptLogDO> iPage = page(page, queryWrapper);
+
+        Page<ProjectOptLogResultVO> webVOPage = new Page<>();
+        List<ProjectBaseDevelopOptLogDO> ProjectDevelopOptLogDOS = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(ProjectDevelopOptLogDOS)) {
+            Set<Long> userIds = ProjectDevelopOptLogDOS.stream().map(ProjectBaseDevelopOptLogDO::getUserId).collect(Collectors.toSet());
+            Map<Long, AdminUserDO> userDOMap = new HashMap<>();
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                List<AdminUserDO> userDOS = userService.listByIds(userIds);
+                if (CollectionUtils.isNotEmpty(userDOS)) {
+                    userDOMap = userDOS.stream().collect(Collectors.toMap(AdminUserDO::getId, Function.identity()));
+                }
+            }
+            Map<Long, AdminUserDO> finalUserDOMap = userDOMap;
+            List<ProjectOptLogResultVO> resultVOList = ProjectDevelopOptLogDOS.stream().map(x -> {
+                ProjectOptLogResultVO resultVO = new ProjectOptLogResultVO();
+                BeanUtils.copyProperties(x, resultVO);
+                if (finalUserDOMap.containsKey(x.getUserId())) {
+                    resultVO.setUserName(finalUserDOMap.get(x.getUserId()).getUserName());
+                }
+                return resultVO;
+            }).collect(Collectors.toList());
+
+            webVOPage.setRecords(resultVOList);
+        }
+        BeanUtils.copyProperties(page, webVOPage, "records");
+        return ServerResult.success(webVOPage);
+    }
+
+    private LambdaQueryWrapper<ProjectBaseDevelopOptLogDO> buildQueryByParam(ProjectOptLogQueryVO queryVO) {
+        return new LambdaQueryWrapper<ProjectBaseDevelopOptLogDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(Objects.nonNull(queryVO.getProjectNoPrefix()), ProjectBaseDevelopOptLogDO::getProjectNoPrefix, queryVO.getProjectNoPrefix())
+                .eq(Objects.nonNull(queryVO.getType()), ProjectBaseDevelopOptLogDO::getType, queryVO.getType())
+                .orderByDesc(ProjectBaseDevelopOptLogDO::getId);
+    }
+}
 \ No newline at end of file
@@ -3,37 +3,38 @@ package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 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.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.TransactionHelper;
 import com.order.erp.config.DataScope;
-import com.order.erp.domain.ApplyStatusEnum;
-import com.order.erp.domain.OrderLockFieldEnum;
-import com.order.erp.domain.ProjectApplyTypeEnum;
-import com.order.erp.domain.ProjectFieldEditType;
+import com.order.erp.domain.*;
 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.ProjectBaseInfoDO;
+import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.model.ProjectApplyDO;
 import com.order.erp.domain.model.ProjectFieldLockRecord;
+import com.order.erp.domain.vo.CostSettingItemVO;
 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.order.erp.service.order.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.service.order.OrderBaseInfoService;
-import com.order.erp.service.order.OrderProfitAnalysisService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -42,8 +43,11 @@ 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 org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -77,21 +81,34 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     private OrderProfitAnalysisService projectProfitAnalysisService;
     @Autowired
     private SystemSettingService systemSettingService;
+    @Autowired
+    private ProjectBaseDevelopOptLogService projectBaseDevelopOptLogService;
+    @Autowired
+    private ProjectBaseAfterReviewSettingService projectBaseAfterReviewSettingService;
+    @Resource
+    private TransactionHelper transactionHelper;
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ServerResult edit(ProjectBaseInfoVO vo) {
+        Integer type = null;
+        String operationDesc =null;
         String projectNoPrefix = vo.getProjectNoPrefix();
         Optional<ProjectBaseInfoDO> projectBaseInfoDOOpt = this.lambdaQuery()
                 .eq(ProjectBaseInfoDO::getProjectNoPrefix, projectNoPrefix)
                 .last(" limit 1 ")
                 .oneOpt();
+        ProjectBaseInfoDO oldProjectBaseInfoDO = null;
         ProjectBaseInfoDO projectBaseInfoDO = null;
-        if (projectBaseInfoDOOpt.isPresent()) {
+        boolean isUpdate = projectBaseInfoDOOpt.isPresent();
+        if (isUpdate) {
             projectBaseInfoDO = projectBaseInfoDOOpt.get();
+            oldProjectBaseInfoDO = BeanUtil.copyProperties(projectBaseInfoDOOpt.get(), ProjectBaseInfoDO.class,"id","projectNoPrefix","createTime","createBy","modifyTime","modifyBy","enableFlag"); // 深拷贝
             BeanUtil.copyProperties(vo, projectBaseInfoDO, CopyOptions.create().setIgnoreProperties("id").ignoreNullValue());
         } else {
             projectBaseInfoDO = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
         }
+        //通过排序取出最新的锁定记录。来重新设置锁定记录。  因为你编辑之后,所以就必须要进行锁定LOCKED。
         ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(ProjectFieldLockRecord::getProjectNoPrefix, projectNoPrefix)
@@ -117,9 +134,36 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             recordLockFieldVO.setSpainPaidRmbCommission("LOCKED");
             recordLockFieldVO.setPaidRmbCommission("LOCKED");
             recordLockFieldVO.setActualExchangeRate("LOCKED");
+            type=ProjectOptTypeEnum.BUSINESS_NET_PROFIT_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_DEVELOPMENT_PROFIT_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_DEVELOPMENT_PROFIT_ADD.getDesc();
+            /*这里还需要考虑一下,对于状态已经是已审批的状态,但是在编辑数据时没有发生任何改变,也需要重新设置为待审核状态吗？不需要,这里处理一下,对于这种情况就不需要重新设置状态*/
+            if(isUpdate && oldProjectBaseInfoDO.getDevelopmentStatus().equals(ProfitStatusEnum.APPROVED.getStatus()) &&
+                    oldProjectBaseInfoDO.getProjectStartTime().isEqual(vo.getProjectStartTime()) &&
+                    oldProjectBaseInfoDO.getProjectEndTime().isEqual(vo.getProjectEndTime()) &&
+                    oldProjectBaseInfoDO.getDevelopmentCopyRmbTotalPrice().compareTo(vo.getDevelopmentCopyRmbTotalPrice()) == 0 &&
+                    oldProjectBaseInfoDO.getSpainPaidRmbCommission().compareTo(vo.getSpainPaidRmbCommission()) == 0 &&
+                    oldProjectBaseInfoDO.getPaidRmbCommission().compareTo(vo.getPaidRmbCommission()) == 0 &&
+                    //todo 这个实际汇率是否需要,需要讨论。
+                    oldProjectBaseInfoDO.getActualExchangeRate().compareTo(vo.getActualExchangeRate()) == 0
+            ){
+            }else{
+                projectBaseInfoDO.setDevelopmentStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
+            }
         } else if (Objects.nonNull(vo.getProjectInnerProfitInfoStartTime()) || Objects.nonNull(vo.getProjectInnerProfitInfoEndTime())) {
             recordLockFieldVO.setProjectInnerProfitInfoStartTime("LOCKED");
             recordLockFieldVO.setProjectInnerProfitInfoEndTime("LOCKED");
+            type=ProjectOptTypeEnum.INTERNAL_BUSINESS_NET_PROFIT_TYPE.getType();
+            operationDesc = isUpdate
+                    ? OrderOptTypeEnum.PROJECT_INNER_PRODUCE_EDIT.getDesc()
+                    : OrderOptTypeEnum.PROJECT_INNER_PRODUCE_ADD.getDesc();
+            if(isUpdate && oldProjectBaseInfoDO.getInnerProductionStatus().equals(ProfitStatusEnum.APPROVED.getStatus()) &&
+                    oldProjectBaseInfoDO.getProjectInnerProfitInfoStartTime().isEqual(vo.getProjectInnerProfitInfoStartTime()) &&
+                    oldProjectBaseInfoDO.getProjectInnerProfitInfoEndTime().isEqual(vo.getProjectInnerProfitInfoEndTime())){
+            }else{
+                projectBaseInfoDO.setInnerProductionStatus(ProfitStatusEnum.PENDING_APPROVAL.getStatus());
+            }
         }
         recordDO.setFields(JSONObject.toJSONString(recordLockFieldVO));
         if (Objects.isNull(recordDO.getId())) {
@@ -127,11 +171,16 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         } else {
             projectionFieldLockRecordService.updateById(recordDO);
         }
-        return ServerResult.success(this.saveOrUpdate(projectBaseInfoDO));
+        this.saveOrUpdate(projectBaseInfoDO);
+        //在这里进行操作记录。
+        ProjectBaseInfoVO projectBaseInfoVO = buildProjectBaseInfoVO(vo, projectBaseInfoDO.getId());
+        ProjectBaseDevelopOptLogDO projectOptLogDO = buildProjectOptLogDo(projectNoPrefix, dataScope.getLoginUserId(),type ,operationDesc,JSONObject.toJSONString(projectBaseInfoVO));
+        return ServerResult.success(projectBaseDevelopOptLogService.save(projectOptLogDO));
     }
     @Override
     public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
+        Integer applyType=null;
         List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(ProjectApplyDO::getType, vo.getType())
@@ -160,6 +209,15 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .build();
         projectFieldLockApplyService.save(build);
+        //进行审批记录的保存。 需要前端在申请字段申请时传递这条数据的id。
+        if(ProjectApplyTypeEnum.FIELD_EDIT_APPLY.name().equals(vo.getType())){
+            applyType=ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType();
+        }else{
+            applyType=ProjectApplyTypeEnum.INNER_PROFIT_FIELD_EDIT_APPLY.getType();
+        }
+        String descByName = ProjectApplyTypeEnum.getDescByName(vo.getType());
+//        ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = buildProjectBaseInfoLockFieldVO(vo);
+        projectBaseDevelopOptLogService.save(buildProjectOptLogDo(vo.getProjectNoPrefix(), dataScope.getLoginUserId(),applyType,ProjectApplyTypeEnum.getDescByName(vo.getType()),JSONObject.toJSONString(projectBaseInfoLockFieldVO)));
         return ServerResult.success();
     }
@@ -388,6 +446,15 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         throw new RuntimeException(e);
                     }
                 }));
+        //查询永久已保存的配置。
+        List<ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOS = projectBaseAfterReviewSettingService.list(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
+                .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
+                .in(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, orderInfoResultVOS.stream()
+                        .map(OrderBaseInfoVO::getProjectNo)
+                        .collect(Collectors.toSet())));
+        Map<String, ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS
+                .stream()
+                .collect(Collectors.toMap(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, Function.identity(), (x, y) -> x));
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             ProjectBaseInfoDO projectBaseInfoDO = no2ProjectInfoMap.get(entry.getKey());
             List<OrderInfoResultVO> details = entry.getValue();
@@ -402,6 +469,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
+                    .innerProductionStatus((Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getInnerProductionStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : projectBaseInfoDO.getInnerProductionStatus() )
                     .productionDepartment(details.get(0).getProductionDepartment())
                     .lockFields(lockFields)
                     .build();
@@ -505,6 +573,11 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             ratioValue = relation.get("relationValue");
                         }
                     }
+                    //在这里进行覆盖
+                    if(Objects.nonNull(projectBaseAfterReviewSettingDOMap.get(entry.getKey()))){
+                        fixCostValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getFixedCost().toString();
+                        ratioValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getCommissionUnitPrice().toString();
+                    }
                     if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(fixCostValue)
                             && Objects.nonNull(earliest)
                             && Objects.nonNull(latest)) {
@@ -553,6 +626,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .map(projectNo -> projectNo.substring(0, 8))
                 .distinct()
                 .collect(Collectors.toList());
+        Map<String, Set<String>> detailProjectNoMap = orderInfoResultVOS.stream()
+                .filter(vo -> vo.getProjectNo() != null && vo.getProjectNo().length() >= 8)
+                .collect(Collectors.groupingBy(
+                        vo -> vo.getProjectNo().substring(0, 8),                  // 按前8位分组
+                        Collectors.mapping(OrderInfoResultVO::getProjectNo, Collectors.toSet()) // 提取完整projectNo组成List
+                ));
+
         Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
                 .collect(Collectors.groupingBy(
                         order -> order.getProjectNo().substring(0, 8)
@@ -606,12 +686,21 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     }
                 }));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
+        //查询永久已保存的配置。
+        List<ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOS = projectBaseAfterReviewSettingService.list(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
+                .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
+                .in(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix,projectNoPrefix));
+        Map<String, ProjectBaseAfterReviewSettingDO> projectBaseAfterReviewSettingDOMap = projectBaseAfterReviewSettingDOS.stream().collect(Collectors.toMap(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, Function.identity(), (x, y) -> x));
         return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
             ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
             BusinessProfitInfoVO businessProfitInfoVO = BusinessProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
+                    //设置完整的项目号,用于后面需要那这个完整的项目号传递值由前段给后端,因为没有id,所以无法直接知道是哪一条数据,所以需要具体的完整项目号。
+                    .detailProjectNo(detailProjectNoMap.get(entry.getKey()))
+                    //返回状态。
+                    .developmentStatus((Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getDevelopmentStatus())) ? ProfitStatusEnum.Not_COMPLETED.getStatus() : projectBaseInfoDO.getDevelopmentStatus())
                     .lockFields(Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(ProjectBaseInfoLockFieldVO.builder()
                             .actualExchangeRate(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getActualExchangeRate()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
                             .developmentCopyRmbTotalPrice(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
@@ -749,6 +838,12 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             spainRatio = relation.get("relationValue");
                         }
                     }
+                    //在这里进行判断,能够对上述的配置进行覆盖,如果永久已保存的配置中包含这个项目号的数据,则采用永久已保存的配置中,否则采用当前配置(对于已审核的数据,如果采用当前配置肯定会出错。)。
+                    if(Objects.nonNull(projectBaseAfterReviewSettingDOMap.get(entry.getKey()))){
+                      fixCostValue=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getFixedCost().toString();
+                      ratio=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getCommissionRate().toString();
+                      spainRatio=projectBaseAfterReviewSettingDOMap.get(entry.getKey()).getSpainCommissionRate().toString();
+                    }
                     //固定成本
                     businessProfitInfoVO.setFixedCost(BigDecimal.valueOf((between + 1) * Double.parseDouble(fixCostValue)).setScale(2, RoundingMode.HALF_UP));
                     if (Objects.nonNull(spainRatio)
@@ -812,7 +907,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             }
             //综合收益
             businessProfitInfoVO.setComprehensiveProfit(Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).orElse(BigDecimal.ZERO)
-                    .add(Optional.ofNullable(businessProfitInfoVO.getExchangeRateProfit()).orElse(BigDecimal.ZERO))
+                    //综合收益不需要汇率收益计算。
+//                    .add(Optional.ofNullable(businessProfitInfoVO.getExchangeRateProfit()).orElse(BigDecimal.ZERO))
                     .add(Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).orElse(BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));
             return businessProfitInfoVO;
         }).collect(Collectors.toList());
@@ -925,15 +1021,16 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                                 .orElse(BigDecimal.valueOf(0))
                                 .divide(BigDecimal.valueOf(totalPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(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, 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, 50, 51, 0, 4, "综合收益");
+        createMergedRow(sheet, cellStyle, 50, 51, 5, 6, Optional.ofNullable(businessProfitInfoVO.getComprehensiveProfit()).map(price -> "￥" + price).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");
@@ -954,6 +1051,173 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         exportInnerProfitExcel(response, ProfitInfoVO);
     }
+    @Override
+    public void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
+        //这里设置为100是故意设置大一点,防止导出多条数据。
+        ServerResult serverResult =listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).projectNo(queryVO.getDetailProjectNo()).build());
+        Page<BusinessProfitInfoVO> page = (Page<BusinessProfitInfoVO>) serverResult.getData();
+        List<BusinessProfitInfoVO> businessProfitInfoVOS = page.getRecords();
+        if(CollectionUtils.isNotEmpty(businessProfitInfoVOS)){
+            List<Map<String, Object>> list = buildExportExcel(businessProfitInfoVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+            }
+        }
+    }
+
+    @Override
+    public void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
+        //这里设置为100是故意设置大一点,防止导出多条数据。
+        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).productionDepartment(Collections.singletonList("内部")).projectNo(queryVO.getDetailProjectNo()).build());
+        Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
+        List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
+        if(CollectionUtils.isNotEmpty(profitInfoVOS)){
+            List<Map<String,Object>> list=buildInnerProfitExportExcel(profitInfoVOS, queryVO);
+            if(CollectionUtils.isNotEmpty(list)){
+                List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+                ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                        .opsSheet(list)
+                        .opsHeader().simple().texts(keys).done()
+                        .opsColumn().fields(keys).done()
+                        .height(CellPosition.CELL, 750)
+                        .done()
+                        .export(response.getOutputStream());
+            }
+        }
+    }
+
+    @Override
+    public void setProjectBaseInfoDevelopmentStatus(OrderBaseInfoVO vo) {
+
+    //中国团队提成比例。
+        String chainRatio = null;
+    //西班牙提成比例。
+        String spainRatio = null;
+    //固定成本。
+        String dailyCost = null;
+
+     //去表中设置状态,然后记录数据到永久配置中。
+     if(StringUtils.isBlank(vo.getProjectNo())){
+         throw new BusinessException(ServerResultCode.PARAM_ERROR);
+     }
+        ProjectBaseInfoDO projectBaseInfoDO = getOne(new LambdaQueryWrapper<ProjectBaseInfoDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectBaseInfoDO::getProjectNoPrefix, vo.getProjectNo())
+                .last("limit 1"));
+     if(Objects.isNull(projectBaseInfoDO)){
+         throw new BusinessException(ServerResultCode.EMPTY_LIST);
+     }
+     projectBaseInfoDO.setDevelopmentStatus(ProfitStatusEnum.APPROVED.getStatus());
+     //把审核通过时的计算数据时的系统配置保存到永久配置中。防止后续更改系统配置后,正确的数据会被更新掉。
+        //获取当前的系统配置。
+        ProjectBaseAfterReviewSettingDO projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingService.getOne(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
+                .eq(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, vo.getProjectNo())
+                .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
+                .last("limit 1"));
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
+                .eq(SystemSettingDO::getRelationCode, "costSettingItem"));
+        if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
+            throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
+        }
+            //json反序列化。
+            List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingDO.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
+            if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
+                for (CostSettingItemVO relation : costSettingItemVOList) {
+                    if ("ratio".equals(relation.getRelationCode())) {
+                        chainRatio = relation.getRelationValue();
+                    }if ("spainRatio".equals(relation.getRelationCode())) {
+                        spainRatio = relation.getRelationValue();
+                    }if("fixCost".equals(relation.getRelationCode())){
+                        dailyCost=relation.getRelationValue();
+                    }
+                }
+    }
+            if(Objects.isNull(projectBaseAfterReviewSettingDO)){
+                projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO.builder().projectNoPrefix(vo.getProjectNo())
+                        .type(ProjectBaseSettingTypeEnum.COMMISSION_COST.getType())
+                        .fixedCost(new BigDecimal(dailyCost))
+                        .commissionRate(new BigDecimal(chainRatio))
+                        .spainCommissionRate(new BigDecimal(spainRatio)).build();
+            }else{
+                projectBaseAfterReviewSettingDO.setProjectNoPrefix(vo.getProjectNo());
+                projectBaseAfterReviewSettingDO.setType(ProjectBaseSettingTypeEnum.COMMISSION_COST.getType());
+                projectBaseAfterReviewSettingDO.setFixedCost(new BigDecimal(dailyCost));
+                projectBaseAfterReviewSettingDO.setCommissionRate(new BigDecimal(chainRatio));
+                projectBaseAfterReviewSettingDO.setSpainCommissionRate(new BigDecimal(spainRatio));
+            }
+        ProjectBaseAfterReviewSettingDO finalProjectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO;
+        transactionHelper.run(() -> {
+            projectBaseAfterReviewSettingService.saveOrUpdate(finalProjectBaseAfterReviewSettingDO);
+            updateById(projectBaseInfoDO);
+        });
+    }
+
+    @Override
+    public void setInnerProductionStatus(OrderBaseInfoVO vo) {
+        String dailyCost = null;
+        String price = null;
+        //去表中设置状态,然后记录数据到永久配置中。
+        if(StringUtils.isBlank(vo.getProjectNo())){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        ProjectBaseInfoDO projectBaseInfoDO = getOne(new LambdaQueryWrapper<ProjectBaseInfoDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProjectBaseInfoDO::getProjectNoPrefix, vo.getProjectNo())
+                .last("limit 1"));
+        if(Objects.isNull(projectBaseInfoDO)){
+            throw new BusinessException(ServerResultCode.EMPTY_LIST);
+        }
+        projectBaseInfoDO.setInnerProductionStatus(ProfitStatusEnum.APPROVED.getStatus());
+        //把审核通过时的计算数据时的系统配置保存到永久配置中。防止后续更改系统配置后,正确的数据会被更新掉。
+        //获取当前的系统配置。
+        ProjectBaseAfterReviewSettingDO projectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingService.getOne(new LambdaQueryWrapper<ProjectBaseAfterReviewSettingDO>()
+                .eq(ProjectBaseAfterReviewSettingDO::getProjectNoPrefix, vo.getProjectNo())
+                .eq(ProjectBaseAfterReviewSettingDO::getType, ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
+                .last("limit 1"));
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingValue, vo.getCustomerCode())
+                .eq(SystemSettingDO::getRelationCode, "ProduceSettingItem"));
+        if(Objects.isNull(systemSettingDO) || StringUtils.isBlank(systemSettingDO.getRelationValue())){
+            throw new BusinessException("该项目编号的提成配置未配置,请先配置提成配置。");
+        }
+        //json反序列化。
+        List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingDO.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
+        if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
+            for (CostSettingItemVO relation : costSettingItemVOList) {
+                //这里是系统配置中的得到的,应该是从系统配置中的生产科中得到。  固定成本。
+                if("fixCost".equals(relation.getRelationCode())){
+                    dailyCost=relation.getRelationValue();
+                }
+                //生产提成单价
+                if("ratio".equals(relation.getRelationCode())){
+                    price=relation.getRelationValue();
+                }
+            }
+        }
+        if(Objects.isNull(projectBaseAfterReviewSettingDO)){
+            projectBaseAfterReviewSettingDO= projectBaseAfterReviewSettingDO.builder().projectNoPrefix(vo.getProjectNo())
+                    .type(ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType())
+                    .fixedCost(new BigDecimal(dailyCost))
+                    .commissionUnitPrice(new BigDecimal(price)).build();
+        }else{
+            projectBaseAfterReviewSettingDO.setProjectNoPrefix(vo.getProjectNo());
+            projectBaseAfterReviewSettingDO.setType(ProjectBaseSettingTypeEnum.FIXED_COST_OF_PRODUCTION_DEPARTMENT.getType());
+            projectBaseAfterReviewSettingDO.setFixedCost(new BigDecimal(dailyCost));
+            projectBaseAfterReviewSettingDO.setCommissionUnitPrice(new BigDecimal(price));
+        }
+        ProjectBaseAfterReviewSettingDO finalProjectBaseAfterReviewSettingDO = projectBaseAfterReviewSettingDO;
+        transactionHelper.run(() -> {
+            projectBaseAfterReviewSettingService.saveOrUpdate(finalProjectBaseAfterReviewSettingDO);
+            updateById(projectBaseInfoDO);
+        });
+    }
+
     public void exportInnerProfitExcel(HttpServletResponse response, InnerProfitInfoVO vo) throws Exception {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -1006,12 +1270,12 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         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, 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, 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("-"));
@@ -1069,5 +1333,121 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         }
         sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, startCol, endCol));
     }
+    private ProjectBaseDevelopOptLogDO buildProjectOptLogDo(String projectNoPrefix, Long userId , Integer type,String optType, String field){
+        return ProjectBaseDevelopOptLogDO.builder()
+                .projectNoPrefix(projectNoPrefix)
+                .userId(userId)
+                .type(type)
+                .optType(optType)
+                .fields(field)
+                .build();
+    }
+    private ProjectBaseInfoVO buildProjectBaseInfoVO(ProjectBaseInfoVO vo,Long projectBaseInfoId){
+        ProjectBaseInfoVO projectBaseInfoVO = new ProjectBaseInfoVO();
+         BeanUtils.copyProperties(vo, projectBaseInfoVO, "id");
+         projectBaseInfoVO.setId(projectBaseInfoId);
+        return projectBaseInfoVO;
+    }
+//    private ProjectBaseInfoLockFieldVO buildProjectBaseInfoLockFieldVO(ProjectBaseInfoLockFieldVO vo){
+//        ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = new ProjectBaseInfoLockFieldVO();
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getActualExchangeRate())){
+//            projectBaseInfoLockFieldVO.setActualExchangeRate(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getDevelopmentCopyRmbTotalPrice())){
+//            projectBaseInfoLockFieldVO.setDevelopmentCopyRmbTotalPrice(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getPaidRmbCommission())){
+//            projectBaseInfoLockFieldVO.setPaidRmbCommission(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getProjectEndTime())){
+//            projectBaseInfoLockFieldVO.setProjectEndTime(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getProjectStartTime())){
+//            projectBaseInfoLockFieldVO.setProjectStartTime(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        if(OrderLockFieldEnum.UN_LOCKED.equals(vo.getSpainPaidRmbCommission())){
+//            projectBaseInfoLockFieldVO.setSpainPaidRmbCommission(OrderLockFieldEnum.UN_LOCKED.getStatus());
+//        }
+//        return projectBaseInfoLockFieldVO;
+//    }
+    private List<Map<String,Object>> buildExportExcel(List<BusinessProfitInfoVO> businessProfitInfoVOList,ProjectBaseInfoQueryVO queryVO){
+        List<Map<String,Object>> list = new ArrayList<>();
+        for( BusinessProfitInfoVO vo:businessProfitInfoVOList){
+            Map<String, Object> hashMap = new LinkedHashMap<>();
+            hashMap.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+            hashMap.put("项目号",Objects.nonNull(vo.getProjectNoPrefix()) ? vo.getProjectNoPrefix() : "");
+            hashMap.put("客户总金额￥",Objects.nonNull(vo.getCustomerRmbTotalPrice()) ? String.format("%.2f",vo.getCustomerRmbTotalPrice()) : "");
+            hashMap.put("客户总金额$",Objects.nonNull(vo.getCustomerTotalPrice()) ? String.format("%.2f",vo.getCustomerTotalPrice()) : "");
+            hashMap.put("生产总价合计￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ? String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");
+            hashMap.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
+            hashMap.put("包装费用合计$",Objects.nonNull(vo.getPacketTotalPrice()) ? String.format("%.2f",vo.getPacketTotalPrice()) : "");
+            hashMap.put("研发复制合计￥",Objects.nonNull(vo.getDevelopmentCopyRmbTotalPrice()) ? vo.getDevelopmentCopyRmbTotalPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("固定成本￥",Objects.nonNull(vo.getFixedCost()) ? vo.getFixedCost().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("西班牙提成￥",Objects.nonNull(vo.getSpainRmbCommission()) ? vo.getSpainRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("西班牙已发提成￥",Objects.nonNull(vo.getSpainPaidRmbCommission()) ? vo.getSpainPaidRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("西班牙未发提成￥",Objects.nonNull(vo.getSpainUnpaidRmbCommission()) ? vo.getSpainUnpaidRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("中国团队提成￥",Objects.nonNull(vo.getRmbCommission()) ? vo.getRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("中国已发提成￥",Objects.nonNull(vo.getPaidRmbCommission()) ? vo.getPaidRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("中国未发提成￥",Objects.nonNull(vo.getUnpaidRmbCommission()) ? vo.getUnpaidRmbCommission().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("支出合计￥",Objects.nonNull(vo.getRmbTotalExpense()) ? vo.getRmbTotalExpense().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("毛利润￥",Objects.nonNull(vo.getProfit()) ? vo.getProfit().setScale(2, RoundingMode.HALF_UP).toPlainString(): "");
+            hashMap.put("毛利率",
+                    Objects.nonNull(vo.getProfitRate())
+                            ? vo.getProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toPlainString() + "%"
+                            : ""
+            );
+            hashMap.put("研发贸易净利润￥",Objects.nonNull(vo.getDevelopmentProfit()) ? vo.getDevelopmentProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("净利润率",
+                    Objects.nonNull(vo.getDevelopmentProfitRate())
+                            ? vo.getDevelopmentProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"
+                            : ""
+            );
+            hashMap.put("包装费用合计￥",Objects.nonNull(vo.getPacketRmbTotalPrice()) ? String.format("%.2f",vo.getPacketRmbTotalPrice()) : "");
+            hashMap.put("包装费用实际金额￥",Objects.nonNull(vo.getPacketActualRmbPrice()) ? vo.getPacketActualRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("订单总数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+            hashMap.put("实际跟单单价￥",Objects.nonNull(vo.getActualOrderRmbPrice()) ? vo.getActualOrderRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("实际跟单单价$",Objects.nonNull(vo.getActualOrderPrice()) ? vo.getActualOrderPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("包装费用收益￥",Objects.nonNull(vo.getPacketProfitRmbPrice()) ? vo.getPacketProfitRmbPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+            hashMap.put("综合收益￥",Objects.nonNull(vo.getComprehensiveProfit()) ? vo.getComprehensiveProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+//            if(StringUtils.isNotBlank(queryVO.getProjectExportSelect().getSpainPaidRmbCommission()) &&
+//            OrderLockFieldEnum.SELECTED.name().equals(queryVO.getProjectExportSelect().getSpainPaidRmbCommission())){
+//            }
+            list.add(hashMap);
+            }
+        return list;
+        }
+        private List<Map<String,Object>> buildInnerProfitExportExcel(List<InnerProfitInfoVO> innerProfitInfoVOList, ProjectBaseInfoQueryVO queryVO) {
+            List<Map<String,Object>> list = new ArrayList<>();
+            for (InnerProfitInfoVO vo:innerProfitInfoVOList){
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("客户编码",Objects.nonNull(vo.getCustomerCode()) ? vo.getCustomerCode() : "");
+                map.put("项目号",Objects.nonNull(vo.getProjectNoPrefix()) ? vo.getProjectNoPrefix() : "");
+                map.put("生产科",Objects.nonNull(vo.getProductionDepartment()) ? vo.getProductionDepartment() : "");
+                map.put("数量",Objects.nonNull(vo.getOrderCount()) ? vo.getOrderCount() : "");
+                map.put("生产科总价￥",Objects.nonNull(vo.getProductionDepartmentTotalPrice()) ?  String.format("%.2f",vo.getProductionDepartmentTotalPrice()) : "");
+                map.put("生产科预算金额￥",Objects.nonNull(vo.getProductionDepartmentPredictPrice()) ? vo.getProductionDepartmentPredictPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+                map.put("实际发生费用￥",Objects.nonNull(vo.getProductionActualPrice()) ? vo.getProductionActualPrice().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+                map.put("预算占比",Objects.nonNull(vo.getPredictRatio()) ? vo.getPredictRatio().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+                map.put("预算占比与实际占比差",
+                        Objects.nonNull(vo.getPredictAndActualRatio())
+                                ? vo.getPredictAndActualRatio().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%"
+                                : ""
+                );
+                map.put("事前毛利润￥",Objects.nonNull(vo.getBeforeGrossProfit()) ? vo.getBeforeGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+                map.put("事前毛利润率",Objects.nonNull(vo.getBeforeGrossProfitRate()) ? vo.getBeforeGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+                map.put("事后毛利润￥",Objects.nonNull(vo.getGrossProfit()) ? vo.getGrossProfit().setScale(2, RoundingMode.HALF_UP).toPlainString() : "");
+                map.put("事后毛利润率",Objects.nonNull(vo.getGrossProfitRate()) ? vo.getGrossProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+                map.put("内部生产固定成本￥",Objects.nonNull(vo.getInnerProductionFixedCost()) ? vo.getInnerProductionFixedCost().setScale(2, RoundingMode.HALF_UP) : "");
+                map.put("内部生产提成￥",Objects.nonNull(vo.getInnerProductionCommission()) ? vo.getInnerProductionCommission().setScale(2, RoundingMode.HALF_UP) : "");
+                map.put("内部生产净利润￥",Objects.nonNull(vo.getInnerProductionProfit()) ? vo.getInnerProductionProfit().setScale(2, RoundingMode.HALF_UP) : "");
+                map.put("内部生产净利润率",Objects.nonNull(vo.getInnerProductionProfitRate()) ? vo.getInnerProductionProfitRate().multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP) + "%" : "");
+              /*  if(StringUtils.isNotEmpty(queryVO.getInnerProfitInfoExportSelect().getProductionDepartmentTotalPrice()) &&
+                OrderLockFieldEnum.SELECTED.name().equals(queryVO.getInnerProfitInfoExportSelect().getProductionDepartmentTotalPrice())){
+
+                }*/
+                list.add(map);
+            }
+            return list;
+        }
 }
@@ -57,7 +57,7 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: Erp@test123456
+    password: eJ8(bD6]wN6=gI5=
     time-between-eviction-runs-millis: 1000
     url: jdbc:mysql://47.104.8.35:3307/order-erp-pre-prod?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
@@ -63,7 +63,7 @@ spring:
     username: root
   redis:
     database: 0
-    host: 39.108.227.113
+    host: 47.104.8.35
     lettuce:
       pool:
         max-active: 2000
@@ -72,7 +72,7 @@ spring:
         min-idle: 3
         time-between-eviction-runs: 100
     password: ''
-    port: 6379
+    port: 6380
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址