feat: 问题修复项

1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重

feat: 问题修复项
1、内部编号处理 '-' 通过接口刷数据处理 2、计算利润率支持全选(根据页面查询条件) 3、计算设计师权重分母对内部编码去重
谢茂盛
1 parent 1446ab89
Showing 9 changed files with 150 additions and 8 deletions
src/main/java/com/order/erp/controller/DataController.java
src/main/java/com/order/erp/controller/OrderProfitController.java
src/main/java/com/order/erp/domain/vo/OrderProfitAnalysisVo.java
src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
src/test/java/BaseTest.java
src/test/java/DateTimeUtilTest.java
+package com.order.erp.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+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.order.OrderBaseInfoDO;
+import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
+import com.order.erp.service.order.OrderBaseInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author zhongnanhuang
+ * @version 1.0
+ * @project order-erp
+ * @description 订单利润表控制层
+ * @date 2023/10/23 11:48:36
+ */
+@RestController
+@RequestMapping("/order/erp/data")
+public class DataController {
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @PostMapping("/do_inner_no")
+    public ServerResult doInnerNo(@RequestBody @Validated OrderBaseInfoQueryVO queryVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN));
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return ServerResult.success();
+        }
+        orderBaseInfoDOList.forEach(x -> {
+            if (StringUtils.isNotBlank(x.getInnerNo())) {
+                x.setInnerNo(x.getInnerNo().split("-")[Constant.ZERO]);
+            }
+        });
+        orderBaseInfoService.updateBatchById(orderBaseInfoDOList);
+        return ServerResult.success();
+    }
+
+}
@@ -29,7 +29,7 @@ public class OrderProfitController {
     @PostMapping("/analysis")
     public ServerResult<OrderProfitAnalysisVO> analysis(@RequestBody @Validated OrderProfitAnalysisVo orderProfitAnalysisVo) {
-        return orderProfitAnalysisService.analysisByOrderIds(orderProfitAnalysisVo);
+        return orderProfitAnalysisService.analysis(orderProfitAnalysisVo);
     }
     @PostMapping("/calculate")
 package com.order.erp.domain.vo;
+import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -35,4 +36,9 @@ public class OrderProfitAnalysisVo implements Serializable {
      */
     @NotNull(message = "请选择当天汇率进行计算")
     private String exchangeRate;
+
+    /**
+     * 页面查询条件
+     */
+    private OrderBaseInfoQueryVO queryVO;
 }
@@ -64,6 +64,10 @@ public interface OrderProfitAnalysisService extends IService&lt;OrderProfitAnalysis
     ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo orderProfitAnalysisVo);
+    ServerResult<OrderProfitAnalysisVO> analysis(OrderProfitAnalysisVo orderProfitAnalysisVo);
+
+    ServerResult<OrderProfitAnalysisVO> analysisByQueryVO(OrderProfitAnalysisVo orderProfitAnalysisVo);
+
     ServerResult calculate(ProfitCalculateVO calculateVO);
     long countByOrderStatus(Integer status);
@@ -1350,12 +1350,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
 //            }
 //        }
-        if (queryVO.getFieldVO() != null && queryVO.getFieldVO().getOrderIds() != null) {
-            Set<Long> collect = new HashSet<>(queryVO.getFieldVO().getOrderIds());
-            if (collect.size() > 0) {
-                queryVO.setOrderIds(collect);
-            }
-        }
+//        if (queryVO.getFieldVO() != null && queryVO.getFieldVO().getOrderIds() != null) {
+//            Set<Long> collect = new HashSet<>(queryVO.getFieldVO().getOrderIds());
+//            if (collect.size() > 0) {
+//                queryVO.setOrderIds(collect);
+//            }
+//        }
         return new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -89,7 +89,8 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
                     sum = sum.add(new BigDecimal(ideaSourceRate)).add(new BigDecimal(manualPreform1Rate)).add(new BigDecimal(manualPreform2Rate));
                 }
             }
-            resultVo.setRate(sum.divide(new BigDecimal(orderBaseInfoDOList.size())).doubleValue());
+            Set<String> innerNoSet = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).collect(Collectors.toSet());
+            resultVo.setRate(sum.divide(new BigDecimal(innerNoSet.size())).doubleValue());
         }
         return ServerResult.success(resultVo);
     }
@@ -12,20 +12,24 @@ import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ProfitUtils;
 import com.order.erp.common.utils.StringUtils;
 import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
 import com.order.erp.domain.vo.OrderProfitAnalysisVo;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
 import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
 import com.order.erp.domain.vo.order.ProfitCalculateVO;
 import com.order.erp.mapper.order.OrderProfitAnalysisMapper;
+import com.order.erp.service.order.OrderBaseInfoService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 /**
  * 订单利润分析表(OrderProfitAnalysis)表服务实现类
@@ -37,6 +41,9 @@ import java.util.Objects;
 @Service
 public class OrderProfitAnalysisServiceImpl extends ServiceImpl<OrderProfitAnalysisMapper, OrderProfitAnalysisDO> implements OrderProfitAnalysisService {
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -158,6 +165,32 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
     }
     @Override
+    public ServerResult<OrderProfitAnalysisVO> analysisByQueryVO(OrderProfitAnalysisVo profitAnalysisVo) {
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = orderBaseInfoService.buildQueryByParam(profitAnalysisVo.getQueryVO());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("页面未查询到数据，请重置刷新页面后操作");
+        }
+        //查询订单id的利润分析数据
+        List<OrderProfitAnalysisDO> orderProfits = list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet())));
+
+        if (CollectionUtils.isEmpty(orderProfits)) {
+            throw new BusinessException("选中的订单信息不存在");
+        }
+        return wrapperProfitResult(profitAnalysisVo, orderProfits);
+    }
+
+    @Override
+    public ServerResult<OrderProfitAnalysisVO> analysis(OrderProfitAnalysisVo orderProfitAnalysisVo) {
+        if (CollectionUtils.isNotEmpty(orderProfitAnalysisVo.getOrderIds())) {
+            return analysisByOrderIds(orderProfitAnalysisVo);
+        }
+        return analysisByQueryVO(orderProfitAnalysisVo);
+    }
+
+    @Override
     public ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo profitAnalysisVo) {
         //查询订单id的利润分析数据
         List<OrderProfitAnalysisDO> orderProfits = list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
@@ -168,6 +201,15 @@ public class OrderProfitAnalysisServiceImpl extends ServiceImpl&lt;OrderProfitAnaly
             throw new BusinessException("选中的订单信息不存在");
         }
+        return wrapperProfitResult(profitAnalysisVo, orderProfits);
+    }
+
+    /**
+     * @param profitAnalysisVo
+     * @param orderProfits
+     * @return
+     */
+    private ServerResult<OrderProfitAnalysisVO> wrapperProfitResult(OrderProfitAnalysisVo profitAnalysisVo, List<OrderProfitAnalysisDO> orderProfits) {
         BigDecimal packetTotalPrice = new BigDecimal(Constant.ZERO_STRING);
         BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO_STRING);
         BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO_STRING);
+import com.order.erp.AdminApplication;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ *
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = AdminApplication.class)
+//主动回滚测试产生的数据
+@Transactional
+public class BaseTest {
+
+
+}
+import com.order.erp.common.constant.Constant;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.junit.Test;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/2/10 14:09
+ * @version: 1.0
+ */
+public class DateTimeUtilTest {
+
+    @Test
+    public void test() {
+       String customerCode = "A05/C23063-1";
+       String customerCode1 = "A05/C23064";
+        System.out.println(customerCode.split("-")[Constant.ZERO]);
+        System.out.println(customerCode1.split("-")[Constant.ZERO]);
+    }
+}