feat(order): 优化内部生产净利润分析表

- 新增生产科单价字段 - 优化内部生产提成计算逻辑 - 修正内部生产净利润率计算方式 - 调整固定成本计算方法 - 优化 Excel 导出数据

feat(order): 优化内部生产净利润分析表
- 新增生产科单价字段 - 优化内部生产提成计算逻辑 - 修正内部生产净利润率计算方式 - 调整固定成本计算方法 - 优化 Excel 导出数据
曾国涛
1 parent 60b81195
Showing 5 changed files with 105 additions and 26 deletions
src/main/java/com/order/erp/controller/ProjectController.java
src/main/java/com/order/erp/domain/dto/order/ProjectBaseInfoDO.java
src/main/java/com/order/erp/domain/vo/order/InnerProfitInfoVO.java
src/main/java/com/order/erp/domain/vo/order/ProjectBaseInfoVO.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -66,7 +66,6 @@ public class ProjectController {
     @PostMapping("/BusinessProfitInfo/listByPage")
     @ApiOperation("业务研发净利润分析表")
     public ServerResult<Page<BusinessProfitInfoVO>> listBusinessProfitInfosByPage(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
-        queryVO.setProductionDepartment(Collections.singletonList("内部"));
         return projectBaseInfoService.listBusinessProfitInfoByPage(queryVO);
     }
@@ -42,6 +42,10 @@ public class ProjectBaseInfoDO extends BaseDO implements Serializable {
     private LocalDateTime projectEndTime;
+    private LocalDateTime projectInnerProfitInfoStartTime;
+
+    private LocalDateTime projectInnerProfitInfoEndTime;
+
     private BigDecimal spainPaidRmbCommission;
@@ -49,5 +53,4 @@ public class ProjectBaseInfoDO extends BaseDO implements Serializable {
     private BigDecimal actualExchangeRate;
-
 }
@@ -59,6 +59,12 @@ public class InnerProfitInfoVO implements Serializable {
     /**
      * 生产科总价合计
      */
+    @ApiModelProperty(value = "生产科单价")
+    private Double  productionDepartmentUnitPrice;
+
+    /**
+     * 生产科总价合计
+     */
     @ApiModelProperty(value = "生产科总价")
     private Double  productionDepartmentTotalPrice;
@@ -40,6 +40,9 @@ public class ProjectBaseInfoVO implements Serializable {
     private LocalDateTime projectEndTime;
+    private LocalDateTime projectInnerProfitInfoStartTime;
+
+    private LocalDateTime projectInnerProfitInfoEndTime;
     private BigDecimal spainPaidRmbCommission;
@@ -20,7 +20,6 @@ import com.order.erp.domain.ProjectApplyTypeEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
-import com.order.erp.domain.dto.order.OrderCostInfoDO;
 import com.order.erp.domain.dto.order.ProjectBaseInfoDO;
 import com.order.erp.domain.model.ProjectApplyDO;
 import com.order.erp.domain.model.ProjectFieldLockRecord;
@@ -177,7 +176,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public ServerResult<Page<InnerProfitInfoVO>> listInnerProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
-        Page<OrderBaseInfoDO> page = pageProjectNoPrefix(queryVO);
+        Page<OrderBaseInfoDO> page = pageProjectNo(queryVO);
         List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOS(page, queryVO);
         List<InnerProfitInfoVO> innerProfitInfoVOs = buildInnerProfitInfos(orderInfoResultVOS);
         return buildPageResult(page, innerProfitInfoVOs);
@@ -186,7 +185,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public ServerResult<Page<BusinessProfitInfoVO>> listBusinessProfitInfoByPage(OrderBaseInfoQueryVO queryVO) {
         Page<OrderBaseInfoDO> page = pageProjectNoPrefix(queryVO);
-        List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOS(page, queryVO);
+        List<OrderInfoResultVO> orderInfoResultVOS = getOrderInfoResultVOSByProNoPrefix(page, queryVO);
         List<BusinessProfitInfoVO> businessProfitInfoVOs = buildBusinessProfitInfos(orderInfoResultVOS);
         return buildPageResult(page, businessProfitInfoVOs);
     }
@@ -194,6 +193,26 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     /**
      * 分页查询项目号前8位
      */
+    private Page<OrderBaseInfoDO> pageProjectNo(OrderBaseInfoQueryVO queryVO) {
+        LambdaQueryWrapper<OrderBaseInfoDO> orderBaseInfoDOLambdaQueryWrapper = orderBaseInfoService.buildQueryByParam(queryVO).select(OrderBaseInfoDO::getId);
+        return orderBaseInfoService.page(new Page<>(queryVO.getPage(), queryVO.getPageSize()),
+                new LambdaQueryWrapper<OrderBaseInfoDO>()
+                        .select(OrderBaseInfoDO::getProjectNo)
+                        .func(!orderBaseInfoDOLambdaQueryWrapper.isEmptyOfWhere(), queryWrapper -> {
+                            List<OrderBaseInfoDO> list = orderBaseInfoService.list(orderBaseInfoDOLambdaQueryWrapper);
+                            List<Long> ids = list.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+                            if (CollUtil.isNotEmpty(ids)) {
+                                queryWrapper.in(OrderBaseInfoDO::getId, ids);
+                            } else {
+                                queryWrapper.apply("1!=1 ");
+                            }
+                        })
+                        .groupBy(OrderBaseInfoDO::getProjectNo));
+    }
+
+    /**
+     * 分页查询项目号前8位
+     */
     private Page<OrderBaseInfoDO> pageProjectNoPrefix(OrderBaseInfoQueryVO queryVO) {
         LambdaQueryWrapper<OrderBaseInfoDO> orderBaseInfoDOLambdaQueryWrapper = orderBaseInfoService.buildQueryByParam(queryVO).select(OrderBaseInfoDO::getId);
         return orderBaseInfoService.page(new Page<>(queryVO.getPage(), queryVO.getPageSize()),
@@ -211,12 +230,35 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         .groupBy("LEFT(project_no, 8)"));
     }
+
+
     /**
      * 查询订单列表
      */
     private List<OrderInfoResultVO> getOrderInfoResultVOS(Page<OrderBaseInfoDO> page, OrderBaseInfoQueryVO queryVO) {
         List<String> projectNoPrefix = page.getRecords().stream()
                 .map(OrderBaseInfoDO::getProjectNo)
+                //.map(x -> x.substring(0, 8))
+                .collect(Collectors.toList());
+
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoService.list(orderBaseInfoService.buildQueryByParam(queryVO)
+                .func(query -> {
+                    if (CollUtil.isNotEmpty(projectNoPrefix)) {
+                        query.in(OrderBaseInfoDO::getProjectNo, projectNoPrefix);
+                    } else {
+                        query.apply("1!=1");
+                    }
+                }));
+
+        return orderBaseInfoService.wrapperOrderResultList(true, orderBaseInfoDOS);
+    }
+
+    /**
+     * 查询订单列表
+     */
+    private List<OrderInfoResultVO> getOrderInfoResultVOSByProNoPrefix(Page<OrderBaseInfoDO> page, OrderBaseInfoQueryVO queryVO) {
+        List<String> projectNoPrefix = page.getRecords().stream()
+                .map(OrderBaseInfoDO::getProjectNo)
                 .map(x -> x.substring(0, 8))
                 .collect(Collectors.toList());
@@ -249,8 +291,23 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         }
         Map<String, List<OrderInfoResultVO>> orderBaseInfoDOSGroupByProjectNoPre = orderInfoResultVOS.stream()
                 .collect(Collectors.groupingBy(
-                        order -> order.getProjectNo().substring(0, 8)
+                        OrderBaseInfoVO::getProjectNo
                 ));
+        List<String> projectNoPrefix = orderInfoResultVOS.stream()
+                .map(OrderInfoResultVO::getProjectNo)
+                //.map(projectNo -> projectNo.substring(0, 8))
+                .distinct()
+                .collect(Collectors.toList());
+        List<ProjectBaseInfoDO> list = this.lambdaQuery()
+                .func(query -> {
+                    if (CollUtil.isNotEmpty(projectNoPrefix)) {
+                        query.in(ProjectBaseInfoDO::getProjectNoPrefix, projectNoPrefix);
+                    } else {
+                        query.apply("1!=1");
+                    }
+                })
+                .list();
+        Map<String, ProjectBaseInfoDO> no2ProjectInfoMap = list.stream().collect(Collectors.toMap(ProjectBaseInfoDO::getProjectNoPrefix, Function.identity()));
         Set<String> collect = orderInfoResultVOS.stream()
                 .map(OrderBaseInfoVO::getCustomerCode)
                 .collect(Collectors.toSet());
@@ -261,7 +318,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                 .list();
         Map<String, SystemSettingDO> systemSettingDOSMap = systemSettingDOS.stream()
                 .collect(Collectors.toMap(SystemSettingDO::getSettingValue, Function.identity(), (x, y) -> x));
-        List<InnerProfitInfoVO> innerProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
+        return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
             InnerProfitInfoVO innerProfitInfoVO = InnerProfitInfoVO.builder()
                     .customerCode(details.get(0).getCustomerCode())
@@ -276,6 +333,18 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     .reduce(Integer::sum)
                     .ifPresent(innerProfitInfoVO::setOrderCount);
+            //生产科单价
+            details.stream()
+                    .map(OrderInfoResultVO::getProfitAnalysisInfo)
+                    .filter(Objects::nonNull)
+                    .map(OrderProfitAnalysisVO::getCustomerRmbPrice)
+                    .filter(Objects::nonNull)
+                    .map(BigDecimal::valueOf)
+                    .reduce(BigDecimal::add)
+                    .ifPresent(price -> {
+                        innerProfitInfoVO.setProductionDepartmentUnitPrice(price.doubleValue());
+                    });
+
             //生产科总价
             details.stream()
                     .map(OrderInfoResultVO::getProfitAnalysisInfo)
@@ -334,16 +403,8 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             }
             //hod时间差
-            LocalDateTime earliest = details.stream()
-                    .map(OrderInfoResultVO::getOrderHodTime)
-                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-                    .min(Comparator.naturalOrder())
-                    .orElse(null);
-            LocalDateTime latest = details.stream()
-                    .map(OrderInfoResultVO::getOrderHodTime)
-                    .map(hodTime -> LocalDateTime.parse(hodTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-                    .max(Comparator.naturalOrder())
-                    .orElse(null);
+            LocalDateTime earliest = Optional.ofNullable(no2ProjectInfoMap.get(entry.getKey())).map(ProjectBaseInfoDO::getProjectInnerProfitInfoStartTime).orElse(null);
+            LocalDateTime latest = Optional.ofNullable(no2ProjectInfoMap.get(entry.getKey())).map(ProjectBaseInfoDO::getProjectInnerProfitInfoEndTime).orElse(null);;
             innerProfitInfoVO.setProduceStartTime(earliest);
             innerProfitInfoVO.setProduceEndTime(latest);
             SystemSettingDO systemSettingDO = systemSettingDOSMap.get(innerProfitInfoVO.getCustomerCode());
@@ -369,13 +430,18 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                             && Objects.nonNull(latest)) {
                         Duration duration = Duration.between(earliest, latest);
                         //内部生产固定成本￥
-                        innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf(duration.toDays() * Double.parseDouble(fixCostValue)));
+                        innerProfitInfoVO.setInnerProductionFixedCost(BigDecimal.valueOf((duration.toDays()+1) * Double.parseDouble(fixCostValue)));
                     }
                     if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(ratioValue)
                             && Objects.nonNull(innerProfitInfoVO.getPredictRatio())
                             && innerProfitInfoVO.getPredictRatio().compareTo(BigDecimal.valueOf(1.05)) < 0) {
                         //内部生产提成￥
-                        innerProfitInfoVO.setInnerProductionCommission(BigDecimal.valueOf(details.size()).multiply(BigDecimal.valueOf(Double.parseDouble(ratioValue))));
+                        innerProfitInfoVO.setInnerProductionCommission(
+                                details.stream()
+                                        .map(detail -> BigDecimal.valueOf(detail.getOrderCount())
+                                                .multiply(BigDecimal.valueOf(Optional.ofNullable(detail.getProfitAnalysisInfo()).map(OrderProfitAnalysisVO::getCustomerRmbPrice).orElse(0.0))))
+                                        .reduce(BigDecimal.ZERO, BigDecimal::add)
+                        );
                     }
                     //内部生产净利润 = 总价-实际费用-固定成本-提成
                     if (Objects.nonNull(innerProfitInfoVO.getProductionDepartmentTotalPrice())
@@ -398,7 +464,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
             }
             return innerProfitInfoVO;
         }).collect(Collectors.toList());
-        return innerProfitInfoVOs;
     }
     private List<BusinessProfitInfoVO> buildBusinessProfitInfos(List<OrderInfoResultVO> orderInfoResultVOS) {
@@ -460,7 +525,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     }
                 }));
         BigDecimal exchangeRate = systemSettingService.getExchangeRate();
-        List<BusinessProfitInfoVO> businessProfitInfoVOs = orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
+        return orderBaseInfoDOSGroupByProjectNoPre.entrySet().stream().map(entry -> {
             List<OrderInfoResultVO> details = entry.getValue();
             ProjectBaseInfoDO projectBaseInfoDO = noPrefix2ProjectProfitAnalysisDOMap.get(entry.getKey());
             BusinessProfitInfoVO businessProfitInfoVO = BusinessProfitInfoVO.builder()
@@ -604,7 +669,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                         }
                     }
                     //固定成本
-                    businessProfitInfoVO.setFixedCost(BigDecimal.valueOf(between * Double.parseDouble(fixCostValue)));
+                    businessProfitInfoVO.setFixedCost(BigDecimal.valueOf((between+1) * Double.parseDouble(fixCostValue)));
                     if (Objects.nonNull(spainRatio)
                             && Objects.nonNull(businessProfitInfoVO.getCustomerRmbTotalPrice())) {
                         //西班牙提成
@@ -670,7 +735,6 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
                     .add(Optional.ofNullable(businessProfitInfoVO.getActualOrderRmbPrice()).orElse(BigDecimal.ZERO)));
             return businessProfitInfoVO;
         }).collect(Collectors.toList());
-        return businessProfitInfoVOs;
     }
     @Override
@@ -774,7 +838,11 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         createMergedRow(sheet, cellStyle, 46, 47, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice()).map(price -> "￥" + price).orElse("-"));
         createMergedRow(sheet, cellStyle, 46, 47, 7, 9, "");
         createMergedRow(sheet, cellStyle, 48, 49, 0, 4, "包装费用净利润率");
-        createMergedRow(sheet, cellStyle, 48, 49, 5, 6, Optional.ofNullable(businessProfitInfoVO.getPacketProfitRate()).map(rate -> rate.multiply(new BigDecimal(100)) + "%").orElse("-"));
+        createMergedRow(sheet, cellStyle, 48, 49, 5, 6,
+                Optional.ofNullable(businessProfitInfoVO.getPacketRmbTotalPrice())
+                        .map(totalPrice -> Optional.ofNullable(businessProfitInfoVO.getPacketProfitRmbPrice())
+                                .orElse(BigDecimal.valueOf(0))
+                                .divide(BigDecimal.valueOf(totalPrice), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)) + "%").orElse("-"));
         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("-"));
@@ -798,7 +866,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public void exportInnerProfitInfo(HttpServletResponse response, String projectNoPrefix) throws Exception {
-        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).projectNoLikeRight(projectNoPrefix).build());
+        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(1).productionDepartment(Collections.singletonList("内部")).projectNoLikeRight(projectNoPrefix).build());
         Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
         List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
         InnerProfitInfoVO ProfitInfoVO = profitInfoVOS.get(0);
@@ -886,7 +954,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
         // 第八部分：提成与净利润
         createMergedRow(sheet, cellStyle, 20, 21, 0, 3, "内部生产提成");
         createMergedRow(sheet, cellStyle, 20, 21, 4, 5, "￥" + Optional.ofNullable(vo.getInnerProductionCommission()).orElse(BigDecimal.ZERO));
-        createMergedRow(sheet, cellStyle, 20, 21, 6, 7, "净利润");
+        createMergedRow(sheet, cellStyle, 20, 21, 6, 7, "净利润率");
         createMergedRow(sheet, cellStyle, 20, 21, 8, 9, "");
         createMergedRow(sheet, cellStyle, 22, 23, 0, 3, "内部生产净利润");