From b785097622cf19b8b02f8027de32eec1b8c79f44 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 4 Nov 2022 17:25:58 +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-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsCollectManifestEOMapper.xml   |  2 +-
 .../impl/ParamsCollectManifestEOServiceImpl.java   | 14 ++++++++------
 .../impl/SarFileSplitMenuEOServiceImpl.java        |  5 ++++-
 .../impl/ParamsManifestTodoCenterServiceImpl.java  |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

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 f26174908..de267b0bb 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
@@ -86,7 +86,7 @@
 
     <select id="listInfoOfTodoCenter" resultMap="ParamsCollectManifestEOResultMap">
         select id,nio_number,state,sdt,dre,params_manifest_id from params_collect_manifest
-        where params_manifest_id in
+        where control_type != '11' and params_manifest_id in
             <foreach collection="manifestIdList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 24926b2ef..c77f3013a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2521,18 +2521,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						+ "2.All fields is filled in according to Validate Component and Component Value\n"
 						+ "3.If the control type is drop-down multi-selection, multiple entries are separated by English or Chinese exclamation points\n"
 						+ "4.Configuration data is filled in according to the sequence of control type, and if there are multiple control types, it needs to be separated by \"#\"\n"
-						+ "5.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
-						+ "6.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
-						+ "7.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
+						+ "5.When the control contains multiple component types, if you fill in only some of the information, you need to distinguish blank data with \"#\"\n"
+						+ "6.When filling in, start in column G and do not modify information such as NIO number and parameter name\n"
+						+ "7.File fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n"
+						+ "8.When importing into the system, you need to put the Excel into a folder, place other attachment files correctly as required, and finally compress the folder into zip format for import\n";
 			} else {
 				explanation = "填写说明\n"
 						+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是示例数据，需要从第四行开始填写\n"
 						+ "2.填写时需按照控件校验和控件备选值进行填写\n"
 						+ "3.控件类型为下拉多选时，填写多个时采用英文或中文感叹号分割\n"
 						+ "4.配置数据按照控件类型顺序进行填写，若存在多种控件类型填写时需要通过“#”隔开\n"
-						+ "5.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
-						+ "6.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
-						+ "7.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
+						+ "5.控件中包含多种组件类型时，若只填写其中部分信息需要用#区分空白数据\n"
+						+ "6.填写时从G列开始，请勿修改NIO编号和参数名称等信息\n"
+						+ "7.上传附件为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件且该文件夹下只能有一层级,假设在NIO.XXXX下放置了B.pdf,则应填写NIO.XXXX/B.pdf\n"
+						+ "8.导入系统时，需要将该Excel放入文件夹内，并按照要求正确放置其他附件文件，最后将文件夹压缩为zip格式进行导入\n";
 			}
 			XSSFRow row2 = sheetItems.createRow(1);
 			row2.setHeight((short) 2500);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index 0385006f7..81959ef91 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
 import com.jero.modules.split.page.SarFileSplitMenuEOPage;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +56,9 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         int count = dao.insertSelective(sarFileSplitMenuEO);
         // 新增对应条款
         Map<String, Object> parameter = new HashMap<>();
-        parameter.put("items_num", sarFileSplitMenuEO.getName());
+        if (StringUtils.isNotEmpty(sarFileSplitMenuEO.getName())) {
+            parameter.put("items_num", sarFileSplitMenuEO.getName());
+        }
         parameter.put("items_name", sarFileSplitMenuEO.getItemName());
         parameter.put("info_id", sarFileSplitMenuEO.getInfoId());
         parameter.put("menu_id", sarFileSplitMenuEO.getId());
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 196e0827b..24ad795fd 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
@@ -92,7 +92,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
                 if (count > 0) {
                     paramsManifestEO.setWaitFillNum(count);
                 }
-            } else { // 工程接口人和填写人  只能看到 工程接口人是自己 或 填写人是自己 的数量
+            } else { // 工程接口只能看到工程接口人是自己的；填写人只能看到填写人是自己 的数量
                 // 统计待分配数量 包括状态：待工程接口人处理,填写人退回
                 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
                         || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))