feat(order): 增加申请编辑字段的备注功能

- 在 OrderCostInfolockFieldVO 和 ProjectBaseInfoLockFieldVO 中添加 applyRemark 字段 - 在 OrderCostInfoServiceImpl 和 ProjectBaseInfoServiceImpl 中处理申请备注 - 优化逻辑 ProjectBaseInfoServiceImpl 中的字段锁定

feat(order): 增加申请编辑字段的备注功能
- 在 OrderCostInfolockFieldVO 和 ProjectBaseInfoLockFieldVO 中添加 applyRemark 字段 - 在 OrderCostInfoServiceImpl 和 ProjectBaseInfoServiceImpl 中处理申请备注 - 优化逻辑 ProjectBaseInfoServiceImpl 中的字段锁定
曾国涛
1 parent 10fec827
Showing 5 changed files with 80 additions and 71 deletions
src/main/java/com/order/erp/controller/OrderCostController.java
src/main/java/com/order/erp/domain/vo/order/OrderCostInfolockFieldVO.java
src/main/java/com/order/erp/domain/vo/order/ProjectBaseInfoLockFieldVO.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -53,7 +53,7 @@ public class OrderCostController {
     @PostMapping("/applyEditFileds")
     @ApiOperation("申请编辑字段")
-    public ServerResult applyEditFileds(OrderCostInfolockFieldVO vo) throws Exception {
+    public ServerResult applyEditFileds(@RequestBody OrderCostInfolockFieldVO vo) throws Exception {
        return orderCostInfoService.applyEditFileds(vo);
     }
@@ -41,5 +41,5 @@ public class OrderCostInfolockFieldVO implements Serializable {
     private String packetActualRmbTotalPrice;
-
+    private String applyRemark;
 }
@@ -38,6 +38,8 @@ public class ProjectBaseInfoLockFieldVO implements Serializable {
     private String projectNoPrefix;
+    private String applyRemark;
+
     private String developmentCopyRmbTotalPrice;
     private String projectStartTime;
@@ -100,6 +100,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderFieldLockApplyDO build = OrderFieldLockApplyDO.builder()
                 .orderId(vo.getOrderId())
                 .applyUserId(dataScope.getLoginUserId())
+                .applyRemark(vo.getApplyRemark())
                 .fields(JSONObject.toJSONString(lockField))
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .type(vo.getType())
@@ -56,7 +56,7 @@ import java.util.stream.Collectors;
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -87,12 +87,13 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         ProjectBaseInfoDO projectBaseInfoDO = null;
         if (projectBaseInfoDOOpt.isPresent()) {
             projectBaseInfoDO = projectBaseInfoDOOpt.get();
-            BeanUtil.copyProperties(vo, projectBaseInfoDO,"id");
-        }else {
+            BeanUtil.copyProperties(vo, projectBaseInfoDO, "id");
+        } else {
             projectBaseInfoDO = BeanUtil.copyProperties(vo, ProjectBaseInfoDO.class);
         }
         return ServerResult.success(this.saveOrUpdate(projectBaseInfoDO));
     }
+
     @Override
     public ServerResult applyEditFileds(ProjectBaseInfoLockFieldVO vo) {
         List<ProjectApplyDO> applyDOS = projectFieldLockApplyService.list(new LambdaQueryWrapper<ProjectApplyDO>()
@@ -103,12 +104,19 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         if (CollectionUtils.isNotEmpty(applyDOS)) {
             throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
         }
-        String projectNoPrefix = vo.getProjectNoPrefix();
-        vo.setProjectNoPrefix(null);
+        ProjectBaseInfoLockFieldVO projectBaseInfoLockFieldVO = ProjectBaseInfoLockFieldVO.builder()
+                .developmentCopyRmbTotalPrice(vo.getDevelopmentCopyRmbTotalPrice())
+                .projectStartTime(vo.getProjectStartTime())
+                .projectEndTime(vo.getProjectEndTime())
+                .spainPaidRmbCommission(vo.getSpainPaidRmbCommission())
+                .paidRmbCommission(vo.getPaidRmbCommission())
+                .actualExchangeRate(vo.getActualExchangeRate())
+                .build();
         ProjectApplyDO build = ProjectApplyDO.builder()
-                .projectNoPrefix(projectNoPrefix)
+                .projectNoPrefix(vo.getProjectNoPrefix())
                 .applyUserId(dataScope.getLoginUserId())
-                .fields(JSONObject.toJSONString(vo))
+                .applyRemark(vo.getApplyRemark())
+                .fields(JSONObject.toJSONString(projectBaseInfoLockFieldVO))
                 .type(ProjectApplyTypeEnum.FIELD_EDIT_APPLY)
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .build();
@@ -117,18 +125,16 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     }
-
-
     @Override
     public ServerResult pageProjectLockFieldApply(QueryProjectLockFieldVO vo) {
         Page<ProjectApplyDO> page = projectFieldLockApplyService.lambdaQuery()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(ProjectApplyDO::getType, ProjectApplyTypeEnum.FIELD_EDIT_APPLY.getType())
-                .eq(ProjectApplyDO::getStatus, StringUtils.isNotBlank(vo.getStatus())? ApplyStatusEnum.WAIT_AUDIT.getStatus():vo.getStatus())
+                .eq(ProjectApplyDO::getStatus, StringUtils.isBlank(vo.getStatus()) ? ApplyStatusEnum.WAIT_AUDIT.getStatus() : vo.getStatus())
                 .orderByDesc(ProjectApplyDO::getCreateTime)
                 .page(new Page<>(vo.getPage(), vo.getPageSize()));
         List<ProjectApplyDO> records = page.getRecords();
-        if(CollectionUtils.isEmpty(records)){
+        if (CollectionUtils.isEmpty(records)) {
             return buildPageResult(page, Collections.emptyList());
         }
         List<ProjectApplyVO> collect = records.stream().map(e -> {
@@ -142,28 +148,28 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     public ServerResult audit(AuditVO vo) {
         ProjectApplyDO applyDO = projectFieldLockApplyService.getById(vo.getId());
         applyDO.setAuditUserId(dataScope.getLoginUserId());
-
-         if(ApplyStatusEnum.AUDIT_PASS.getStatus().equals(vo.getStatus())){
-             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
-             ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
-                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                     .eq(ProjectFieldLockRecord::getProjectNoPrefix, applyDO.getProjectNoPrefix())
-                     .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
-                     .orderByDesc(ProjectFieldLockRecord::getId)
-                     .last("limit 1"));
-             if (Objects.isNull(recordDO)) {
-                 recordDO = ProjectFieldLockRecord.builder()
-                         .projectNoPrefix(applyDO.getProjectNoPrefix())
-                         .userId(applyDO.getApplyUserId())
-                         .build();
-             }
-             recordDO.setFields(applyDO.getFields());
-             if (Objects.isNull(recordDO.getId())) {
-                 projectionFieldLockRecordService.save(recordDO);
-             } else {
-                 projectionFieldLockRecordService.updateById(recordDO);
-             }
-         }
+        applyDO.setAuditRemark(vo.getRefuseRemark());
+        if (ApplyStatusEnum.AUDIT_PASS.getStatus().equals(vo.getStatus())) {
+            applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            ProjectFieldLockRecord recordDO = projectionFieldLockRecordService.getOne(new LambdaQueryWrapper<ProjectFieldLockRecord>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(ProjectFieldLockRecord::getProjectNoPrefix, applyDO.getProjectNoPrefix())
+                    .eq(ProjectFieldLockRecord::getUserId, applyDO.getApplyUserId())
+                    .orderByDesc(ProjectFieldLockRecord::getId)
+                    .last("limit 1"));
+            if (Objects.isNull(recordDO)) {
+                recordDO = ProjectFieldLockRecord.builder()
+                        .projectNoPrefix(applyDO.getProjectNoPrefix())
+                        .userId(applyDO.getApplyUserId())
+                        .build();
+            }
+            recordDO.setFields(applyDO.getFields());
+            if (Objects.isNull(recordDO.getId())) {
+                projectionFieldLockRecordService.save(recordDO);
+            } else {
+                projectionFieldLockRecordService.updateById(recordDO);
+            }
+        }
         projectFieldLockApplyService.updateById(applyDO);
         return ServerResult.success();
     }
@@ -215,15 +221,14 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .collect(Collectors.toList());
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.list(orderBaseInfoService.buildQueryByParam(queryVO)
-                .and(CollUtil.isNotEmpty(projectNoPrefix),query -> {
+                .and(CollUtil.isNotEmpty(projectNoPrefix), query -> {
                     for (int i = 0; i < projectNoPrefix.size(); i++) {
                         query.likeRight(OrderBaseInfoDO::getProjectNo, projectNoPrefix.get(i));
                         if (i != projectNoPrefix.size() - 1) {
                             query.or();
                         }
                     }
-                }))
-                ;
+                }));
         return orderBaseInfoService.wrapperOrderResultList(true, orderBaseInfoDOS);
     }
@@ -239,7 +244,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     }
     private List<InnerProfitInfoVO> buildInnerProfitInfos(List<OrderInfoResultVO> orderInfoResultVOS) {
-        if(CollUtil.isEmpty(orderInfoResultVOS)){
+        if (CollUtil.isEmpty(orderInfoResultVOS)) {
             return Collections.emptyList();
         }
         Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
@@ -437,16 +442,16 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         List<ProjectFieldLockRecord> lockRecords = projectionFieldLockRecordService
                 .lambdaQuery()
                 .func(query -> {
-                    Set<String> projectNoPrefixs =  list.stream().map(ProjectBaseInfoDO::getProjectNoPrefix).collect(Collectors.toSet());
-                    if(CollUtil.isNotEmpty(projectNoPrefixs)){
-                        query.in(ProjectFieldLockRecord::getProjectNoPrefix,projectNoPrefixs);
+                    Set<String> projectNoPrefixs = list.stream().map(ProjectBaseInfoDO::getProjectNoPrefix).collect(Collectors.toSet());
+                    if (CollUtil.isNotEmpty(projectNoPrefixs)) {
+                        query.in(ProjectFieldLockRecord::getProjectNoPrefix, projectNoPrefixs);
-                    }else {
+                    } else {
                         query.apply("1!=1");
                     }
                 })
                 .list();
-        Map<String,ProjectBaseInfoLockFieldVO> prjectNo2LockRecordMap  = lockRecords.stream()
+        Map<String, ProjectBaseInfoLockFieldVO> prjectNo2LockRecordMap = lockRecords.stream()
                 .collect(Collectors.toMap(ProjectFieldLockRecord::getProjectNoPrefix, record -> {
                     try {
                         return objectMapper.readValue(record.getFields(), ProjectBaseInfoLockFieldVO.class);
@@ -462,12 +467,12 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     .customerCode(details.get(0).getCustomerCode())
                     .projectNoPrefix(entry.getKey())
                     .lockFields(Optional.ofNullable(prjectNo2LockRecordMap.get(entry.getKey())).orElse(ProjectBaseInfoLockFieldVO.builder()
-                            .actualExchangeRate( Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getActualExchangeRate()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .developmentCopyRmbTotalPrice(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .paidRmbCommission(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .projectEndTime(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getProjectEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .projectStartTime(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getProjectStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
-                            .spainPaidRmbCommission(Objects.isNull(projectBaseInfoDO)|| Objects.isNull(projectBaseInfoDO.getSpainPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .actualExchangeRate(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getActualExchangeRate()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .developmentCopyRmbTotalPrice(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getDevelopmentCopyRmbTotalPrice()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .paidRmbCommission(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .projectEndTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectEndTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .projectStartTime(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getProjectStartTime()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
+                            .spainPaidRmbCommission(Objects.isNull(projectBaseInfoDO) || Objects.isNull(projectBaseInfoDO.getSpainPaidRmbCommission()) ? OrderLockFieldEnum.UN_LOCKED.name() : OrderLockFieldEnum.LOCKED.name())
                             .build()))
                     .build();
@@ -513,7 +518,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             //包装费用合计￥
             businessProfitInfoVO.setPacketRmbTotalPrice(Optional.ofNullable(businessProfitInfoVO.getPacketTotalPrice())
-                    .orElse(0.0) *exchangeRate.doubleValue());
+                    .orElse(0.0) * exchangeRate.doubleValue());
             //包装费用实际金额
             details.stream()
                     .map(OrderInfoResultVO::getOrderCostInfo)
@@ -676,6 +681,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         BusinessProfitInfoVO businessProfitInfoVO = orderInfoResultVOS.get(0);
         exportBusinessProfitExcel(response, businessProfitInfoVO);
     }
+
     public void exportBusinessProfitExcel(HttpServletResponse response, BusinessProfitInfoVO businessProfitInfoVO) throws Exception {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -718,67 +724,67 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 12, 13, 7, 9, Optional.ofNullable(businessProfitInfoVO.getCustomerTotalPrice()).map(price -> "$" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 14, 15, 0, 4, "生产科总价合计");
         createMergedRow(sheet, cellStyle, 14, 15, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProductionDepartmentTotalPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 14, 15, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 14, 15, 7, 9, "");
         createMergedRow(sheet, cellStyle, 16, 17, 0, 4, "包装费用合计");
         createMergedRow(sheet, cellStyle, 16, 17, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 16, 17, 7, 9, Optional.ofNullable(businessProfitInfoVO.getPacketTotalPrice()).map(price -> "$" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 18, 19, 0, 4, "研发复制费合计");
         createMergedRow(sheet, cellStyle, 18, 19, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentCopyRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 18, 19, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 18, 19, 7, 9, "");
         createMergedRow(sheet, cellStyle, 20, 21, 0, 4, "固定成本");
         createMergedRow(sheet, cellStyle, 20, 21, 5, 6, Optional.ofNullable(businessProfitInfoVO.getFixedCost()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 20, 21, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 20, 21, 7, 9, "");
         createMergedRow(sheet, cellStyle, 22, 23, 0, 4, "西班牙提成");
         createMergedRow(sheet, cellStyle, 22, 23, 5, 6, Optional.ofNullable(businessProfitInfoVO.getSpainRmbCommission()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 22, 23, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 22, 23, 7, 9, "");
         createMergedRow(sheet, cellStyle, 24, 25, 0, 4, "中国团队提成");
         createMergedRow(sheet, cellStyle, 24, 25, 5, 6, Optional.ofNullable(businessProfitInfoVO.getRmbCommission()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 24, 25, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 24, 25, 7, 9, "");
         createMergedRow(sheet, cellStyle, 26, 27, 0, 4, "支出合计");
         createMergedRow(sheet, cellStyle, 26, 27, 5, 6, Optional.ofNullable(businessProfitInfoVO.getRmbTotalExpense()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 26, 27, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 26, 27, 7, 9, "");
         createMergedRow(sheet, cellStyle, 28, 29, 0, 4, "毛利润");
         createMergedRow(sheet, cellStyle, 28, 29, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfit()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 28, 29, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 28, 29, 7, 9, "");
         createMergedRow(sheet, cellStyle, 30, 31, 0, 4, "毛利率");
         createMergedRow(sheet, cellStyle, 30, 31, 5, 6, Optional.ofNullable(businessProfitInfoVO.getProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
-        createMergedRow(sheet, cellStyle, 30, 31, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 30, 31, 7, 9, "");
         createMergedRow(sheet, cellStyle, 32, 33, 0, 4, "研发贸易净利润");
         createMergedRow(sheet, cellStyle, 32, 33, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfit()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 32, 33, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 32, 33, 7, 9, "");
         createMergedRow(sheet, cellStyle, 34, 35, 0, 4, "研发贸易净利润率");
         createMergedRow(sheet, cellStyle, 34, 35, 5, 6, Optional.ofNullable(businessProfitInfoVO.getDevelopmentProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
-        createMergedRow(sheet, cellStyle, 34, 35, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 34, 35, 7, 9, "");
         createMergedRow(sheet, cellStyle, 36, 37, 0, 4, "包装费用合计金额");
         createMergedRow(sheet, cellStyle, 36, 37, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 36, 37, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 36, 37, 7, 9, "");
         createMergedRow(sheet, cellStyle, 38, 39, 0, 4, "包装费用实际金额");
         createMergedRow(sheet, cellStyle, 38, 39, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketActualRmbTotalPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 38, 39, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 38, 39, 7, 9, "");
         createMergedRow(sheet, cellStyle, 40, 41, 0, 4, "订单总数量");
         createMergedRow(sheet, cellStyle, 40, 41, 5, 6, Optional.ofNullable(businessProfitInfoVO.getOrderCount()).map(String::valueOf).orElse("-"));
-        createMergedRow(sheet, cellStyle, 40, 41, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 40, 41, 7, 9, "");
         createMergedRow(sheet, cellStyle, 42, 43, 0, 4, "实际跟单单价=实际跟单费用/件数");
         createMergedRow(sheet, cellStyle, 42, 43, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 42, 43, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 42, 43, 7, 9, "");
         createMergedRow(sheet, cellStyle, 44, 45, 0, 4, "实际跟单单价折算美金");
         createMergedRow(sheet, cellStyle, 44, 45, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualOrderPrice()).map(price -> "$" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 44, 45, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 44, 45, 7, 9, "");
         createMergedRow(sheet, cellStyle, 46, 47, 0, 4, "包装费用收益");
         createMergedRow(sheet, cellStyle, 46, 47, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice()).map(price -> "￥" + price).orElse("-"));
-        createMergedRow(sheet, cellStyle, 46, 47, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 46, 47, 7, 9, "");
         createMergedRow(sheet, cellStyle, 48, 49, 0, 4, "包装费用净利润率");
         createMergedRow(sheet, cellStyle, 48, 49, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
-        createMergedRow(sheet, cellStyle, 48, 49, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 48, 49, 7, 9, "");
         createMergedRow(sheet, cellStyle, 50, 51, 0, 4, "实际汇率");
         createMergedRow(sheet, cellStyle, 50, 51, 5, 6, Optional.ofNullable(businessProfitInfoVO.getActualExchangeRate()).map(String::valueOf).orElse("-"));
-        createMergedRow(sheet, cellStyle, 50, 51, 7, 9,"");
+        createMergedRow(sheet, cellStyle, 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, 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,"");
+        createMergedRow(sheet, cellStyle, 54, 55, 7, 9, "");
         // 设置响应头
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");