From f5933dd36d692c43a569ccbfeb1e78cbb8676c78 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 20 Oct 2022 11:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0-=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql |  7 ++
 .../mapper/ParamsCollectManifestEOMapper.java |  2 +
 .../xml/ParamsCollectManifestEOMapper.xml     |  4 +
 .../ParamsManifestTodoCenterServiceImpl.java  | 88 +++++++++++++------
 4 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 351bc7440..330771cdf 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -1219,6 +1219,13 @@ CREATE TABLE `laws_weilai`.`process_info_detail`  (
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '流程信息明细表' ROW_FORMAT = Dynamic;
 
+-- 参数项收集清单 添加索引 2022-10-14 未同步生产环境
+ALTER TABLE `laws_weilai`.`params_collect_manifest`
+    ADD INDEX `index_pcm_nio_number`(`nio_number`) USING BTREE,
+    ADD INDEX `index_pcm_state`(`state`) USING BTREE,
+    ADD INDEX `index_pcm_sdt_dre`(`sdt`, `dre`) USING BTREE,
+    ADD INDEX `index_pcm_manifest_id`(`params_manifest_id`) USING BTREE;
+
 -- 待办中心 流程信息明细表 增加字段 2022-10-18 未同步生产环境
 ALTER TABLE `laws_weilai`.`process_info_detail`
     ADD COLUMN `end_time` datetime NULL COMMENT '截止时间' AFTER `flow_type`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
index 1166ad6d3..76eedb79c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
@@ -18,6 +18,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper<ParamsCollectM
 
     List<ParamsCollectManifestEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
+    List<ParamsCollectManifestEO> listInfoOfTodoCenter();
+
     List<Map<String, Object>> listInfoForExport(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
 
     // 查询控件类型为 标题的 参数项
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index 9a10df792..026244f6a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -80,6 +80,10 @@
         order by del_flag desc, add_flag desc, change_flag desc, nio_number asc
     </select>
 
+    <select id="listInfoOfTodoCenter" resultMap="ParamsCollectManifestEOResultMap">
+        select id,nio_number,state,sdt,dre,params_manifest_id from params_collect_manifest
+    </select>
+
     <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
         select *
         from params_collect_manifest
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
index 465a2c0da..680615106 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
@@ -1,6 +1,7 @@
 package com.jero.modules.todoCenter.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,33 +66,48 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
         List<ParamsManifestTodoCenterEO> paramsManifestEOList = new ArrayList<>();
         List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
         Map<String, Boolean> manifestUserTypeOfHomo = new HashMap<>();
+        Map<String, Boolean> manifestUserTypeOfSdt = new HashMap<>();
+        Map<String, Boolean> manifestUserTypeOfDre = new HashMap<>();
+        Map<String, List<ParamsCollectManifestEO>> paramsManifestEOListMap = new HashMap<>();
+
+        // 查询清单的所有参数项
+        List<ParamsCollectManifestEO> pcmListAll = paramsCollectManifestEOMapper.listInfoOfTodoCenter();
 
         String userType = "";
         for(ParamsManifestTodoCenterEO paramsManifestEO : paramsManifestEOListAll) {
+            // 查询清单的所有参数项
+            List<ParamsCollectManifestEO> pcmList = pcmListAll.stream().filter(e->paramsManifestEO.getId().equals(e.getParamsManifestId())).collect(Collectors.toList());
+            int count1 = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.SUBMIT.getValue().equals(e.getState())
+                    || CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count();
+            if (count1 == pcmList.size()) {
+                continue;
+            }
+
             // 判断是不是homo角色
             projectLibraryBaseList = projectLibraryBaseListAll.stream().filter(e->paramsManifestEO.getProjectId().equals(e.getId())).collect(Collectors.toList());
             userType = getLoginUserTypeOfHomo(projectLibraryBaseList, loginUser);
             if(StringUtils.isNotBlank(userType)) {
                 paramsManifestEOList.add(paramsManifestEO);
                 manifestUserTypeOfHomo.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
                 continue;
-            } else {
-                manifestUserTypeOfHomo.put(paramsManifestEO.getId(), false);
             }
-            // 查询清单的所有参数项
-            ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
-            paramsCollectManifestEO.setParamsManifestId(paramsManifestEO.getId());
-            List<ParamsCollectManifestEO> pcmList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+
             // 判断是不是sdt角色
             userType = getLoginUserTypeOfSdt(pcmList, loginUser);
             if(StringUtils.isNotBlank(userType)) {
                 paramsManifestEOList.add(paramsManifestEO);
+                manifestUserTypeOfSdt.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
                 continue;
             }
+
             // 判断是不是dre角色
             userType = getLoginUserTypeOfDre(pcmList, loginUser);
             if(StringUtils.isNotBlank(userType)) {
                 paramsManifestEOList.add(paramsManifestEO);
+                manifestUserTypeOfDre.put(paramsManifestEO.getId(), true);
+                paramsManifestEOListMap.put(paramsManifestEO.getId(), pcmList);
                 continue;
             }
         }
@@ -119,45 +135,67 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
         }
 
         // 统计清单中的待办参数数据
-        List<ParamsManifestTodoCenterEO> records = getStatistics(result, manifestUserTypeOfHomo, loginUser);
+        List<ParamsManifestTodoCenterEO> records = getStatistics(result, manifestUserTypeOfHomo, manifestUserTypeOfSdt, manifestUserTypeOfDre, paramsManifestEOListMap,loginUser);
         page.setRecords(records);
         return page;
     }
 
 
-    public List<ParamsManifestTodoCenterEO> getStatistics(List<ParamsManifestTodoCenterEO> paramsManifestEOList, Map<String, Boolean> manifestUserTypeOfHomo, LoginUser loginUser) {
+    public List<ParamsManifestTodoCenterEO> getStatistics(List<ParamsManifestTodoCenterEO> paramsManifestEOList, Map<String, Boolean> manifestUserTypeOfHomo
+            ,Map<String, Boolean> manifestUserTypeOfSdt, Map<String, Boolean> manifestUserTypeOfDre, Map<String, List<ParamsCollectManifestEO>> paramsManifestEOListMap, LoginUser loginUser) {
         List<ParamsManifestTodoCenterEO> paramsManifestTodoCenterEOList = new ArrayList<>();
 
         for(ParamsManifestTodoCenterEO paramsManifestTodoCenterEO : paramsManifestEOList) {
             // 查询清单的所有参数项
             ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
             paramsCollectManifestEO.setParamsManifestId(paramsManifestTodoCenterEO.getId());
-            List<ParamsCollectManifestEO> pcmList = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
+            List<ParamsCollectManifestEO> pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId());
             int count = 0;
-            // 统计待发起数量 包括状态：待发起收集,变更,工程接口人退回
-            if (manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId())) {
+
+            if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待发起数量 包括状态：待发起收集,变更,工程接口人退回
                 count = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
                         || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState())
                         || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
                 if (count > 0) {
                     paramsManifestTodoCenterEO.setWaitCollectNum(count);
                 }
-            }
+                // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitSdtNum(count);
+                }
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
+            } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))
+                        && loginUser.getUsername().equals(e.getSdt())).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitSdtNum(count);
+                }
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
 
-            // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
-            count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
-                    || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))
-                    && loginUser.getUsername().equals(e.getSdt())).count();
-            if (count > 0) {
-                paramsManifestTodoCenterEO.setWaitSdtNum(count);
-            }
+            } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId())) {
+                // 统计待填写数量 包括状态：待填写,认证工程师退回
+                count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
+                        || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))
+                        && loginUser.getUsername().equals(e.getDre())).count();
+                if (count > 0) {
+                    paramsManifestTodoCenterEO.setWaitFillNum(count);
+                }
 
-            // 统计待填写数量 包括状态：待填写,认证工程师退回
-            count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
-                    || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))
-                    && loginUser.getUsername().equals(e.getDre())).count();
-            if (count > 0) {
-                paramsManifestTodoCenterEO.setWaitFillNum(count);
             }
 
             paramsManifestTodoCenterEOList.add(paramsManifestTodoCenterEO);