feat: 问题修复项

1、设计师权重导出 2、订单列表多选

feat: 问题修复项
1、设计师权重导出 2、订单列表多选
谢茂盛
1 parent 0f4ba695
Showing 5 changed files with 67 additions and 53 deletions
src/main/java/com/order/erp/domain/vo/OrderReportStatExportVo.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderCompletionReportServiceImpl.java
src/main/resources/application-local.yml
src/main/resources/application.yml
@@ -32,17 +32,17 @@ public class OrderReportStatExportVo implements Serializable {
      * 想法来源占比
      */
     @ExcelField(title = "想法来源占比", order = 2)
-    private Double ideaSourceRate;
+    private String ideaSourceRate;
     /**
      * 手工初型1占比
      */
     @ExcelField(title = "手工初型1占比", order = 3)
-    private Double manualPreform1Rate;
+    private String manualPreform1Rate;
     /**
      * 手工初型2占比
      */
     @ExcelField(title = "手工初型2占比", order = 4)
-    private Double manualPreform2Rate;
+    private String manualPreform2Rate;
 }
@@ -248,7 +248,11 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
         adminUserDo.setUserName(adminUserDo.getNickName());
         updateById(adminUserDo);
-
+        if (Objects.nonNull(adminUserVO.getRoleId())) {
+            Set<Long> roleIds = new HashSet<>();
+            roleIds.add(adminUserVO.getRoleId());
+            authRole(AdminAuthUserVO.builder().userId(adminUserDo.getId()).roleIds(roleIds).build());
+        }
         return ServerResult.success();
     }
@@ -18,6 +18,7 @@ import com.order.erp.domain.vo.OrderReportStatExportVo;
 import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
 import com.order.erp.domain.vo.order.OrderCompletionReportVO;
+import com.order.erp.domain.vo.order.OrderReportResultVO;
 import com.order.erp.mapper.order.OrderCompletionReportMapper;
 import com.order.erp.service.order.OrderBaseInfoService;
 import com.order.erp.service.order.OrderCompletionReportService;
@@ -89,7 +90,9 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
             List<OrderCompletionReportDO> reportDOS = list(new LambdaQueryWrapper<OrderCompletionReportDO>().in(OrderCompletionReportDO::getOrderId, orderIds));
             Map<String, OrderReportAnalysisExportVo> exportVoMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(reportDOS)) {
-                orderBaseInfoDOList = filterBaseData(orderBaseInfoDOList, reportDOS);
+                OrderReportResultVO reportResultVO = filterBaseData(orderBaseInfoDOList, reportDOS);
+                orderBaseInfoDOList = reportResultVO.getOrderBaseInfoDOList();
+                reportDOS = reportResultVO.getReportDOS();
                 Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
                 completionReportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
                 for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOList) {
@@ -101,9 +104,8 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
                     }
                 }
                 for (OrderCompletionReportDO reportDO : reportDOS) {
-                    handlerExportMap(0, reportDO, exportVoMap);
-                    handlerExportMap(1, reportDO, exportVoMap);
-                    handlerExportMap(2, reportDO, exportVoMap);
+                    handlerExportMap(reportDO, exportVoMap);
+
                 }
             }
             List<OrderReportAnalysisExportVo> exportVos = exportMap2exportList(exportVoMap);
@@ -111,9 +113,9 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
                 List<OrderReportStatExportVo> statExportVos = exportVos.stream().map(x -> {
                     OrderReportStatExportVo statExportVo = new OrderReportStatExportVo();
                     statExportVo.setDesigner(x.getDesigner());
-                    statExportVo.setIdeaSourceRate(x.getIdeaSourceRate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
-                    statExportVo.setManualPreform1Rate(x.getManualPreform1Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
-                    statExportVo.setManualPreform2Rate(x.getManualPreform2Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
+                    statExportVo.setIdeaSourceRate(x.getIdeaSourceRate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).toString());
+                    statExportVo.setManualPreform1Rate(x.getManualPreform1Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).toString());
+                    statExportVo.setManualPreform2Rate(x.getManualPreform2Rate().divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).toString());
                     return statExportVo;
                 }).collect(Collectors.toList());
                 ExcelUtils.getInstance().exportObjects2Excel(statExportVos, OrderReportStatExportVo.class, response.getOutputStream());
@@ -145,42 +147,40 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
      * @param reportDO
      * @param exportVoMap
      */
-    private void handlerExportMap(Integer type, OrderCompletionReportDO reportDO, Map<String, OrderReportAnalysisExportVo> exportVoMap) {
-
-        String key = null;
-        if (type == 0) {
-            key = reportDO.getIdeaSource();
+    private void handlerExportMap(OrderCompletionReportDO reportDO, Map<String, OrderReportAnalysisExportVo> exportVoMap) {
+        String ideaSource = reportDO.getIdeaSource();
+        String manualPreform1 = reportDO.getManualPreform1();
+        String manualPreform2 = reportDO.getManualPreform2();
+        OrderReportAnalysisExportVo ideaSource4exportVo = exportVoMap.get(ideaSource);
+        if (Objects.isNull(ideaSource4exportVo)) {
+            ideaSource4exportVo = new OrderReportAnalysisExportVo();
+            ideaSource4exportVo.setIdeaSourceRate(new BigDecimal(0));
+            ideaSource4exportVo.setManualPreform1Rate(new BigDecimal(0));
+            ideaSource4exportVo.setManualPreform2Rate(new BigDecimal(0));
         }
-        if (type == 1) {
-            key = reportDO.getManualPreform1();
-        }
-        if (type == 2) {
-            key = reportDO.getManualPreform2();
-        }
-        OrderReportAnalysisExportVo exportVo = exportVoMap.get(key);
-        if (Objects.isNull(exportVo)) {
-            exportVo = new OrderReportAnalysisExportVo();
-        }
-        if (Objects.isNull(exportVo.getIdeaSourceRate())) {
-            exportVo.setIdeaSourceRate(new BigDecimal(0));
-        }
-        if (Objects.isNull(exportVo.getManualPreform1Rate())) {
-            exportVo.setManualPreform1Rate(new BigDecimal(0));
-        }
-        if (Objects.isNull(exportVo.getManualPreform2Rate())) {
-            exportVo.setManualPreform2Rate(new BigDecimal(0));
-        }
-        if (key.equals(reportDO.getIdeaSource())) {
-            exportVo.setIdeaSourceRate(new BigDecimal(Objects.nonNull(reportDO.getIdeaSourceRate()) ? reportDO.getIdeaSourceRate() : 0).add(exportVo.getIdeaSourceRate()));
-        }
-        if (key.equals(reportDO.getManualPreform1())) {
-            exportVo.setManualPreform1Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform1Rate()) ? reportDO.getManualPreform1Rate() : 0).add(exportVo.getManualPreform1Rate()));
+        ideaSource4exportVo.setIdeaSourceRate(new BigDecimal(Objects.nonNull(reportDO.getIdeaSourceRate()) ? reportDO.getIdeaSourceRate() : 0).add(ideaSource4exportVo.getIdeaSourceRate()));
+        exportVoMap.put(ideaSource, ideaSource4exportVo);
+
+        OrderReportAnalysisExportVo manualPreform14exportVo = exportVoMap.get(manualPreform1);
+        if (Objects.isNull(manualPreform14exportVo)) {
+            manualPreform14exportVo = new OrderReportAnalysisExportVo();
+            manualPreform14exportVo.setIdeaSourceRate(new BigDecimal(0));
+            manualPreform14exportVo.setManualPreform1Rate(new BigDecimal(0));
+            manualPreform14exportVo.setManualPreform2Rate(new BigDecimal(0));
         }
-        if (key.equals(reportDO.getManualPreform2())) {
-            exportVo.setManualPreform2Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform2Rate()) ? reportDO.getManualPreform2Rate() : 0).add(exportVo.getManualPreform2Rate()));
+        manualPreform14exportVo.setManualPreform1Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform1Rate()) ? reportDO.getManualPreform1Rate() : 0).add(manualPreform14exportVo.getManualPreform1Rate()));
+        exportVoMap.put(manualPreform1, manualPreform14exportVo);
+
+        OrderReportAnalysisExportVo manualPreform24exportVo = exportVoMap.get(manualPreform2);
+        if (Objects.isNull(manualPreform24exportVo)) {
+            manualPreform24exportVo = new OrderReportAnalysisExportVo();
+            manualPreform24exportVo.setIdeaSourceRate(new BigDecimal(0));
+            manualPreform24exportVo.setManualPreform1Rate(new BigDecimal(0));
+            manualPreform24exportVo.setManualPreform2Rate(new BigDecimal(0));
         }
-        exportVoMap.put(key, exportVo);
+        manualPreform24exportVo.setManualPreform2Rate(new BigDecimal(Objects.nonNull(reportDO.getManualPreform2Rate()) ? reportDO.getManualPreform2Rate() : 0).add(manualPreform24exportVo.getManualPreform2Rate()));
+        exportVoMap.put(manualPreform2, manualPreform24exportVo);
     }
     @Override
@@ -197,7 +197,9 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
             BigDecimal sum = new BigDecimal(0);
             Map<Long, OrderCompletionReportDO> completionReportDOMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(reportDOS)) {
-                orderBaseInfoDOList = filterBaseData(orderBaseInfoDOList, reportDOS);
+                OrderReportResultVO reportResultVO = filterBaseData(orderBaseInfoDOList, reportDOS);
+                orderBaseInfoDOList = reportResultVO.getOrderBaseInfoDOList();
+                reportDOS = reportResultVO.getReportDOS();
                 completionReportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
                 for (OrderBaseInfoDO orderBaseInfoDO : orderBaseInfoDOList) {
                     if (completionReportDOMap.containsKey(orderBaseInfoDO.getId())) {
@@ -214,7 +216,7 @@ 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(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).doubleValue());
+            resultVo.setRate(Double.parseDouble(sum.divide(new BigDecimal(innerNoSet.size()), Constant.SIX, RoundingMode.HALF_UP).toString()));
         }
         return ServerResult.success(resultVo);
     }
@@ -224,17 +226,25 @@ public class OrderCompletionReportServiceImpl extends ServiceImpl&lt;OrderCompletio
      * @param reportDOS
      * @return
      */
-    private List<OrderBaseInfoDO> filterBaseData(List<OrderBaseInfoDO> orderBaseInfoDOList, List<OrderCompletionReportDO> reportDOS) {
-        List<OrderBaseInfoDO> result = new ArrayList<>();
+    private OrderReportResultVO filterBaseData(List<OrderBaseInfoDO> orderBaseInfoDOList, List<OrderCompletionReportDO> reportDOS) {
+        OrderReportResultVO result = new OrderReportResultVO();
+        List<OrderBaseInfoDO> result4orderBase = new ArrayList<>();
+        List<OrderCompletionReportDO> result4report = new ArrayList<>();
         if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
             return result;
         }
-        Map<Long, OrderBaseInfoDO> map = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
-        for (OrderCompletionReportDO reportDO : reportDOS) {
-            if (map.containsKey(reportDO.getOrderId())) {
-                result.add(map.get(reportDO.getOrderId()));
+        Map<String, Long> innerOrderIdMap = new HashMap<>();
+        Map<Long, OrderCompletionReportDO> reportDOMap = reportDOS.stream().collect(Collectors.toMap(OrderCompletionReportDO::getOrderId, Function.identity(), (x, y) -> x));
+        for (OrderBaseInfoDO infoDO : orderBaseInfoDOList) {
+            if (reportDOMap.containsKey(infoDO.getId())) {
+                innerOrderIdMap.put(infoDO.getInnerNo(), infoDO.getId());
             }
         }
+        List<Long> orderIds = new ArrayList<>(innerOrderIdMap.values());
+        result4orderBase = orderBaseInfoDOList.stream().filter(x -> orderIds.contains(x.getId())).collect(Collectors.toList());
+        result4report = reportDOS.stream().filter(x -> orderIds.contains(x.getOrderId())).collect(Collectors.toList());
+        result.setOrderBaseInfoDOList(result4orderBase);
+        result.setReportDOS(result4report);
         return result;
     }
@@ -59,7 +59,7 @@ spring:
     testOnReturn: true
     password: 123456
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://39.108.227.113:3307/order-erp?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
+    url: jdbc:mysql://39.108.227.113:3307/order-erp1?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
   redis:
     database: 0
@@ -3,4 +3,4 @@ server:
 spring:
   profiles:
-    active: local
 \ No newline at end of file
+    active: prod
 \ No newline at end of file