diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 44aae6736..61c6272b7 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -384,4 +384,37 @@ ALTER TABLE `laws_technology_evaluation_result`
 -- 用户表 删除索引 2022-07-14 已同步
 ALTER TABLE `laws_weilai`.`sys_user`
 DROP INDEX `uniq_sys_user_phone`,
-DROP INDEX `uniq_sys_user_email`;
\ No newline at end of file
+DROP INDEX `uniq_sys_user_email`;
+
+-- 参数项清单 修改字段长度 2022-07-17
+ALTER TABLE `laws_weilai`.`params_info`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`cert_category_params_info`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
+
+ALTER TABLE `laws_weilai`.`params_info_publish`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`cert_category_params_info_publish`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_batch`;
+
+ALTER TABLE `laws_weilai`.`params_report_detail`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `duty_territory`;
+
+ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
+    MODIFY COLUMN `params_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`,
+    MODIFY COLUMN `description` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数说明' AFTER `params_name`;
\ No newline at end of file
diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
index e762a0d48..3aedad2d8 100644
--- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
+++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql
@@ -45,3 +45,11 @@ ALTER TABLE `laws_weilai`.`sys_announcement`
 INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` )
 VALUES
 ( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'domianPreviewURL' );
+
+-- 消息表添加发起人字段   已同步正式环境
+ALTER TABLE `sys_announcement`
+ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`;
+
+-- 2022-07-05 修改字段类型  生产环境已同步
+ALTER TABLE `project_laws_inventory_log`
+MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`;
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index dd1eb2bc7..b6a2c2aa7 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -17,10 +17,11 @@ public enum MessageTypeEnum {
     REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
     DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
     PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
-    VALIDATION_TASK("Validation Task", "11"), // 验证符合性任务
+    VALIDATION_TASK("Validation Compliance Task", "11"), // 验证符合性任务
     DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
     PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
     VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
+    SYSTEMATIC_NOTIFICATION("Systematic Notification", "15"), // 系统通知
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java
index 1972b7b25..b617876d6 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java
@@ -380,7 +380,7 @@ public class JeroElasticsearchTemplate {
 
         log.info("url:" + url + " ,search: " + queryObject.toJSONString());
         JSONObject res = RestUtil.post(url, queryObject);
-        log.info("url:" + url + " ,return res: \n" + res.toJSONString());
+//        log.info("url:" + url + " ,return res: \n" + res.toJSONString());
         return res;
     }
     /**
@@ -393,7 +393,7 @@ public class JeroElasticsearchTemplate {
 
         log.info("url:" + url + " ,search: " + queryObject.toJSONString());
         JSONObject res = RestUtil.post(url,variables, queryObject);
-        log.info("url:" + url + " ,return res: \n" + res.toJSONString());
+//        log.info("url:" + url + " ,return res: \n" + res.toJSONString());
         return res;
     }
 
@@ -447,6 +447,27 @@ public class JeroElasticsearchTemplate {
         return json;
     }
 
+    /**
+     * 无排序
+     * @param _source
+     * @param query
+     * @param highlight
+     * @param from
+     * @param size
+     * @return
+     */
+    public JSONObject buildQuery(List<String> _source, JSONObject query,Map<String, Object> highlight, int from, int size) {
+        JSONObject json = new JSONObject();
+        if (_source != null) {
+            json.put("_source", _source);
+        }
+        json.put("highlight", highlight);
+        json.put("query", query);
+        json.put("from", from * size);
+        json.put("size", size);
+        return json;
+    }
+
     /**
      * @return { "bool" : { "must": must, "must_not": mustNot, "should": should } }
      */
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index 67cffe1bd..eca22b3fb 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -1172,7 +1172,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 参数名称
 			String paramsName = dto.getParamsName();
-			resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(), "30", false, cut);
+			resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(), "100", false, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
@@ -1211,7 +1211,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 参数说明
 			String description = dto.getDescription();
-			resultMap = validateMustAndLength(description,"参数说明", "Description", IsMustEnum.NO.getValue(),"1000",false,cut);
+			resultMap = validateMustAndLength(description,"参数说明", "Description", IsMustEnum.NO.getValue(),"2000",false,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
@@ -1432,12 +1432,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				}
 				// 参数名称
 				String paramsName = ccDto.getParamsName();
-				resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(),"30", false, cut);
+				resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(),"100", false, cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 				// 参数说明
 				String description = ccDto.getDescription();
-				resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"1000", false, cut);
+				resultMap = validateMustAndLength(description, "参数说明", "Description", IsMustEnum.NO.getValue(),"2000", false, cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
index 779be4cd2..4da6a9046 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
@@ -153,4 +153,8 @@ public class SysAnnouncement implements Serializable {
      * 文档id
      */
     private java.lang.String documentId;
+    /**
+     * 发起人
+     */
+    private java.lang.String initiator;
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
index 1efdc73a6..1589ef460 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementMapper.xml
@@ -27,6 +27,7 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="document_id" property="documentId" jdbcType="VARCHAR"/>
+		<result column="initiator" property="initiator" jdbcType="VARCHAR"/>
 	</resultMap>
 
 
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 790aa0b61..eeaf3e484 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -17,6 +17,7 @@
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
 		<result column="document_id" property="documentId" jdbcType="VARCHAR"/>
+		<result column="initiator" property="initiator" jdbcType="VARCHAR"/>
 	</resultMap>
 
 	<select id="queryByUserId" parameterType="String"  resultType="String">
@@ -41,7 +42,8 @@
 			sa.open_type as open_type,
 			sa.open_page as open_page,
 			sa.msg_abstract,
-			sa.document_id as document_id
+			sa.document_id as document_id,
+		    sa.initiator as initiator
 	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.del_flag = '0'
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
index 6e252d172..c06ddda74 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
@@ -82,5 +82,9 @@ public class AnnouncementSendModel implements Serializable {
 	 * 文档id
 	 */
 	private java.lang.String documentId;
+	/**
+	 * 发起人
+	 */
+	private java.lang.String initiator;
 
 }
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
index b16e49cfb..d207015c4 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
@@ -159,6 +159,13 @@ public class SyncDataServiceImpl implements ISyncDataService{
         //people获取用户信息Map
         Map<String, PPEmployee> PPEmployeeMap=new HashMap<String,PPEmployee>();
 
+        //此处获取全部pp用户信息
+        List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
+//            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
+        for(SysUser user:sysUserList){
+            localUserMap.put(user.getThirdId(),user);
+        }
+
         String path = "/people/v1/employee/all-info";
         String queryStr = "app_id=" + appId + "&hash_type=sha256&offset=0&limit=100";
         String response = getResultDataOfGet(path, queryStr);
@@ -197,12 +204,6 @@ public class SyncDataServiceImpl implements ISyncDataService{
 //            ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed());
             ppEmployeeList = ppEmployeeList.stream().distinct().collect(Collectors.toList()); // 去重
 
-            //此处获取全部pp用户信息
-            List<SysUser> sysUserList = sysUserService.getPPEmployeeList();
-//            log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList));
-            for(SysUser user:sysUserList){
-                localUserMap.put(user.getThirdId(),user);
-            }
 //            log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap));
             log.info("开始更新数据库信息");
             for(PPEmployee ppEmployee:ppEmployeeList){
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index e948eb81b..a56b95bbc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -42,6 +42,7 @@ import com.jero.modules.domain.entity.DomainUserRel;
 import com.jero.modules.domain.service.DomainUserRelService;
 import com.jero.modules.domain.service.impl.DomainManageServiceImpl;
 import com.jero.modules.feishu.service.IFeishuService;
+import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.home.entity.HomeDocumentDynamicEO;
 import com.jero.modules.home.service.IHomeDocumentDynamicEOService;
 import com.jero.modules.log.entity.BussLogEO;
@@ -127,6 +128,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 
@@ -309,7 +311,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String contentInfo =content;
             String title = content;
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.READ.getValue());
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo);
         }
@@ -1000,7 +1002,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             // 取不到数据，直接返回空结果
             return result;
         }
-
         //查询所有
         List<Map<String, Object>> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null);
 
@@ -1058,6 +1059,29 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             Map<String, Object> mapTemp = new HashMap<>();
             List<Map<String, Object>> resultTemp = new ArrayList<>();
             List<OnlCgformField> fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList());
+            if(CutEnum.CN.getValue().equals(cut)){
+                fieldListTemp.removeIf(new Predicate<OnlCgformField>() {
+                    @Override
+                    public boolean test(OnlCgformField onlCgformField) {
+                        return onlCgformField.getDbFieldName().equals("title_en");//
+                    }
+                });
+                List<OnlCgformField> collect = fieldListTemp.stream().filter(e -> "title".equals(e.getDbFieldName())).collect(Collectors.toList());
+                if(collect.size() != 0){
+                    collect.get(0).setDbFieldTxt("标题");
+                }
+            }else{
+                fieldListTemp.removeIf(new Predicate<OnlCgformField>() {
+                    @Override
+                    public boolean test(OnlCgformField onlCgformField) {
+                        return onlCgformField.getDbFieldName().equals("title");//
+                    }
+                });
+                List<OnlCgformField> collect = fieldListTemp.stream().filter(e -> "title_en".equals(e.getDbFieldName())).collect(Collectors.toList());
+                if(collect.size() != 0){
+                    collect.get(0).setDbFieldEnName("Title");
+                }
+            }
             for (OnlCgformField onlCgformField : fieldListTemp) {
                 //字段
                 String dbFieldName = onlCgformField.getDbFieldName();
@@ -1570,13 +1594,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //String serialNumber = StringUtils.valueOf(map.get("serial_number"));
             //编码验重
-            List<BussDocumentLibraryEO> list = this.list();
-            if(list.size() != 0){
-                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
-                if(serialNumberList.contains(serialNumber)){
-                    throw new JeroBootException("编号已存在不能重复添加");
-                }
-            }
+//            List<BussDocumentLibraryEO> list = this.list();
+//            if(list.size() != 0){
+//                List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
+//                if(serialNumberList.contains(serialNumber)){
+//                    throw new JeroBootException("编号已存在不能重复添加");
+//                }
+//            }
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             String issueTime = (String) (map.get("issue_time"));
@@ -2143,7 +2167,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     + href +" has been updated.";
             String msgTitle = "The " + technologyTerritoryName + " technical field you subscribed to has been updated";
             //封装消息的实体类
-            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+            SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
             sendWebsocket(idTemp, contentInfo);
             //飞书
@@ -3143,9 +3167,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 sbStr = sbStr.replaceAll("<text class='highlight-class'>", "").replaceAll("</text>", "");
                 //您订阅的XXX已被修改
                 String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = "The" + technologyTerritoryNameEn + "technical field you subscribed to has been updated";
+                String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated";
                 // 封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue());
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userList, msgTitle, contentInfoFei, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3165,9 +3189,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //您订阅的XXX已被修改
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = serialNumber + "you subsribed to has been updated";
+                String msgTitle = serialNumber + " you subsribed to has been updated";
                 //封装消息的实体类
-                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                 sendWebsocket((String) map.get("id"), contentInfo);
             }
@@ -3248,7 +3272,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String contentInfo = "New numbering implemented, please note update status of alternate numbering " + sbStr;
         String msgTitle = contentInfo;
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo);
         //飞书
@@ -3271,8 +3295,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
     @NotNull
-    public SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo,String messageType) {
+    public SysAnnouncement getSysAnnouncement(List<String> userIdList,
+                                              String title,
+                                              String content,
+                                              String contentInfo,
+                                              String messageType,
+                                              String initiator) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
+        sysAnnouncement.setInitiator(initiator);
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());
@@ -4684,10 +4714,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
      */
     @Override
     public String pullMessage(String departIds, String userIds, String documentIds) {
-//        departIds = "c6d7cb4deeac411cb3384b1b31278596";
-//        if(StringUtils.isBlank(documentIds)){
-//            return "请选择文档";
-//        }
         Set<String> allDepartIds = new HashSet<>();
         //查询当前部门下所有部门
         if (StringUtils.isNotEmpty(departIds)) {
@@ -4746,9 +4772,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
         String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
-        String title = StringUtils.join(serialNumberList, ",") +  "has been pushed to you, please check";
+        String title = StringUtils.join(serialNumberList, ",") +  " has been pushed to you, please check";
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue());
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书
@@ -4763,6 +4789,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     }
                 });
                 String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out.";
+//                FeishuMsgVo feishuMsgVo = getFeishuMsgVo(MessageTypeEnum.PUSH.getName(),null, contentTemp, encode);
+//                iFeishuService.sendCardMsg(thirdIdList.toArray(new String[]{}), feishuMsgVo);
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
             }
         } catch (IOException e) {
@@ -4772,6 +4800,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         return "推送成功";
     }
 
+    private FeishuMsgVo getFeishuMsgVo(String title, String taskType, String content,String url) {
+        FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+        feishuMsgVo.setTitle(title);
+        feishuMsgVo.setContent(content);
+        feishuMsgVo.setTaskType(taskType);
+        feishuMsgVo.setUrl(url);
+        return feishuMsgVo;
+    }
+
 
     /**
      * 属性字典处理中文
@@ -5439,6 +5476,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             FileUnZip.deleteDir(saveDirectory);
             throw new JeroBootException(html);
         } else {
+            //验证重复的标准号
+            List<String> serialNumberList = new ArrayList<>();
+            if (mapList.size() != 0) {
+                for (Map<String, Object> map : mapList) {
+                    serialNumberList.add(StringUtils.valueOf(map.get("serial_number")));
+                }
+            }
+            List<BussDocumentLibraryEO> list = this.list();
+            if(list.size() != 0){
+                List<BussDocumentLibraryEO> serialNumberListTemp = list.stream()
+                        .filter(e -> serialNumberList.contains(e.getSerialNumber())).collect(Collectors.toList());
+                if(serialNumberListTemp.size() != 0){
+                    List<String> collect = serialNumberListTemp.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        throw new JeroBootException(StringUtils.join(collect,",")+" 编号已存在不能重复添加");
+                    }else{
+                        throw new JeroBootException(StringUtils.join(collect,",")+" already exists and cannot be added again");
+                    }
+                }
+            }
+
             if (mapList.size() != 0) {
                 for (Map<String, Object> map : mapList) {
                     this.addInfo(map);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index e1b5c0850..32e772497 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -1150,7 +1150,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
                     msgTitle = "The " + baseName + " virtual list you subscribed to has been updated";
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
@@ -1164,7 +1164,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
                     msgTitle = "The " + baseName + " virtual list you subscribed to has been withdrawn";
                     //封装消息的实体类
-                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue());
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
                     bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                     //飞书
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java
index f1b0965d2..fb65e58dc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java
@@ -11,7 +11,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -80,11 +82,11 @@ public class NcrTrackController {
      *  @param request
      * @param ncrTrackVO
      */
-    @RequestMapping(value = "/exportData")
+    @RequestMapping(value = "/exportData",method = RequestMethod.POST)
     @RequiresPermissions("ncrTrack:exportData")
     public void exportData(HttpServletResponse response,
                            HttpServletRequest request,
-                           NcrTrackVO ncrTrackVO) {
+                           @RequestBody NcrTrackVO ncrTrackVO) {
         iNcrTrackService.exportData(response,request, ncrTrackVO);
     }
 
@@ -93,11 +95,11 @@ public class NcrTrackController {
      *  @param request
      * @param ncrTrackVO
      */
-    @RequestMapping(value = "/exportDataInfo")
+    @RequestMapping(value = "/exportDataInfo",method = RequestMethod.POST)
     @RequiresPermissions("ncrTrack:exportDataInfo")
     public void exportDataInfo(HttpServletResponse response,
-                           HttpServletRequest request,
-                           NcrTrackVO ncrTrackVO) {
+                               HttpServletRequest request,
+                               @RequestBody NcrTrackVO ncrTrackVO) {
         iNcrTrackService.exportData(response,request, ncrTrackVO);
     }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
index 7adee9350..3be535686 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java
@@ -8,6 +8,8 @@ public enum MsgTypeEnum {
     TASK_AFFIRM_ISSUE_DRE_MSG("任务确认分配dre消息","taskAffirmIssueDreMsg"),
     TASK_AFFIRM_DRE_ACCEPTED("任务确认DRE通过消息","taskAffirmDreAccepted"),
     TASK_AFFIRM_DRE_REJECTED("任务确认DRE退回消息","taskAffirmDreRejected"),
+    TASK_AFFIRM_ACCEPTED_MSG("任务确认责任人通过消息","taskAffirmAcceptedMsg"),
+    TASK_AFFIRM_REJECTED_MSG("任务确认责任人拒绝消息","taskAffirmRejectedMsg"),
 
     DESIGN_ISSUE_DRE_MSG("设计符合性确认分配dre消息","designIssueDreMsg"),
     DESIGN_REMIND_MSG("设计符合性提醒办理","designRemindMsg"),
@@ -19,6 +21,15 @@ public enum MsgTypeEnum {
     DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"),
     PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"),
     VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"),
+    DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
+    PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
+    VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
+    DESIGN_CHARGE_PERSON_SUBMIT_MSG("设计符合性责任人提交给发起人发送消息","designChargePersonSubmitMsg"),
+    PREHOMO_CHARGE_PERSON_SUBMIT_MSG("prehomo责任人提交给发起人发送消息","prehomoChargePersonSubmitMsg"),
+    VERIFY_CHARGE_PERSON_SUBMIT_MSG("验证符合性责任人提交给发起人发送消息","verifyChargePersonSubmitMsg"),
+    DESIGN_INITIATOR_ACCEPTED_MSG("设计符合性发起人通过发送消息","designInitiatorAcceptedMsg"),
+    PREHOMO_INITIATOR_ACCEPTED_MSG("prehomo发起人通过发送消息","prehomoInitiatorAcceptedMsg"),
+    VERIFY_INITIATOR_ACCEPTED_MSG("验证符合性发起人通过发送消息","verifyInitiatorAcceptedMsg"),
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
index 5df8aa915..cde692da6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
@@ -170,7 +170,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("contentInfo",contentInfo);
 
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, threeDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     }
 
                     if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -208,7 +208,7 @@ public class InventoryAffirmJob implements Job {
                         sendMessageMap.put("hrefFeishu",hrefFeishu);
                         sendMessageMap.put("contentInfo",contentInfo);
                         //发送消息
-                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+                        projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN, currentDaysUserIdList, projectLibraryBase.getId(), sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                     }
                 }
             }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
index cfb3a6397..b48b7cb28 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
@@ -170,7 +170,7 @@ public class PrehomoJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -207,7 +207,7 @@ public class PrehomoJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.PRE_HOMO_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
index 6e366192e..606e4baad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
@@ -167,7 +167,7 @@ public class VerifyComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -204,7 +204,7 @@ public class VerifyComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.VALIDATION_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
index 3bff75fa3..a2714f2c6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
@@ -163,7 +163,7 @@ public class designComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,threeDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
 
                             if(CollectionUtils.isNotEmpty(currentDaysUserIdList)){
@@ -199,7 +199,7 @@ public class designComplianceJob implements Job {
                                 sendMessageMap.put("contentInfo",contentInfo);
 
                                 //发送消息
-                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK);
+                                projectLawsInventoryEOService.sendMessage(msgTitle, msgContentEN,currentDaysUserIdList,projectLawsInventoryEO.getId(),sendMessageMap, feishuMsgVo, MessageTypeEnum.DESIGN_COMPLIANCE_TASK,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                             }
                         }
                     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
index a52d00052..675dda5e0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
@@ -78,7 +78,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
 	Result<?> updateStatusBatch(JSONObject json);
 
-	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType);
+	void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> params, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator);
 
 	/**
 	 * 匹配相关人员
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
index b32f22693..aea3c5c7e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
@@ -241,12 +241,10 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
 
 
         List<NcrTrackVO> trackVOListTemp = new ArrayList<>();
-        String idJson = ncrTrackVO.getNcrTrackVOList();
-        if(StringUtils.isNotBlank(idJson)){
-            List<NcrTrackVO> ncrTrackVOList = JSONObject.parseArray(idJson, NcrTrackVO.class);
+        List<NcrTrackVO> ncrTrackVOListTemp = ncrTrackVO.getNcrTrackVOList();
             //导出数据过滤(列表中选取多条进行导出的时候,用任务清单id和流程类型作为条件进行数据过滤)
-            if(ObjectUtils.allNotNull(ncrTrackVOList)){
-                for (NcrTrackVO trackVO : ncrTrackVOList) {
+            if(ObjectUtils.allNotNull(ncrTrackVOListTemp)){
+                for (NcrTrackVO trackVO : ncrTrackVOListTemp) {
                     List<NcrTrackVO> collect = trackVOList.stream()
                             .filter(e -> trackVO.getId().equals(e.getId()) && trackVO.getFlowType().equals(e.getFlowType()))
                             .collect(Collectors.toList());
@@ -255,7 +253,6 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
                     }
                 }
             }
-        }
 
         if(trackVOListTemp.size() != 0){
             return trackVOListTemp;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 2b922603a..4affa4edb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -94,6 +94,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -119,6 +120,7 @@ import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServic
  * @Version: V1.0
  */
 @Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsInventoryEOMapper, ProjectLawsInventoryEO> implements IProjectLawsInventoryEOService {
 
 	@Autowired
@@ -1340,8 +1342,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				if(CollectionUtils.isNotEmpty(userIdList)){
 					userIdList = userIdList.stream().distinct().collect(Collectors.toList());
 
-
-
 					//消息内容
 					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for "
 							+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
@@ -1377,7 +1377,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,currentUser.getUsername());
 				}
 
 				result = "发起清单确认";
@@ -1465,6 +1465,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
 								}*/
 							}
+
+							SysUser studioUserInfo = this.sysUserMapper.selectOne(
+									new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+							);
+
 							//只要有一个人拒绝，就改为拒绝。
 							if(StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())){
 								inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue();
@@ -1513,7 +1518,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 
 								}
 
@@ -1554,7 +1559,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 									//发送消息
 									List<String> userIdList = new ArrayList<>();
 									userIdList.add(projectLibraryBase.getStudioEngineer());
-									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+									sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 								}
 							}
 
@@ -1604,7 +1609,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 								//发送消息
 								List<String> userIdList = new ArrayList<>();
 								userIdList.add(projectLibraryBase.getStudioEngineer());
-								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION);
+								sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_NOTIFICATION,studioUserInfo.getUsername());
 							}
 						}
 					}
@@ -1627,7 +1632,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	 * @param projectLibraryId
 	 */
 	@Override
-	public void sendMessage(String msgTitle, String msgContent, List<String> userIdList,String projectLibraryId,Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType){
+	public void sendMessage(String msgTitle, String msgContent, List<String> userIdList,String projectLibraryId,Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType,String initiator){
 		String idTemp = projectLibraryId;
 
 		List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
@@ -1641,7 +1646,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String contentInfo = (String) sendMessageMap.get("contentInfo");
 
 		//系统消息
-		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo, messageType);
+		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo, messageType,initiator);
 		sysAnnouncementService.saveAnnouncement(sysAnnouncement);
 		sendWebsocket(idTemp, idTemp);
 
@@ -1661,8 +1666,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@NotNull
-	private SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) {
+	private SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType,String initiator) {
 		SysAnnouncement sysAnnouncement = new SysAnnouncement();
+		sysAnnouncement.setInitiator(initiator);
 		sysAnnouncement.setDelFlag("0");
 		sysAnnouncement.setSendStatus("0");
 		sysAnnouncement.setSendTime(new Date());
@@ -1723,8 +1729,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//法规清单的责任领域
 					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
 					if(StringUtils.isNotBlank(dutyTerritory)){
-						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
-								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
+						for (String s : dutyTerritory.split(",")) {
+							List<ProjectRelatedPersonnel> projectRelatedPersonnelListTemp  = projectRelatedPersonnels.stream()
+									.filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList());
+							if(projectRelatedPersonnelListTemp.size() != 0){
+								projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp);
+							}
+						}
+//						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
+//								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
 
 						List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
 						List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
@@ -2074,6 +2088,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		ProjectLibraryBase projectLibraryBase = projectLibraryBaseMapper.selectOne(new QueryWrapper<ProjectLibraryBase>()
 				.lambda().eq(ProjectLibraryBase::getId, projectLibraryId));
 
+
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
 		QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
 		projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
 		ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
@@ -2090,6 +2109,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
+		MessageTypeEnum messageTypeEnum = null;
+		String taskType = "";
+		String initiator = "";
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
@@ -2099,6 +2122,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = "Regulation Task Confirmation";
+
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2109,6 +2136,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2118,6 +2148,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2127,11 +2160,155 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
 
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and handle it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a regulation task confirmation to complete";
+
+			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
+
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
+			userIdList.add(projectLibraryBase.getStudioEngineer());
+			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and handle it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a regulation task confirmation notification to check";
+
+			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
+
+			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
+			taskType = "Regulation Task Confirmation";
+			initiator = studioUserInfo.getUsername();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "You recieved the design compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "You recieved the Pre-Homo task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "You recieved the validation compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id
+			userIdList.add(designInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the design compliance confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id
+			userIdList.add(prehomoInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the Pre-Homo confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id
+			userIdList.add(verifyInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the validation compliance confirmation " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_NOTIFICATION;
+			taskType = "Design Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "The Pre-Homo confirmation information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_NOTIFICATION;
+			taskType = "Pre-Homo Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "The validation compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ "you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_COMPLIANCE_NOTIFICATION;
+			taskType = "Validation Compliance Confirmation";
+			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
 
-			feishuMsgVo.setTaskType("Regulation Task Confirmation");
+			feishuMsgVo.setTaskType(taskType);
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 			feishuMsgVo.setInitiator(sysUser.getUsername());
@@ -2149,7 +2326,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
+			sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,initiator);
 		}
 	}
 
@@ -6454,6 +6631,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId);
 		ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseMapper.selectOne(libraryBaseQueryWrapper);
 
+		SysUser studioUserInfo = this.sysUserMapper.selectOne(
+				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
+		);
+
 		projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
 
 			//如果清单确认状态为待确认的，进行催办
@@ -6515,7 +6696,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,inventoryAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_LIST_CONFIRMATION_TASK,studioUserInfo.getUsername());
 				}
 			}
 
@@ -6571,7 +6752,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sendMessageMap.put("contentInfo",contentInfo);
 
 					//发送消息
-					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK);
+					sendMessage(msgTitle, msgContentEN,taskAffirmUserIdList,projectLibraryId,sendMessageMap, feishuMsgVo, MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK,studioUserInfo.getUsername());
 				}
 			}
 		});
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
index 638d7a3d0..43ff8ba30 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryRoleRelEOServiceImpl.java
@@ -1,10 +1,13 @@
 package com.jero.modules.project.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ProjectLibraryRoleRelEO;
 import com.jero.modules.project.mapper.ProjectLibraryRoleRelEOMapper;
 import com.jero.modules.project.service.IProjectLibraryRoleRelEOService;
+import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Date;
@@ -43,9 +46,16 @@ public class ProjectLibraryRoleRelEOServiceImpl extends ServiceImpl<ProjectLibra
 	 */
 	@Override
     public void editById(ProjectLibraryRoleRelEO projectLibraryRoleRelEO) {
-    	Date now = new Date();
-        projectLibraryRoleRelEO.setUpdateTime(now);
-    	saveOrUpdate(projectLibraryRoleRelEO);
+		//用户在法规清单角色切换中，切换角色，只有这个项目的studio 有id，其他用户第一次默认是没有的。如果不是studio  只能给他新增一条数据 ，后续回显使用。
+		if(StringUtils.isNotEmpty(projectLibraryRoleRelEO.getId())){
+			Date now = new Date();
+			projectLibraryRoleRelEO.setUpdateTime(now);
+			this.baseMapper.updateById(projectLibraryRoleRelEO);
+		}else {
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			projectLibraryRoleRelEO.setUserId(currentUser.getId());
+			this.baseMapper.insert(projectLibraryRoleRelEO);
+		}
     }
 
 	/**
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index a22bc0d69..66e03ed80 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -263,9 +263,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							lawEngineerName = lawEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						lawName.append(lawEngineerName).append(" , ");
+						lawName.append(lawEngineerName).append(",");
 					}
-					projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-3));
+					projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-1));
 				}
 			}
 
@@ -289,9 +289,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							engineeringInterfacePersonName = engineeringInterfacePersonUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						engineeringName.append(engineeringInterfacePersonName).append(" , ");
+						engineeringName.append(engineeringInterfacePersonName).append(",");
 					}
-					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-3));
+					projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-1));
 				}
 			}
 
@@ -314,9 +314,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 							certificationEngineerName = certificationEngineerUsers.stream().filter(e -> data.equals(e.getId()))
 									.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
 						}
-						certificationName.append(certificationEngineerName).append(" , ");
+						certificationName.append(certificationEngineerName).append(",");
 					}
-					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-3));
+					projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-1));
 				}
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index 25a0e47ea..c3e6664ba 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -372,7 +372,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 	}
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index bf70f98ce..a8f3e12f5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -425,7 +425,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryId,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 		return new Result<>().success("提醒办理成功！");
 	}
@@ -992,7 +992,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			sendMessageMap.put("contentInfo",contentInfo);
 
 			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum);
+			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,id,sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 		}
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index 779a2f9af..bef2abbfe 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -132,93 +132,95 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					new QueryWrapper<ProjectTaskInventoryDetailEO>().lambda().eq(ProjectTaskInventoryDetailEO::getId, projectTaskInventoryFeedbackEO.getProjectTaskInventoryId())
 			);
 
-			ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
-					new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId())
-			);
+			if(!Objects.isNull(projectTaskInventoryDetailEO)){
+				ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
+						new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, projectTaskInventoryDetailEO.getProjectTaskInventoryId())
+				);
 
-			ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne(
-					new QueryWrapper<ProjectLibraryBase>().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())
-			);
+				ProjectLibraryBase projectLibraryBaseInfo = this.projectLibraryBaseService.getOne(
+						new QueryWrapper<ProjectLibraryBase>().lambda().eq(ProjectLibraryBase::getId, projectLawsInventoryEO.getProjectLibraryId())
+				);
 
-			ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne(
-					new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId())
-			);
+				ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne(
+						new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBaseInfo.getProjectNameId())
+				);
 
-			QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
-			projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId());
-			ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper);
+				QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
+				projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBaseInfo.getYearNameId());
+				ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne(projectYearInfoEOQueryWrapper);
 
-			// 飞书消息封装
-			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+				// 飞书消息封装
+				FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
-			feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has replied to your engineering deliverable information. Please check and address it in a timely manner.");
-			feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
-			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
-			feishuMsgVo.setInitiator(currentUser.getUsername());
+				feishuMsgVo.setContent("Hello! " + currentUser.getUsername() + " has replied to your engineering deliverable information. Please check and address it in a timely manner.");
+				feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
+				feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
+				feishuMsgVo.setInitiator(currentUser.getUsername());
 
-			MessageTypeEnum messageTypeEnum = null;
+				MessageTypeEnum messageTypeEnum = null;
 
-			//消息内容
-			String msgContentEN = "";
-			String msgTitle = "";
+				//消息内容
+				String msgContentEN = "";
+				String msgTitle = "";
 
-			String flowType = projectTaskInventoryFeedbackEO.getFlowType();
-			if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
-				msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
-						+ projectLawsInventoryEO.getSerialNumber() + " in "
-						+ projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time.";
-				msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
-						+ ": You have a design compliance task to complete";
+				String flowType = projectTaskInventoryFeedbackEO.getFlowType();
+				if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
+					msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
+							+ projectLawsInventoryEO.getSerialNumber() + " in "
+							+ projectNameInfoEO.getProjectName() + " for design compliance confirmation. Please check and address it in time.";
+					msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
+							+ ": You have a design compliance task to complete";
 
-				feishuMsgVo.setTaskType("Design Compliance Confirmation");
-				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+					feishuMsgVo.setTaskType("Design Compliance Confirmation");
+					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getDesignDueDate()));
 
-				messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
-			}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
-				msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
-						+ projectLawsInventoryEO.getSerialNumber() + " in "
-						+ projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time.";
-				msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
-						+ ": You have a Pre-Homo task to complete";
+					messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+				}else if(StringUtils.equals(flowType,FlowTypeEnum.PREHOMOQRLC.getValue())){
+					msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
+							+ projectLawsInventoryEO.getSerialNumber() + " in "
+							+ projectNameInfoEO.getProjectName() + " for Pre-Homo compliance confirmation. Please check and address it in time.";
+					msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
+							+ ": You have a Pre-Homo task to complete";
 
-				feishuMsgVo.setTaskType("Pre-Homo Confirmation");
-				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
+					feishuMsgVo.setTaskType("Pre-Homo Confirmation");
+					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
 
-				messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
-			}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
-				msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
-						+ projectLawsInventoryEO.getSerialNumber() + " in "
-						+ projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time.";
-				msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
-						+ ": You have a validation compliance task to complete";
+					messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+				}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
+					msgContentEN = currentUser.getUsername() + " has replied to your engineering deliverable information of "
+							+ projectLawsInventoryEO.getSerialNumber() + " in "
+							+ projectNameInfoEO.getProjectName() + " for validation compliance confirmation. Please check and address it in time.";
+					msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()
+							+ ": You have a validation compliance task to complete";
 
-				feishuMsgVo.setTaskType("Validation Compliance Confirmation");
-				feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
+					feishuMsgVo.setTaskType("Validation Compliance Confirmation");
+					feishuMsgVo.setDueDate(sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
 
-				messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+					messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+				}
+
+				//飞书跳转链接
+				String hrefFeishu = backUrl
+						+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink()
+						+ projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
+						+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+						+ projectYearNameInfoEO.getYearName()
+						+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket();
+				//系统内部跳转链接
+				String href = "<a href='"
+						+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
+						+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
+						+ projectYearNameInfoEO.getYearName()
+						+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
+						+ "'>" + " View details" + "</a>";
+				String contentInfo = msgContentEN + " " + href;
+				Map<String,Object> sendMessageMap = new HashMap<>();
+				sendMessageMap.put("hrefFeishu",hrefFeishu);
+				sendMessageMap.put("contentInfo",contentInfo);
+
+				//发送消息
+				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 			}
-
-			//飞书跳转链接
-			String hrefFeishu = backUrl
-					+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink()
-					+ projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
-					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
-					+ projectYearNameInfoEO.getYearName()
-					+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket();
-			//系统内部跳转链接
-			String href = "<a href='"
-					+ JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBaseInfo.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType()
-					+ "&projectName=" + projectNameInfoEO.getProjectName() + "-"
-					+ projectYearNameInfoEO.getYearName()
-					+ "&targetMarket=" + projectLibraryBaseInfo.getTargetMarket()
-					+ "'>" + " View details" + "</a>";
-			String contentInfo = msgContentEN + " " + href;
-			Map<String,Object> sendMessageMap = new HashMap<>();
-			sendMessageMap.put("hrefFeishu",hrefFeishu);
-			sendMessageMap.put("contentInfo",contentInfo);
-
-			//发送消息
-			SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
 		}
     }
 
@@ -419,7 +421,7 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				sendMessageMap.put("contentInfo",contentInfo);
 
 				//发送消息
-				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum);
+				SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
 			}
 		}
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
index 11e6f4f45..4d803cf32 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/util/SendMessageUtils.java
@@ -54,7 +54,14 @@ public class SendMessageUtils {
         SendMessageUtils.webSocket = webSocket;
     }
 
-    public static void sendMessage(String msgTitle, String msgContent, List<String> userIdList, String projectLibraryId, Map<String,Object> sendMessageMap, FeishuMsgVo feishuMsgVo, MessageTypeEnum messageType) {
+    public static void sendMessage(String msgTitle,
+                                   String msgContent,
+                                   List<String> userIdList,
+                                   String projectLibraryId,
+                                   Map<String,Object> sendMessageMap,
+                                   FeishuMsgVo feishuMsgVo,
+                                   MessageTypeEnum messageType,
+                                   String initiator) {
         String idTemp = projectLibraryId;
 
         List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
@@ -69,7 +76,7 @@ public class SendMessageUtils {
         String contentInfo = (String) sendMessageMap.get("contentInfo");
 
         //系统消息
-        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo,messageType);
+        SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContent, contentInfo,messageType,initiator);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         sendWebsocket(idTemp, idTemp);
 
@@ -89,8 +96,9 @@ public class SendMessageUtils {
     }
 
     @NotNull
-    private static SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType) {
+    private static SysAnnouncement getSysAnnouncement(List<String> userIdList, String title, String content, String contentInfo, MessageTypeEnum messageType,String initiator) {
         SysAnnouncement sysAnnouncement = new SysAnnouncement();
+        sysAnnouncement.setInitiator(initiator);
         sysAnnouncement.setDelFlag("0");
         sysAnnouncement.setSendStatus("0");
         sysAnnouncement.setSendTime(new Date());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
index 69193946c..231f16f4c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
@@ -1,7 +1,6 @@
 package com.jero.modules.project.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -10,6 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -119,7 +119,7 @@ public class NcrTrackVO implements Serializable {
     //验证问题类型  verify_flow_task_status
     private String verifyFlowTaskStatus;
 
-    private String ncrTrackVOList;
+    private List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
 
 
     //以下字段跳转适用(还有项目库id)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 83fd769d5..519dae411 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -1,3 +1,4 @@
+
 package com.jero.modules.searchcenter.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
@@ -64,7 +65,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
     private IOnlCgformCollectionService iOnlCgformCollectionService;
     @Autowired
     private IOnlCgformSubscribeService iOnlCgformSubscribeService;
-    public static final String SEARCH_FLAG = "魑";
+    public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据)
 
 
     @Override
@@ -317,27 +318,21 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         Map<String, Object> map = new HashMap<>();
                         Map<String, Object> queryMap = new HashMap<>();
                         Map<String, Object> queryMapTemp = new HashMap<>();
-                        queryMapTemp.put("query", s);
-                        queryMapTemp.put("minimum_should_match", 2);
-                        queryMap.put(key, queryMapTemp);
-                        map.put("match",queryMap);
+
+                        if (key.equals("serial_number")){
+                            queryMap.put(key, "*" + s + "*");
+                            map.put("wildcard", queryMap);
+                        } else {
+                            queryMapTemp.put("query", s);
+                            queryMapTemp.put("minimum_should_match", 2);
+                            queryMap.put(key, queryMapTemp);
+                            map.put("match",queryMap);
+                        }
+
                         must.add(map);
                     }
                 }
             }
-//            for (Map.Entry<String, Object> entry : inputMap.entrySet()) {
-//                String key = entry.getKey();
-//                String value = (String) entry.getValue();
-//                if (ObjectUtils.isNotEmpty(value)) {
-//                    for (String s : value.split(",")) {
-//                        Map<String, Object> queryMap = new HashMap<>();
-//                        Map<String, Object> queryMapTemp = new HashMap<>();
-//                        queryMapTemp.put(key, s);
-//                        queryMap.put("match_phrase", queryMapTemp);
-//                        must.add(queryMap);
-//                    }
-//                }
-//            }
         }
         //封装下拉,树形查询条件
         if (ObjectUtils.isNotEmpty(otherMap)) {
@@ -359,14 +354,6 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                     map.put("match",queryMap);
                     must.add(map);
                 }
-//                if (ObjectUtils.isNotEmpty(value)) {
-//                    Map<String, Object> queryMap = new HashMap<>();
-//                    Map<String, Object> queryMapTemp = new HashMap<>();
-//                    queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
-////                    queryMapTemp.put(key, "*"+value+"*");
-//                    queryMap.put("wildcard", queryMapTemp);
-//                    must.add(queryMap);
-//                }
             }
         }
         //封装时间类型字段查询(时间范围)
@@ -396,6 +383,16 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
      */
     @Override
     public IPage getFullTextInfoList(SearchVO searchVO) {
+        JSONArray queryJsonMustNot = new JSONArray();
+        if(StringUtils.isNotBlank(searchVO.getSelectValue())){
+            Map<String,Object> map = new HashMap<>();
+            Map<String,Object> map1 = new HashMap<>();
+            Map<String,Object> map2 = new HashMap<>();
+            map.put("query",SEARCH_FLAG);
+            map1.put("flag",map);
+            map2.put("match",map1);
+            queryJsonMustNot.add(map2);
+        }
         if(StringUtils.isBlank(searchVO.getSelectValue())){
             searchVO.setSelectValue(SEARCH_FLAG);
         }
@@ -415,12 +412,12 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         String selectValueTwo = searchVO.getSelectValueTwo();
         //1. 需要查询的字段
         List<String> fieldList = new ArrayList<>();
+        fieldList.add("serial_number");//权重6
+        fieldList.add("title");//权重5
+        fieldList.add("file_text");//权重4
+        fieldList.add("content");//权重3
+        fieldList.add("file_name");//权重2
         fieldList.add("module_type");
-        fieldList.add("title");
-        fieldList.add("serial_number");
-        fieldList.add("file_text");
-        fieldList.add("content");
-        fieldList.add("file_name");
         fieldList.add("id");
         fieldList.add("flag");
 
@@ -429,31 +426,35 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         JSONArray queryMapJsonThree = new JSONArray();
         JSONArray queryMapJsonAll = new JSONArray();
 
+        Map<String,Object> mapHighlight = new HashMap<>();
+        Map<String,Object> mapHighlight1 = new HashMap<>();
         //封装首次的条件
         if (StringUtils.isNotBlank(selectValue)) {
             for (String field : fieldList) {
                 Map<String, Object> map2 = new HashMap<>();
                 Map<String, Object> map3 = new HashMap<>();
                 Map<String, Object> map4 = new HashMap<>();
-                map3.put("query",selectValue);
-                map3.put("minimum_should_match",2);
-//                if("serial_number".equals(field)){
-//                    map3.put("fuzziness",1);
-//                }
-                map2.put(field, map3);
-                map4.put("match",map2);
+//                特殊处理编号字段
+                if (field.equals("serial_number")){
+                    // map2放最内层
+                    map2.put(field, "*" + selectValue + "*");
+
+                    // map4放query
+                    map4.put("wildcard",map2);
+                } else {
+                    map3.put("query",selectValue);
+//                    map3.put("minimum_should_match",2);
+
+                    map2.put(field, map3);
+                    map4.put("match",map2);
+                }
                 queryMapJson.add(map4);
+                //高亮
+                if(!"flag".equals(field)){
+                    highlight(mapHighlight, field);
+                }
             }
-//            for (String field : fieldList) {
-//                Map<String, Object> queryMap = new HashMap<>();
-//                Map<String, Object> map2 = new HashMap<>();
-//                Map<String, Object> map3 = new HashMap<>();
-//                map3.put("query",selectValue);
-//                map3.put("slop",1);
-//                map2.put(field, map3);
-//                queryMap.put("match_phrase", map2);
-//                queryMapJson.add(queryMap);
-//            }
+            mapHighlight1.put("fields",mapHighlight);
         }
         if(CollectionUtils.isNotEmpty(queryMapJson)){
             JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson);
@@ -465,22 +466,27 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 Map<String, Object> queryMap = new HashMap<>();
                 Map<String, Object> map2 = new HashMap<>();
                 Map<String, Object> map3 = new HashMap<>();
-                map3.put("query",selectValueTwo);
-                map3.put("minimum_should_match",2);
-                map2.put(field, map3);
-                queryMap.put("match", map2);
+
+                //特殊处理编号字段
+                if (field.equals("serial_number")){
+                    // map2放最内层
+                    map2.put(field, "*" + selectValueTwo + "*");
+                    // map4放query
+                    queryMap.put("wildcard",map2);
+                } else {
+                    map3.put("query",selectValueTwo);
+//                    map3.put("minimum_should_match",2);
+                    map2.put(field, map3);
+                    queryMap.put("match", map2);
+                }
+
                 queryMapJsonTwo.add(queryMap);
+                //高亮
+                if(!"flag".equals(field)){
+                    highlight(mapHighlight, field);
+                }
             }
-//            for (String field : fieldList) {
-//                Map<String, Object> queryMap = new HashMap<>();
-//                Map<String, Object> map2 = new HashMap<>();
-//                Map<String, Object> map3 = new HashMap<>();
-//                map3.put("query",selectValueTwo);
-//                map3.put("minimum_should_match",2);
-//                map2.put(field, map3);
-//                queryMap.put("query", map2);
-//                queryMapJsonTwo.add(queryMap);
-//            }
+            mapHighlight1.put("fields",mapHighlight);
         }
         if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
             JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo);
@@ -500,30 +506,36 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree);
             queryMapJsonAll.add(jsonObjectThree);
         }
-
         JSONObject sort = new JSONObject();
-        Map<String,Object> mapSort = new HashMap<>();
-        Map<String,Object> mapSortTemp = new HashMap<>();
-        mapSort.put("order","asc");
-        mapSortTemp.put("file_sort.keyword",mapSort);
-        sort.putAll(mapSortTemp);
+        Map<String,Object> score = new HashMap<>();
+        Map<String,Object> score1 = new HashMap<>();
+        score.put("order","desc");
+        score1.put("_score",score);
+        sort.putAll(score1);
+
+//        Map<String,Object> mapSort = new HashMap<>();
+//        Map<String,Object> mapSortTemp = new HashMap<>();
+//        mapSort.put("order","asc");
+//        mapSortTemp.put("file_sort.keyword",mapSort);
+//        sort.putAll(mapSortTemp);
 
         Integer pageNo = searchVO.getPageNo();
         Integer pageSize = searchVO.getPageSize();
-        IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, null, pageNo, pageSize, null,searchVO.getCut(),sort);
+        IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null,
+                pageNo, pageSize, null,searchVO.getCut(),sort,queryJsonMustNot);
         return page;
     }
 
     @NotNull
-    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,
+    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map<String,Object> highlightMap,
                            JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag,
-                           String cut,JSONObject querySort) {
+                           String cut,JSONObject querySort,JSONArray queryMustNot) {
         JSONObject jsonObject = new JSONObject();
         //基础添加封装
         if ("paragraphFlag".equals(paragraphFlag)) {
-            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null);
         } else {
-            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null);
         }
         JSONArray jsonArraySort = new JSONArray();
         jsonArraySort.add(querySort);
@@ -531,7 +543,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         //1. 条件,分页
         JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null,
                 jsonObject,
-                null,
+                highlightMap,
                 jsonArraySort,
                 pageNo-1,
                 pageSize);
@@ -548,99 +560,27 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         }
 
         List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
-
-        //首次搜索结果
         List<Map<String, Object>> mapList = new ArrayList<>();
-        //二次搜索结果
-        List<Map<String, Object>> mapListTwo = new ArrayList<>();
-
-        for (Map<String, Object> stringObjectMap : list) {
-            Map<String, Object> mapSource = (Map<String, Object>) stringObjectMap.get("_source");
-            if(StringUtils.isBlank(selectValue)){
-                mapSource.put("file_text","");
-            }
-            if (StringUtils.isNotBlank(selectValueTwo)) {
-                //二次查询
-                int count = 0;
-                for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
-                    String valueHighlight = "";
-                    String value = (String) entry.getValue();
-                    //判断value中是否包含二次搜索中的字符
-                    if(StringUtils.isNotBlank(value)){
-                        if(value.contains(selectValueTwo)){
-                            value = subFileText(value, selectValueTwo);
-                            count++;
-                            String replacementTwo = "<text class='highlight-class'>" + selectValueTwo + "</text>";
-                            valueHighlight = value.replaceAll(selectValueTwo, replacementTwo);
-                            //第一次搜索的也高亮
-                            if(value.contains(selectValue) && !selectValueTwo.contains(selectValue)){
-                                String replacementOne = "<text class='highlight-class'>" + selectValue + "</text>";
-                                valueHighlight = valueHighlight.replaceAll(selectValue,replacementOne);
-                            }
-                            if (ObjectUtils.isNotEmpty(valueHighlight)) {
-                                entry.setValue(valueHighlight);
-                            }
-                        }else{
-                            //第二次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
-//                            if ("file_text".equals(entry.getKey())) {
-//                                entry.setValue("");
-//                                value = "";
-//                            }
-//                            count++;
-                        }
+        for (Map<String, Object> map : list) {
+            Map<String, Object> mapSource = (Map<String, Object>) map.get("_source");
+            Map<String, Object> mapHighlight = (Map<String, Object>) map.get("highlight");
+            if(ObjectUtils.isNotEmpty(mapHighlight)){
+                for (Map.Entry<String, Object> entry : mapHighlight.entrySet()) {
+                    String key = entry.getKey();
+                    List<String> value = (List<String>) entry.getValue();
+                    String  fieldConyent= "";
+                    for (String s : value) {
+                        fieldConyent += s;
                     }
+                    mapSource.put(key,fieldConyent);
                 }
-                if (count > 0) {
-                    mapListTwo.add(mapSource);
-                }
-            } else {
-                //首次查询(没有输入查询条件)
-                mapList.add(mapSource);
-                //处理高亮module_type,title,serial_number,file_text(输入查询条件后,处理高亮字段)
-                if (StringUtils.isNotBlank(selectValue)) {
-                    for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
-                        String key = entry.getKey();
-                        String value = String.valueOf(entry.getValue());
-//                        StringBuilder sb = new StringBuilder();
-                        String valueHighlight = "";
-                        if (StringUtils.isNotBlank(value)) {
-                            //file_text需要单独处理(截取第一处高亮的前后100个字符)
-                            if ("file_text".equals(key)) {
-                                //判断value中是否包含搜索中的字符
-                                for (String s : selectValue.split(" ")) {
-                                    if(value.contains(s)){
-                                        //截取第一处高亮的前后100个字符
-                                        value = subFileText(value, s);
-                                        break;
-                                    }else{
-                                        //第一次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
-                                        entry.setValue("");
-                                        value = "";
-                                    }
-                                }
-                            }
-                            if ("content".equals(key)) {
-                                for (String s : selectValue.split(" ")) {
-                                    if(value.contains(s)){
-                                        value = subFileText(value, s);
-                                        break;
-                                    }
-                                }
-                            }
-                            for (String s : selectValue.split(" ")) {
-                                String replacement = "<text class='highlight-class'>" + s + "</text>";
-                                value = value.replaceAll(s, replacement);
-                            }
-
-//                            String replacement = "<text class='highlight-class'>" + selectValue + "</text>";
-//                            valueHighlight = value.replaceAll(selectValue, replacement);
-                        }
-                        if (ObjectUtils.isNotEmpty(value)) {
-                            entry.setValue(value);
-                        }
-                    }
+                //如果这一条数据中有高亮字段值,但是file_text中没有高亮值, 则赋控制,否则列表中会展示所有的文件内容, 赋空后,则展示基础数据
+                String fileText = (String) mapSource.get("file_text");
+                if(StringUtils.isNotBlank(fileText) && !fileText.contains("<text class='highlight-class'>")){
+                    mapSource.put("file_text","");
                 }
             }
+            mapList.add(mapSource);
         }
 
         //处理分页
@@ -648,7 +588,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         if (StringUtils.isNotBlank(selectValueTwo)) {
             //二次搜索的结果
             page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
-            page.setRecords(mapListTwo);
+            page.setRecords(mapList);
         } else {
             //首次搜索的结果
             page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
@@ -657,7 +597,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         return page;
     }
 //    @NotNull
-//    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,
+//    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map<String,Object> highlightMap,
 //                           JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag,
 //                           String cut,JSONObject querySort) {
 //        JSONObject jsonObject = new JSONObject();
@@ -673,7 +613,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
 //        //1. 条件,分页
 //        JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null,
 //                jsonObject,
-//                null,
+//                highlightMap,
 //                jsonArraySort,
 //                pageNo-1,
 //                pageSize);
@@ -698,49 +638,37 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
 //
 //        for (Map<String, Object> stringObjectMap : list) {
 //            Map<String, Object> mapSource = (Map<String, Object>) stringObjectMap.get("_source");
+//            if(StringUtils.isBlank(selectValue)){
+//                mapSource.put("file_text","");
+//            }
 //            if (StringUtils.isNotBlank(selectValueTwo)) {
 //                //二次查询
 //                int count = 0;
 //                for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
+//                    String valueHighlight = "";
 //                    String value = (String) entry.getValue();
 //                    //判断value中是否包含二次搜索中的字符
-//                    boolean flag = judgeContains(value, selectValueTwo);
-//                    StringBuilder sb = new StringBuilder();
-//                    if (flag) {
-//                        //截取第一处高亮的前后100个字符
-//                        value = getFileText(value, selectValueTwo);
-//                        count++;
-//                        for (int i = 0; i < value.length(); i++) {
-//                            String chStr = String.valueOf(value.charAt(i));
-//                            //第一次的搜索条件也需要高亮
-//                            String condition = selectValueTwo + selectValue;
-//                            if (condition.contains(String.valueOf(chStr))) {
-//                                chStr = "<text class='highlight-class'>" + chStr + "</text>";
+//                    if(StringUtils.isNotBlank(value)){
+//                        if(value.contains(selectValueTwo)){
+//                            value = subFileText(value, selectValueTwo);
+//                            count++;
+//                            String replacementTwo = "<text class='highlight-class'>" + selectValueTwo + "</text>";
+//                            valueHighlight = value.replaceAll(selectValueTwo, replacementTwo);
+//                            //第一次搜索的也高亮
+//                            if(value.contains(selectValue) && !selectValueTwo.contains(selectValue)){
+//                                String replacementOne = "<text class='highlight-class'>" + selectValue + "</text>";
+//                                valueHighlight = valueHighlight.replaceAll(selectValue,replacementOne);
 //                            }
-//                            sb.append(String.valueOf(chStr));
-//                        }
-//                        entry.setValue(sb.toString());
-//                    } else {
-//                        //第二次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
-//                        if ("file_text".equals(entry.getKey())) {
-//                            entry.setValue("");
-//                            value = "";
-//                        }
-//                        count++;
-//                        //如果内容中不包含第二次搜索条件,则继续高亮第一处
-//                        //判断value中是否包含首次搜索中的字符(因为其他的字段有可能包含二次的搜索条件查出来的这条数据,所以还得判断value中是否包含首次搜索中的字符)
-//                        boolean flagOne = judgeContains(value, selectValue);
-//                        if (flagOne) {
-//                            //如果包含第一次的搜索条件,先前后截取100字符后再高亮
-//                            value = getFileText(value, selectValue);
-//                            for (int i = 0; i < value.length(); i++) {
-//                                String chStr = String.valueOf(value.charAt(i));
-//                                if (selectValue.contains(String.valueOf(chStr))) {
-//                                    chStr = "<text class='highlight-class'>" + chStr + "</text>";
-//                                }
-//                                sb.append(String.valueOf(chStr));
+//                            if (ObjectUtils.isNotEmpty(valueHighlight)) {
+//                                entry.setValue(valueHighlight);
 //                            }
-//                            entry.setValue(sb.toString());
+//                        }else{
+//                            //第二次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
+////                            if ("file_text".equals(entry.getKey())) {
+////                                entry.setValue("");
+////                                value = "";
+////                            }
+////                            count++;
 //                        }
 //                    }
 //                }
@@ -755,38 +683,42 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
 //                    for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
 //                        String key = entry.getKey();
 //                        String value = String.valueOf(entry.getValue());
-//                        StringBuilder sb = new StringBuilder();
+////                        StringBuilder sb = new StringBuilder();
+//                        String valueHighlight = "";
 //                        if (StringUtils.isNotBlank(value)) {
 //                            //file_text需要单独处理(截取第一处高亮的前后100个字符)
 //                            if ("file_text".equals(key)) {
 //                                //判断value中是否包含搜索中的字符
-//                                boolean flag = judgeContains(value, selectValue);
-//                                if (flag) {
-//                                    //截取第一处高亮的前后100个字符
-//                                    value = getFileText(value, selectValue);
-//                                } else {
-//                                    //第一次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
-//                                    entry.setValue("");
-//                                    value = "";
+//                                for (String s : selectValue.split(" ")) {
+//                                    if(value.contains(s)){
+//                                        //截取第一处高亮的前后100个字符
+//                                        value = subFileText(value, s);
+//                                        break;
+//                                    }else{
+//                                        //第一次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
+//                                        entry.setValue("");
+//                                        value = "";
+//                                    }
 //                                }
 //                            }
 //                            if ("content".equals(key)) {
-//                                boolean flag = judgeContains(value, selectValue);
-//                                if (flag) {
-//                                    //截取第一处高亮的前后100个字符
-//                                    value = getFileText(value, selectValue);
+//                                for (String s : selectValue.split(" ")) {
+//                                    if(value.contains(s)){
+//                                        value = subFileText(value, s);
+//                                        break;
+//                                    }
 //                                }
 //                            }
-//                            for (int i = 0; i < value.length(); i++) {
-//                                String chStr = String.valueOf(value.charAt(i));
-//                                if (selectValue.contains(String.valueOf(chStr))) {
-//                                    chStr = "<text class='highlight-class'>" + chStr + "</text>";
-//                                }
-//                                sb.append(String.valueOf(chStr));
+//                            for (String s : selectValue.split(" ")) {
+//                                String replacement = "<text class='highlight-class'>" + s + "</text>";
+//                                value = value.replaceAll(s, replacement);
 //                            }
+//
+////                            String replacement = "<text class='highlight-class'>" + selectValue + "</text>";
+////                            valueHighlight = value.replaceAll(selectValue, replacement);
 //                        }
-//                        if (ObjectUtils.isNotEmpty(sb)) {
-//                            entry.setValue(sb.toString());
+//                        if (ObjectUtils.isNotEmpty(value)) {
+//                            entry.setValue(value);
 //                        }
 //                    }
 //                }
@@ -960,21 +892,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         Map<String, Object> queryMapTemp = new HashMap<>();
                         Map<String, Object> queryMap3 = new HashMap<>();
                         queryMap3.put("query",s);
-                        queryMap3.put("minimum_should_match",2);
+//                        queryMap3.put("minimum_should_match",2);
                         queryMapTemp.put(key, queryMap3);
                         queryMap.put("match", queryMapTemp);
                         queryMapJson.add(queryMap);
                     }
-//                    for (String s : value.split(",")) {
-//                        Map<String, Object> queryMap = new HashMap<>();
-//                        Map<String, Object> queryMapTemp = new HashMap<>();
-//                        Map<String, Object> queryMap3 = new HashMap<>();
-//                        queryMap3.put("query",s);
-//                        queryMap3.put("slop",1);
-//                        queryMapTemp.put(key, queryMap3);
-//                        queryMap.put("match_phrase", queryMapTemp);
-//                        queryMapJson.add(queryMap);
-//                    }
                 }
             }
             if(CollectionUtils.isNotEmpty(queryMapJsonTemp)){
@@ -1000,21 +922,11 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         Map<String, Object> queryMapTemp = new HashMap<>();
                         Map<String, Object> queryMap3 = new HashMap<>();
                         queryMap3.put("query",s);
-                        queryMap3.put("minimum_should_match",2);
+//                        queryMap3.put("minimum_should_match",2);
                         queryMapTemp.put(key, queryMap3);
                         queryMap.put("match", queryMapTemp);
                         queryMapJsonTwo.add(queryMap);
                     }
-//                    for (String s : value.split(",")) {
-//                        Map<String, Object> queryMap = new HashMap<>();
-//                        Map<String, Object> queryMapTemp = new HashMap<>();
-//                        Map<String, Object> queryMap3 = new HashMap<>();
-//                        queryMap3.put("query",s);
-//                        queryMap3.put("slop",1);
-//                        queryMapTemp.put(key, queryMap3);
-//                        queryMap.put("match_phrase", queryMapTemp);
-//                        queryMapJsonTwo.add(queryMap);
-//                    }
                 }
             }
             if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
@@ -1040,37 +952,1235 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
 
         //排序
         JSONObject sort = new JSONObject();
-        Map<String,Object> mapSort = new HashMap<>();
-        Map<String,Object> mapSortTemp = new HashMap<>();
-        mapSort.put("order","asc");
-        mapSortTemp.put("file_sort.keyword",mapSort);
-        sort.putAll(mapSortTemp);
+//        Map<String,Object> mapSort = new HashMap<>();
+//        Map<String,Object> mapSortTemp = new HashMap<>();
+//        mapSort.put("order","asc");
+//        mapSortTemp.put("file_sort.keyword",mapSort);
+//        sort.putAll(mapSortTemp);
+
+        Map<String,Object> score = new HashMap<>();
+        Map<String,Object> score1 = new HashMap<>();
+        score.put("order","desc");
+        score1.put("_score",score);
+        sort.putAll(score1);
 
         int pageNo = Integer.parseInt(map.get("pageNo").toString());
         int pageSize = Integer.parseInt(map.get("pageSize").toString());
         //判断第一次传参和第二次传参  inputFieldList
         String selectValue = "";
         String selectValueTwo = "";
+        Map<String,Object> mapHighlight = new HashMap<>();
+        Map<String,Object> mapHighlight1 = new HashMap<>();
         for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
             String key = entry.getKey();
             String value = (String) entry.getValue();
             if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
                 selectValue = value;
+                highlight(mapHighlight, key);
             }
+            mapHighlight1.put("fields",mapHighlight);
         }
         for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
             String key = entry.getKey();
             String value = (String) entry.getValue();
             if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
                 selectValueTwo = value;
+                highlight(mapHighlight, key);
             }
+            mapHighlight1.put("fields",mapHighlight);
         }
         //段落的标识
         String paragraphFlag = "paragraphFlag";
 
 
-        IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, null, pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort);
+        IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null,
+                pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,null);
         return iPage;
     }
 
+    private void highlight(Map<String, Object> mapHighlight, String key) {
+        Map<String, Object> mapTemp = new HashMap<>();
+        List<String> list = new ArrayList<>();
+        list.add("<text class='highlight-class'>");
+        List<String> list1 = new ArrayList<>();
+        list1.add("</text>");
+        mapTemp.put("pre_tags", list);
+        mapTemp.put("post_tags", list1);
+        mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200
+        mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
+        mapTemp.put("type", "plain");
+        mapHighlight.put(key, mapTemp);
+    }
+
+
 }
+
+
+//---------------------------------------------------------------------------------------------------------------------------------------------------------------
+//package com.jero.modules.searchcenter.service.impl;
+//
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+//import com.jero.common.constant.enums.CutEnum;
+//import com.jero.common.constant.enums.ModuleEnum;
+//import com.jero.common.constant.enums.YesOrNoEnum;
+//import com.jero.common.es.JeroElasticsearchTemplate;
+//import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
+//import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
+//import com.jero.modules.collection.entity.OnlCgformCollection;
+//import com.jero.modules.collection.service.IOnlCgformCollectionService;
+//import com.jero.modules.document.enums.FieldTypeEnum;
+//import com.jero.modules.document.enums.SearchEnum;
+//import com.jero.modules.document.service.IBussDocumentLibraryEOService;
+//import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl;
+//import com.jero.modules.oss.entity.OSSFile;
+//import com.jero.modules.oss.service.IOSSFileService;
+//import com.jero.modules.searchcenter.vo.SearchVO;
+//import com.jero.modules.subscribe.entity.OnlCgformSubscribe;
+//import com.jero.modules.subscribe.service.IOnlCgformSubscribeService;
+//import com.jero.modules.system.entity.SysCategory;
+//import com.jero.modules.system.entity.SysDictItem;
+//import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
+//import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+//import org.apache.commons.collections.CollectionUtils;
+//import org.apache.commons.lang3.ObjectUtils;
+//import org.apache.commons.lang3.StringUtils;
+//import org.jetbrains.annotations.NotNull;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.stream.Collectors;
+//
+///**
+// * @description
+// * @date 2022/3/14 10:03
+// * @auth zhn
+// */
+//@Component
+//public class DocumentSearchServiceImpl implements IDocumentSearchService {
+//    @Autowired
+//    private IBussDocumentLibraryEOService iBussDocumentLibraryEOService;
+//    @Autowired
+//    private JeroElasticsearchTemplate jeroElasticsearchTemplate;
+//    @Autowired
+//    private OnlCgformFieldServiceImpl onlCgformFieldService;
+//    @Autowired
+//    private SysCategoryServiceImpl sysCategoryService;
+//    @Autowired
+//    private SysDictItemServiceImpl sysDictItemServiceImpl;
+//    @Autowired
+//    private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService;
+//    @Autowired
+//    private IOSSFileService iOSSFileService;
+//    @Autowired
+//    private IOnlCgformCollectionService iOnlCgformCollectionService;
+//    @Autowired
+//    private IOnlCgformSubscribeService iOnlCgformSubscribeService;
+//    public static final String SEARCH_FLAG = "魑";//标识(es数据带此标识的代表全文和段落的数据,不带此标识的代表列表数据)
+//
+//
+//    @Override
+//    public List<Map<String, Object>> queryCondition(String flag, String cut, String searchFlag) {
+//        List<Map<String, Object>> mapList = iBussDocumentLibraryEOService.queryCondition(flag, cut, searchFlag);
+//        //搜索条件手动添加正文
+//        if ("1".equals(searchFlag)) {
+//            int index = -1;
+//            for (Map<String, Object> objectMap : mapList) {
+//                index++;
+//                if ("中文标题".equals(objectMap.get("db_field_txt"))) {
+//                    objectMap.put("db_field_txt", "标题");
+//                }
+//                if ("title_en".equals(objectMap.get("db_field_name"))) {
+//                    break;
+//                }
+//            }
+//            //删除英文标题
+//            mapList.remove(index);
+//            //添加正文
+//            Map<String, Object> map = new HashMap<>();
+//            if(CutEnum.CN.getValue().equals(cut)){
+//                map.put("db_field_txt", "正文");
+//            }else{
+//                map.put("db_field_txt", "main body");
+//            }
+//            map.put("field_show_type", "1");
+//            map.put("db_field_name", "file_text");
+//            mapList.add(map);
+//        }
+//        return mapList;
+//    }
+//
+//    @Override
+//    public List<Map<String, Object>> getHeader(String flag, String cut, String searchFlag) {
+//        List<Map<String, Object>> header = iBussDocumentLibraryEOService.getHeader(flag, cut, searchFlag);
+//        return header;
+//    }
+//
+//    /**
+//     * 文档库列表
+//     * @param map
+//     * @return
+//     */
+//    @Override
+//    public IPage getInfoList(Map<String, Object> map) {
+//        boolean flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.INDEX_NAME_DOCUMENT.getValue());
+//        if (!flagTemp) {
+//            return new Page(Integer.parseInt(map.get("pageNo").toString()), Integer.parseInt(map.get("pageSize").toString()));
+//        }
+//        //文档库所有的字段
+//        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+//        //需要查询的列表字段
+//        List<OnlCgformField> hearOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
+//        List<String> sourceList = hearOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        sourceList.add("id");
+//
+//        //输入框字段
+//        List<OnlCgformField> inputOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.TEXT_STRING.getValue().equals(e.getFieldShowType())
+//                        || FieldTypeEnum.TEXT_NUMBER.getValue().equals(e.getFieldShowType())
+//                        || FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())//人员选择
+//                        || FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())//标准选择
+//                        || FieldTypeEnum.TEXT.getValue().equals(e.getFieldShowType())//文本框
+//                        || FieldTypeEnum.TEXT_LINK.getValue().equals(e.getFieldShowType()))//输入框(链接)
+//                .collect(Collectors.toList());
+//        List<String> inputFieldList = inputOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        inputFieldList.add("file_text");
+//
+//        //下拉,树形,等字段
+//        List<OnlCgformField> otherOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())//下拉单选
+//                        || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())//下拉多选
+//                        || FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())//树形
+//                        || FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType()))//人员选择
+//                .collect(Collectors.toList());
+//        List<String> otherFieldList = otherOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//
+//        //日期字段
+//        List<OnlCgformField> dateOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType()))//日期单选
+//                .collect(Collectors.toList());
+//        List<String> dateFieldList = dateOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//
+//        //过滤出下拉选
+//        List<OnlCgformField> onlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType())
+//                        || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//        //过滤出文件类型字段
+//        List<OnlCgformField> onlCgformFieldFileList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//        //文件字段
+//        List<String> FieldFileList = onlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        sourceList.addAll(FieldFileList);
+//
+//        //下拉选字段
+//        List<String> fieldPullList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//
+//        //过滤出树形字段
+//        List<OnlCgformField> treeFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//        Map<String, Object> mapOne = (Map<String, Object>) map.get("mapOne");
+//        Map<String, Object> mapTwo = (Map<String, Object>) map.get("mapTwo");
+//        JSONArray must = new JSONArray();
+//        //处理首次查询条件
+//        if (ObjectUtils.isNotEmpty(mapOne)) {
+//            queryCondition(mapOne, inputFieldList, otherFieldList,dateFieldList, must);
+//        }
+//        //处理二次查询条件
+//        if (ObjectUtils.isNotEmpty(mapTwo)) {
+//            queryCondition(mapTwo, inputFieldList, otherFieldList,dateFieldList, must);
+//        }
+//        //处理ids
+//        JSONArray should = new JSONArray();
+//        String ids = (String) mapTwo.get("ids");
+//        if (StringUtils.isNotBlank(ids)) {
+//            for (String s : ids.split(",")) {
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> queryMapTemp = new HashMap<>();
+//                queryMapTemp.put("id", s);
+//                queryMap.put("match_phrase", queryMapTemp);
+//                should.add(queryMap);
+//            }
+//        }
+//        String orderBy = (String)map.get("orderBy");
+//        String orderByField = (String) map.get("orderByField");
+//        JSONArray jsonArrySort = new JSONArray();
+//        JSONObject sort = new JSONObject();
+//        Map<String,Object> mapSort = new HashMap<>();
+//        Map<String,Object> mapSortTemp = new HashMap<>();
+//        if(StringUtils.isNotBlank(orderBy) && StringUtils.isNotBlank(orderByField)){
+//            //orderBy=1正序,orderBy=1倒序
+//            if("1".equals(orderBy)){
+//                mapSort.put("order","asc");
+//            }else{
+//                mapSort.put("order","desc");
+//            }
+//            if("state".equals(orderByField) || "region".equals(orderByField)){
+//                mapSortTemp.put(orderByField+".keyword",mapSort);
+//            }else{
+//                mapSortTemp.put(orderByField,mapSort);
+//            }
+//        }else{
+//            mapSortTemp.put("issue_time","desc");
+//        }
+//        sort.putAll(mapSortTemp);
+//        jsonArrySort.add(sort);
+//
+//        //封装查询条件
+//        JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(must, null, should);
+//        //1. 封装分页和字段值
+//        JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(sourceList, jsonObject, null, jsonArrySort,
+//                Integer.parseInt(map.get("pageNo").toString())-1, Integer.parseInt(map.get("pageSize").toString()));
+//        //2. 数据查询
+//        JSONObject search = jeroElasticsearchTemplate.search(SearchEnum.INDEX_NAME_DOCUMENT.getValue(),
+//                SearchEnum.TYPE_NAME_DOCUMENT.getValue(), queryObject);
+//
+//
+//        //处理数据字典
+//        List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();//下拉数据字典
+//        List<SysCategory> categoryList = sysCategoryService.list();//树形数据字典
+//        List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
+//        List<Map<String, Object>> mapList = new ArrayList<>();
+//        for (Map<String, Object> stringObjectMap : list) {
+//            Map<String, Object> mapTemp = (Map<String, Object>) stringObjectMap.get("_source");
+//            //处理收藏(已收藏为1,未收藏为0)
+//            LambdaQueryWrapper<OnlCgformCollection> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+//            lambdaQueryWrapper.in(OnlCgformCollection::getDocumentId, mapTemp.get("id"));
+//            List<OnlCgformCollection> collectList = iOnlCgformCollectionService.list(lambdaQueryWrapper);
+//            if (collectList.size() > 0) {
+//                mapTemp.put("collectFlag", "1");
+//            } else {
+//                mapTemp.put("collectFlag", "0");
+//            }
+//            //处理订阅
+//            LambdaQueryWrapper<OnlCgformSubscribe> lambdaQueryWrapperTemp = new LambdaQueryWrapper<>();
+//            lambdaQueryWrapperTemp.in(OnlCgformSubscribe::getDocumentId, mapTemp.get("id"));
+//            List<OnlCgformSubscribe> readList = iOnlCgformSubscribeService.list(lambdaQueryWrapperTemp);
+//            if (readList.size() > 0) {
+//                mapTemp.put("subscribeFlag", "1");
+//            } else {
+//                mapTemp.put("subscribeFlag", "0");
+//            }
+//            //格式化时间字段
+//            solveTime(mapTemp);
+//            mapList.add(mapTemp);
+//            List<OSSFile> fileList = new ArrayList<>();
+//            mapTemp.entrySet().forEach(entry -> {
+//                //下拉选处理数据字典
+//                bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, (String) map.get("cut"),null);
+//
+//                //下拉单选和下拉多选数据字典处理
+//                if (fieldPullList.contains(entry.getKey())) {
+//                    bussDocumentLibraryEOService.dictItem(sysDictItems, entry, (String) map.get("cut"), fieldList,null);
+//                }
+//                //处理文件
+//                if (FieldFileList.contains(entry.getKey())) {
+//                    List<OSSFile> fileInfos = iOSSFileService.getFileInfos((String) entry.getValue());
+//                    if (fileInfos.size() > 0) {
+//                        for (OSSFile fileInfo : fileInfos) {
+//                            fileList.add(fileInfo);
+//                        }
+//                    }
+//                }
+//
+//            });
+//            mapTemp.put("file_name", fileList);
+//        }
+//        IPage page = new Page(Integer.parseInt(map.get("pageNo").toString()), Integer.parseInt(map.get("pageSize").toString()));
+//        page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
+//        page.setRecords(mapList);
+//        return page;
+//    }
+//
+//
+//    private void queryCondition(Map<String, Object> mapOne, List<String> inputFieldList,
+//                                List<String> otherFieldList, List<String> dateFieldList,JSONArray must) {
+//        Map<String, Object> inputMap = new HashMap<>();//条件内容为输入框的
+//        Map<String, Object> otherMap = new HashMap<>();//条件内容为下拉,日期,树形
+//        Map<String, Object> dateMap = new HashMap<>();//条件内容为下拉,树形
+//        //区分输入框和下拉,树形,日期等字段
+//        if (ObjectUtils.isNotEmpty(mapOne)) {
+//            for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+//                String key = entry.getKey();
+//                Object value = entry.getValue();
+//                //处理二次搜索中选择列表数据
+//                if (inputFieldList.contains(key)) {
+//                    inputMap.put(key, value);
+//                }
+//                if (otherFieldList.contains(key)) {
+//                    otherMap.put(key, value);
+//                }
+//                if(dateFieldList.contains(key)){
+//                    dateMap.put(key, value);
+//                }
+//            }
+//        }
+//
+//        //封装输入框查询条件
+//        if (ObjectUtils.isNotEmpty(inputMap)) {
+//            for (Map.Entry<String, Object> entry : inputMap.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    for (String s : value.split(",")) {
+//                        Map<String, Object> map = new HashMap<>();
+//                        Map<String, Object> queryMap = new HashMap<>();
+//                        Map<String, Object> queryMapTemp = new HashMap<>();
+//                        queryMapTemp.put("query", s);
+//                        queryMapTemp.put("minimum_should_match", 2);
+//                        queryMap.put(key, queryMapTemp);
+//                        map.put("match",queryMap);
+//                        must.add(map);
+//                    }
+//                }
+//            }
+//        }
+//        //封装下拉,树形查询条件
+//        if (ObjectUtils.isNotEmpty(otherMap)) {
+//            for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
+//                    Map<String, Object> queryMapNew = new HashMap<>();
+//                    Map<String, Object> queryMapTempNew = new HashMap<>();
+//                    queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*");
+//                    queryMapNew.put("wildcard", queryMapTempNew);
+//                    must.add(queryMapNew);
+//                }else{
+//                    Map<String, Object> map = new HashMap<>();
+//                    Map<String, Object> queryMap = new HashMap<>();
+//                    Map<String, Object> queryMapTemp = new HashMap<>();
+//                    queryMapTemp.put("query", value);
+//                    queryMap.put(key, queryMapTemp);
+//                    map.put("match",queryMap);
+//                    must.add(map);
+//                }
+//            }
+//        }
+//        //封装时间类型字段查询(时间范围)
+//        if (ObjectUtils.isNotEmpty(dateMap)) {
+//            for (Map.Entry<String, Object> entry : dateMap.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> queryMapTemp = new HashMap<>();
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    Map<String, Object> map = new HashMap<>();
+//                    map.put("gte", value.split(",")[0]);
+//                    map.put("lte", value.split(",")[1]);
+//                    map.put("format", "yyyy-MM-dd");
+//                    queryMap.put(key, map);
+//                    queryMapTemp.put("range", queryMap);
+//                    must.add(queryMapTemp);
+//                }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 全文
+//     * @param searchVO
+//     * @return
+//     */
+//    @Override
+//    public IPage getFullTextInfoList(SearchVO searchVO) {
+//        JSONArray queryJsonMustNot = new JSONArray();
+//        if(StringUtils.isNotBlank(searchVO.getSelectValue())){
+//            Map<String,Object> map = new HashMap<>();
+//            Map<String,Object> map1 = new HashMap<>();
+//            Map<String,Object> map2 = new HashMap<>();
+//            map.put("query",SEARCH_FLAG);
+//            map1.put("flag",map);
+//            map2.put("match",map1);
+//            queryJsonMustNot.add(map2);
+//        }
+//        if(StringUtils.isBlank(searchVO.getSelectValue())){
+//            searchVO.setSelectValue(SEARCH_FLAG);
+//        }
+//
+//        //判断索引是否存在
+//        boolean flagTemp = true;
+//        if(CutEnum.CN.getValue().equals(searchVO.getCut())){
+//            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_CN.getValue());
+//        }else{
+//            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_EN.getValue());
+//        }
+//
+//        if (!flagTemp) {
+//            return new Page(searchVO.getPageNo(), searchVO.getPageSize());
+//        }
+//        String selectValue = searchVO.getSelectValue();
+//        String selectValueTwo = searchVO.getSelectValueTwo();
+//        //1. 需要查询的字段
+//        List<String> fieldList = new ArrayList<>();
+//        fieldList.add("serial_number");//权重6
+//        fieldList.add("title");//权重5
+//        fieldList.add("file_text");//权重4
+//        fieldList.add("content");//权重3
+//        fieldList.add("file_name");//权重2
+//        fieldList.add("module_type");
+//        fieldList.add("id");
+//        fieldList.add("flag");
+//
+//        JSONArray queryMapJson = new JSONArray();
+//        JSONArray queryMapJsonTwo = new JSONArray();
+//        JSONArray queryMapJsonThree = new JSONArray();
+//        JSONArray queryMapJsonAll = new JSONArray();
+//
+//        Map<String,Object> mapHighlight = new HashMap<>();
+//        Map<String,Object> mapHighlight1 = new HashMap<>();
+//        //封装首次的条件
+//        if (StringUtils.isNotBlank(selectValue)) {
+//            for (String field : fieldList) {
+//                Map<String, Object> map2 = new HashMap<>();
+//                Map<String, Object> map3 = new HashMap<>();
+//                Map<String, Object> map4 = new HashMap<>();
+//                map3.put("query",selectValue);
+//                map3.put("minimum_should_match",2);
+////                if("serial_number".equals(field)){
+////                    map3.put("boost",6);
+////                }else if("title".equals(field)){
+////                    map3.put("boost",5);
+////                }else if("file_text".equals(field)){
+////                    map3.put("boost",4);
+////                }else if("content".equals(field)){
+////                    map3.put("boost",3);
+////                }else if("file_name".equals(field)){
+////                    map3.put("boost",2);
+////                }
+//                map2.put(field, map3);
+//                map4.put("match",map2);
+//                queryMapJson.add(map4);
+//                //高亮
+//                if(!"flag".equals(field)){
+//                    highlight(mapHighlight, field);
+//                }
+//            }
+//            mapHighlight1.put("fields",mapHighlight);
+//        }
+//        if(CollectionUtils.isNotEmpty(queryMapJson)){
+//            JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJson);
+//            queryMapJsonAll.add(jsonObject);
+//        }
+//        //封装二次的条件
+//        if (StringUtils.isNotBlank(selectValueTwo)) {
+//            for (String field : fieldList) {
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> map2 = new HashMap<>();
+//                Map<String, Object> map3 = new HashMap<>();
+//                map3.put("query",selectValueTwo);
+//                map3.put("minimum_should_match",2);
+//                map2.put(field, map3);
+//                queryMap.put("match", map2);
+//                queryMapJsonTwo.add(queryMap);
+//                //高亮
+//                if(!"flag".equals(field)){
+//                    highlight(mapHighlight, field);
+//                }
+//            }
+//            mapHighlight1.put("fields",mapHighlight);
+//        }
+//        if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
+//            JSONObject jsonObjectTwo = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonTwo);
+//            queryMapJsonAll.add(jsonObjectTwo);
+//        }
+//        //ids进行三次封装
+//        if (StringUtils.isNotBlank(searchVO.getIds())) {
+//            for (String s : searchVO.getIds().split(",")) {
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> queryMapTemp = new HashMap<>();
+//                queryMapTemp.put("id", s);
+//                queryMap.put("match_phrase", queryMapTemp);
+//                queryMapJsonThree.add(queryMap);
+//            }
+//        }
+//        if(CollectionUtils.isNotEmpty(queryMapJsonThree)){
+//            JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree);
+//            queryMapJsonAll.add(jsonObjectThree);
+//        }
+//        JSONObject sort = new JSONObject();
+//        Map<String,Object> score = new HashMap<>();
+//        Map<String,Object> score1 = new HashMap<>();
+//        score.put("order","desc");
+//        score1.put("_score",score);
+//        sort.putAll(score1);
+//
+////        Map<String,Object> mapSort = new HashMap<>();
+////        Map<String,Object> mapSortTemp = new HashMap<>();
+////        mapSort.put("order","asc");
+////        mapSortTemp.put("file_sort.keyword",mapSort);
+////        sort.putAll(mapSortTemp);
+//
+//        Integer pageNo = searchVO.getPageNo();
+//        Integer pageSize = searchVO.getPageSize();
+//        IPage page = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null,
+//                pageNo, pageSize, null,searchVO.getCut(),sort,queryJsonMustNot);
+//        return page;
+//    }
+//
+//    @NotNull
+//    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map<String,Object> highlightMap,
+//                           JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag,
+//                           String cut,JSONObject querySort,JSONArray queryMustNot) {
+//        JSONObject jsonObject = new JSONObject();
+//        //基础添加封装
+//        if ("paragraphFlag".equals(paragraphFlag)) {
+//            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null);
+//        } else {
+//            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, queryMustNot, null);
+//        }
+//        JSONArray jsonArraySort = new JSONArray();
+//        jsonArraySort.add(querySort);
+//
+//        //1. 条件,分页
+//        JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null,
+//                jsonObject,
+//                highlightMap,
+//                jsonArraySort,
+//                pageNo-1,
+//                pageSize);
+//        //2. 数据查询
+//        JSONObject search = new JSONObject();
+//        if(CutEnum.CN.getValue().equals(cut)){
+//            search = jeroElasticsearchTemplate.search(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+//                    SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+//                    queryObject);
+//        }else{
+//            search = jeroElasticsearchTemplate.search(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+//                    SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+//                    queryObject);
+//        }
+//
+//        List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
+//        List<Map<String, Object>> mapList = new ArrayList<>();
+//        for (Map<String, Object> map : list) {
+//            Map<String, Object> mapSource = (Map<String, Object>) map.get("_source");
+//            Map<String, Object> mapHighlight = (Map<String, Object>) map.get("highlight");
+//            if(ObjectUtils.isNotEmpty(mapHighlight)){
+//                for (Map.Entry<String, Object> entry : mapHighlight.entrySet()) {
+//                    String key = entry.getKey();
+//                    List<String> value = (List<String>) entry.getValue();
+//                    String  fieldConyent= "";
+//                    for (String s : value) {
+//                        fieldConyent += s;
+//                    }
+//                    mapSource.put(key,fieldConyent);
+////                    String key = entry.getKey();
+////                    List<String> value = (List<String>) entry.getValue();
+////                    if(value.size() != 0){
+////                        String  fieldContent= value.get(0);
+////                        mapSource.put(key,fieldContent);
+////                    }
+//                }
+//            }
+//            mapList.add(mapSource);
+//        }
+//
+//        //处理分页
+//        IPage page = new Page(pageNo, pageSize);
+//        if (StringUtils.isNotBlank(selectValueTwo)) {
+//            //二次搜索的结果
+//            page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
+//            page.setRecords(mapList);
+//        } else {
+//            //首次搜索的结果
+//            page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
+//            page.setRecords(mapList);
+//        }
+//        return page;
+//    }
+////    @NotNull
+////    private IPage getiPage(String selectValue, String selectValueTwo, JSONArray queryMapJson,Map<String,Object> highlightMap,
+////                           JSONArray should, Integer pageNo, Integer pageSize, String paragraphFlag,
+////                           String cut,JSONObject querySort) {
+////        JSONObject jsonObject = new JSONObject();
+////        //基础添加封装
+////        if ("paragraphFlag".equals(paragraphFlag)) {
+////            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+////        } else {
+////            jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+////        }
+////        JSONArray jsonArraySort = new JSONArray();
+////        jsonArraySort.add(querySort);
+////
+////        //1. 条件,分页
+////        JSONObject queryObject = jeroElasticsearchTemplate.buildQuery(null,
+////                jsonObject,
+////                highlightMap,
+////                jsonArraySort,
+////                pageNo-1,
+////                pageSize);
+////        //2. 数据查询
+////        JSONObject search = new JSONObject();
+////        if(CutEnum.CN.getValue().equals(cut)){
+////            search = jeroElasticsearchTemplate.search(SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+////                    SearchEnum.FULL_TEXT_SEARCH_CN.getValue(),
+////                    queryObject);
+////        }else{
+////            search = jeroElasticsearchTemplate.search(SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+////                    SearchEnum.FULL_TEXT_SEARCH_EN.getValue(),
+////                    queryObject);
+////        }
+////
+////        List<Map<String, Object>> list = (List<Map<String, Object>>) (((Map) search.get("hits")).get("hits"));
+////
+////        //首次搜索结果
+////        List<Map<String, Object>> mapList = new ArrayList<>();
+////        //二次搜索结果
+////        List<Map<String, Object>> mapListTwo = new ArrayList<>();
+////
+////        for (Map<String, Object> stringObjectMap : list) {
+////            Map<String, Object> mapSource = (Map<String, Object>) stringObjectMap.get("_source");
+////            if(StringUtils.isBlank(selectValue)){
+////                mapSource.put("file_text","");
+////            }
+////            if (StringUtils.isNotBlank(selectValueTwo)) {
+////                //二次查询
+////                int count = 0;
+////                for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
+////                    String valueHighlight = "";
+////                    String value = (String) entry.getValue();
+////                    //判断value中是否包含二次搜索中的字符
+////                    if(StringUtils.isNotBlank(value)){
+////                        if(value.contains(selectValueTwo)){
+////                            value = subFileText(value, selectValueTwo);
+////                            count++;
+////                            String replacementTwo = "<text class='highlight-class'>" + selectValueTwo + "</text>";
+////                            valueHighlight = value.replaceAll(selectValueTwo, replacementTwo);
+////                            //第一次搜索的也高亮
+////                            if(value.contains(selectValue) && !selectValueTwo.contains(selectValue)){
+////                                String replacementOne = "<text class='highlight-class'>" + selectValue + "</text>";
+////                                valueHighlight = valueHighlight.replaceAll(selectValue,replacementOne);
+////                            }
+////                            if (ObjectUtils.isNotEmpty(valueHighlight)) {
+////                                entry.setValue(valueHighlight);
+////                            }
+////                        }else{
+////                            //第二次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
+//////                            if ("file_text".equals(entry.getKey())) {
+//////                                entry.setValue("");
+//////                                value = "";
+//////                            }
+//////                            count++;
+////                        }
+////                    }
+////                }
+////                if (count > 0) {
+////                    mapListTwo.add(mapSource);
+////                }
+////            } else {
+////                //首次查询(没有输入查询条件)
+////                mapList.add(mapSource);
+////                //处理高亮module_type,title,serial_number,file_text(输入查询条件后,处理高亮字段)
+////                if (StringUtils.isNotBlank(selectValue)) {
+////                    for (Map.Entry<String, Object> entry : mapSource.entrySet()) {
+////                        String key = entry.getKey();
+////                        String value = String.valueOf(entry.getValue());
+//////                        StringBuilder sb = new StringBuilder();
+////                        String valueHighlight = "";
+////                        if (StringUtils.isNotBlank(value)) {
+////                            //file_text需要单独处理(截取第一处高亮的前后100个字符)
+////                            if ("file_text".equals(key)) {
+////                                //判断value中是否包含搜索中的字符
+////                                for (String s : selectValue.split(" ")) {
+////                                    if(value.contains(s)){
+////                                        //截取第一处高亮的前后100个字符
+////                                        value = subFileText(value, s);
+////                                        break;
+////                                    }else{
+////                                        //第一次搜索的时候file_text中不包含搜索条件的时候将file_text赋值空(此时展示拼接的内容)
+////                                        entry.setValue("");
+////                                        value = "";
+////                                    }
+////                                }
+////                            }
+////                            if ("content".equals(key)) {
+////                                for (String s : selectValue.split(" ")) {
+////                                    if(value.contains(s)){
+////                                        value = subFileText(value, s);
+////                                        break;
+////                                    }
+////                                }
+////                            }
+////                            for (String s : selectValue.split(" ")) {
+////                                String replacement = "<text class='highlight-class'>" + s + "</text>";
+////                                value = value.replaceAll(s, replacement);
+////                            }
+////
+//////                            String replacement = "<text class='highlight-class'>" + selectValue + "</text>";
+//////                            valueHighlight = value.replaceAll(selectValue, replacement);
+////                        }
+////                        if (ObjectUtils.isNotEmpty(value)) {
+////                            entry.setValue(value);
+////                        }
+////                    }
+////                }
+////            }
+////        }
+////
+////        //处理分页
+////        IPage page = new Page(pageNo, pageSize);
+////        if (StringUtils.isNotBlank(selectValueTwo)) {
+////            //二次搜索的结果
+////            page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
+////            page.setRecords(mapListTwo);
+////        } else {
+////            //首次搜索的结果
+////            page.setTotal(Long.parseLong(String.valueOf(((Map) search.get("hits")).get("total"))));
+////            page.setRecords(mapList);
+////        }
+////        return page;
+////    }
+//
+//    private String subFileText(String fileTextInfo, String selectValue) {
+//        int i = fileTextInfo.indexOf(selectValue);
+//        String start = "";
+//        String end = "";
+//        if(i <100 && (fileTextInfo.length() - i) <100){
+//            start = fileTextInfo.substring(0,i);
+//            end = fileTextInfo.substring(i, fileTextInfo.length());
+//        }else if(i <100 && (fileTextInfo.length() - i) >= 100){
+//            start = fileTextInfo.substring(0, i);
+//            end = fileTextInfo.substring(i, i+100);
+//        }else if(i >= 100 && (fileTextInfo.length() - i) >= 100){
+//            start = fileTextInfo.substring(i-100, i);
+//            end = fileTextInfo.substring(i, i+100);
+//        }else if(i >= 100 && (fileTextInfo.length() - i) < 100){
+//            start = fileTextInfo.substring(i-100, i);
+//            end = fileTextInfo.substring(i, fileTextInfo.length());
+//        }
+//        String result = start + end;
+//        return result;
+//    }
+//    private String getFileText(String fileTextInfo, String selectValue) {
+//        String beginStr = "";
+//        String endStr = "";
+//        for (int i = 0; i < fileTextInfo.length(); i++) {
+//            String chStr = String.valueOf(fileTextInfo.charAt(i));
+//            if (selectValue.contains(chStr)) {
+//                if (i >= 100) {
+//                    int begin = i - 100;
+//                    beginStr = fileTextInfo.substring(begin, i);
+//                    int b = 0;
+//                } else {
+//                    beginStr = fileTextInfo.substring(0, i);
+//                }
+//                int index = fileTextInfo.length() - i;
+//                if (index <= 100) {
+//                    endStr = fileTextInfo.substring(i, fileTextInfo.length());
+//                } else {
+//                    endStr = fileTextInfo.substring(i, i + 100);
+//                }
+//                break;
+//            }
+//        }
+//        String result = beginStr + endStr;
+//        return result;
+//    }
+//
+//    private boolean judgeContains(String oldStr, String newStr) {
+//        if (StringUtils.isBlank(oldStr) || StringUtils.isBlank(newStr)) {
+//            return false;
+//        }
+//        int count = 0;
+//        for (int i = 0; i < newStr.length(); i++) {
+//            String chStr = String.valueOf(newStr.charAt(i));
+//            if (oldStr.contains(chStr)) {
+//                count++;
+//            }
+//        }
+//        if (count > 0) {
+//            return true;
+//        } else {
+//            return false;
+//        }
+//    }
+//
+//
+//    private void solveTime(Map<String, Object> mapTemp) {
+//        String implementTime = (String) mapTemp.get("implement_time");
+//        String issueTime = (String) mapTemp.get("issue_time");
+//        if (StringUtils.isNotBlank(implementTime)) {
+//            mapTemp.put("implement_time", implementTime.split(" ")[0]);
+//        }
+//        if (StringUtils.isNotBlank(issueTime)) {
+//            mapTemp.put("issue_time", issueTime.split(" ")[0]);
+//        }
+//    }
+//
+//    @Override
+//    public void deleteById(String ids) {
+//        for (String id : ids.split(",")) {
+//            jeroElasticsearchTemplate.delete(SearchEnum.INDEX_NAME_DOCUMENT.getValue(), SearchEnum.TYPE_NAME_DOCUMENT.getValue(), id);
+//        }
+//    }
+//
+//    @Override
+//    public void deleteAll() {
+//        jeroElasticsearchTemplate.removeIndex(SearchEnum.INDEX_NAME_DOCUMENT.getValue());
+//        jeroElasticsearchTemplate.removeIndex(SearchEnum.FULL_TEXT_SEARCH_CN.getValue());
+//        jeroElasticsearchTemplate.removeIndex(SearchEnum.FULL_TEXT_SEARCH_EN.getValue());
+//    }
+//
+//
+//    /**
+//     * 查询段落
+//     *
+//     * @param map
+//     * @return
+//     */
+//    @Override
+//    public IPage getParagraphInfoList(Map<String, Object> map) {
+//        if(ObjectUtils.isEmpty(map.get("mapOne"))){
+//            ((Map<String, Object>) map.get("mapOne")).put("flag",SEARCH_FLAG);
+//        }
+//        String cut = (String) map.get("cut");
+//        //module_type  代表文档库的段落
+//        //判断索引是否存在
+//        boolean flagTemp = true;
+//        if(CutEnum.CN.getValue().equals(cut)){
+//            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_CN.getValue());
+//        }else{
+//            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_EN.getValue());
+//        }
+//        if (!flagTemp) {
+//            return new Page(Integer.parseInt(map.get("pageNo").toString()), Integer.parseInt(map.get("pageSize").toString()));
+//        }
+//        //文档库所有的字段
+//        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+//        //输入框字段
+//        List<OnlCgformField> inputOnlCgformFieldList = fieldList.stream()
+//                .filter(e -> FieldTypeEnum.TEXT_STRING.getValue().equals(e.getFieldShowType())
+//                        || FieldTypeEnum.TEXT_NUMBER.getValue().equals(e.getFieldShowType()))
+//                .collect(Collectors.toList());
+//        List<String> inputFieldList = inputOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+//        inputFieldList.add("file_text");//在输入框的类型中添加正文字段
+//        inputFieldList.add("flag");//标识(默认展示基础数据,不展示文件数据)
+//
+//
+//        Map<String, Object> mapOne = (Map<String, Object>) map.get("mapOne");
+//        Map<String, Object> mapTwo = (Map<String, Object>) map.get("mapTwo");
+//
+//        JSONArray queryMapJson = new JSONArray();
+//        JSONArray queryMapJsonTemp = new JSONArray();
+//        JSONArray queryMapJsonTwo = new JSONArray();
+//        JSONArray queryMapJsonThree = new JSONArray();
+//        JSONArray queryMapJsonAll = new JSONArray();
+//        //首次查询条件
+//        if (ObjectUtils.isNotEmpty(mapOne)) {
+//            if(StringUtils.isNotBlank((String)mapOne.get("title"))
+//                    || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> queryMapTemp = new HashMap<>();
+//                queryMapTemp.put("flag",SEARCH_FLAG );
+//                queryMap.put("match_phrase", queryMapTemp);
+//                queryMapJsonTemp.add(queryMap);
+//            }
+//            for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    for (String s : value.split(",")) {
+//                        Map<String, Object> queryMap = new HashMap<>();
+//                        Map<String, Object> queryMapTemp = new HashMap<>();
+//                        Map<String, Object> queryMap3 = new HashMap<>();
+//                        queryMap3.put("query",s);
+//                        queryMap3.put("minimum_should_match",2);
+//                        queryMapTemp.put(key, queryMap3);
+//                        queryMap.put("match", queryMapTemp);
+//                        queryMapJson.add(queryMap);
+//                    }
+//                }
+//            }
+//            if(CollectionUtils.isNotEmpty(queryMapJsonTemp)){
+//                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTemp, null, null);
+//                queryMapJsonAll.add(jsonObject);
+//            }
+//            if(CollectionUtils.isNotEmpty(queryMapJson)){
+//                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+//                queryMapJsonAll.add(jsonObject);
+//            }
+//        }
+//
+//        String ids = (String) mapTwo.get("ids");
+//        //二次查询条件
+//        if (ObjectUtils.isNotEmpty(mapTwo)) {
+//            mapTwo.remove("ids");
+//            for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
+//                String key = entry.getKey();
+//                String value = (String) entry.getValue();
+//                if (ObjectUtils.isNotEmpty(value)) {
+//                    for (String s : value.split(",")) {
+//                        Map<String, Object> queryMap = new HashMap<>();
+//                        Map<String, Object> queryMapTemp = new HashMap<>();
+//                        Map<String, Object> queryMap3 = new HashMap<>();
+//                        queryMap3.put("query",s);
+//                        queryMap3.put("minimum_should_match",2);
+//                        queryMapTemp.put(key, queryMap3);
+//                        queryMap.put("match", queryMapTemp);
+//                        queryMapJsonTwo.add(queryMap);
+//                    }
+//                }
+//            }
+//            if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
+//                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTwo, null, null);
+//                queryMapJsonAll.add(jsonObject);
+//            }
+//        }
+//
+//        //ids查询条件
+//        if (StringUtils.isNotBlank(ids)) {
+//            for (String s : ids.split(",")) {
+//                Map<String, Object> queryMap = new HashMap<>();
+//                Map<String, Object> queryMapTemp = new HashMap<>();
+//                queryMapTemp.put("id", s);
+//                queryMap.put("match_phrase", queryMapTemp);
+//                queryMapJsonThree.add(queryMap);
+//            }
+//        }
+//        if(CollectionUtils.isNotEmpty(queryMapJsonThree)){
+//            JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree);
+//            queryMapJsonAll.add(jsonObject);
+//        }
+//
+//        //排序
+//        JSONObject sort = new JSONObject();
+////        Map<String,Object> mapSort = new HashMap<>();
+////        Map<String,Object> mapSortTemp = new HashMap<>();
+////        mapSort.put("order","asc");
+////        mapSortTemp.put("file_sort.keyword",mapSort);
+////        sort.putAll(mapSortTemp);
+//
+//        Map<String,Object> score = new HashMap<>();
+//        Map<String,Object> score1 = new HashMap<>();
+//        score.put("order","desc");
+//        score1.put("_score",score);
+//        sort.putAll(score1);
+//
+//        int pageNo = Integer.parseInt(map.get("pageNo").toString());
+//        int pageSize = Integer.parseInt(map.get("pageSize").toString());
+//        //判断第一次传参和第二次传参  inputFieldList
+//        String selectValue = "";
+//        String selectValueTwo = "";
+//        Map<String,Object> mapHighlight = new HashMap<>();
+//        Map<String,Object> mapHighlight1 = new HashMap<>();
+//        for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+//            String key = entry.getKey();
+//            String value = (String) entry.getValue();
+//            if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
+//                selectValue = value;
+//                highlight(mapHighlight, key);
+//            }
+//            mapHighlight1.put("fields",mapHighlight);
+//        }
+//        for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
+//            String key = entry.getKey();
+//            String value = (String) entry.getValue();
+//            if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
+//                selectValueTwo = value;
+//                highlight(mapHighlight, key);
+//            }
+//            mapHighlight1.put("fields",mapHighlight);
+//        }
+//        //段落的标识
+//        String paragraphFlag = "paragraphFlag";
+//
+//
+//        IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, mapHighlight1,null,
+//                pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort,null);
+//        return iPage;
+//    }
+//
+//    private void highlight(Map<String, Object> mapHighlight, String key) {
+//        Map<String, Object> mapTemp = new HashMap<>();
+//        List<String> list = new ArrayList<>();
+//        list.add("<text class='highlight-class'>");
+//        List<String> list1 = new ArrayList<>();
+//        list1.add("</text>");
+//        mapTemp.put("pre_tags", list);
+//        mapTemp.put("post_tags", list1);
+//        mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200
+//        mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
+//        mapTemp.put("type", "plain");
+//        mapHighlight.put(key, mapTemp);
+//    }
+////    @Override
+////    public IPage getParagraphInfoList(Map<String, Object> map) {
+////        if(ObjectUtils.isEmpty(map.get("mapOne"))){
+////            ((Map<String, Object>) map.get("mapOne")).put("flag",SEARCH_FLAG);
+////        }
+////        String cut = (String) map.get("cut");
+////        //module_type  代表文档库的段落
+////        //判断索引是否存在
+////        boolean flagTemp = true;
+////        if(CutEnum.CN.getValue().equals(cut)){
+////            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_CN.getValue());
+////        }else{
+////            flagTemp = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_EN.getValue());
+////        }
+////        if (!flagTemp) {
+////            return new Page(Integer.parseInt(map.get("pageNo").toString()), Integer.parseInt(map.get("pageSize").toString()));
+////        }
+////        //文档库所有的字段
+////        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
+////        //输入框字段
+////        List<OnlCgformField> inputOnlCgformFieldList = fieldList.stream()
+////                .filter(e -> FieldTypeEnum.TEXT_STRING.getValue().equals(e.getFieldShowType())
+////                        || FieldTypeEnum.TEXT_NUMBER.getValue().equals(e.getFieldShowType()))
+////                .collect(Collectors.toList());
+////        List<String> inputFieldList = inputOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+////        inputFieldList.add("file_text");//在输入框的类型中添加正文字段
+////        inputFieldList.add("flag");//标识(默认展示基础数据,不展示文件数据)
+////
+////
+////        Map<String, Object> mapOne = (Map<String, Object>) map.get("mapOne");
+////        Map<String, Object> mapTwo = (Map<String, Object>) map.get("mapTwo");
+////
+////        JSONArray queryMapJson = new JSONArray();
+////        JSONArray queryMapJsonTemp = new JSONArray();
+////        JSONArray queryMapJsonTwo = new JSONArray();
+////        JSONArray queryMapJsonThree = new JSONArray();
+////        JSONArray queryMapJsonAll = new JSONArray();
+////        //首次查询条件
+////        if (ObjectUtils.isNotEmpty(mapOne)) {
+////            if(StringUtils.isNotBlank((String)mapOne.get("title"))
+////                    || StringUtils.isNotBlank((String)mapOne.get("serial_number"))){
+////                Map<String, Object> queryMap = new HashMap<>();
+////                Map<String, Object> queryMapTemp = new HashMap<>();
+////                queryMapTemp.put("flag",SEARCH_FLAG );
+////                queryMap.put("match_phrase", queryMapTemp);
+////                queryMapJsonTemp.add(queryMap);
+////            }
+////            for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+////                String key = entry.getKey();
+////                String value = (String) entry.getValue();
+////                if (ObjectUtils.isNotEmpty(value)) {
+////                    for (String s : value.split(",")) {
+////                        Map<String, Object> queryMap = new HashMap<>();
+////                        Map<String, Object> queryMapTemp = new HashMap<>();
+////                        Map<String, Object> queryMap3 = new HashMap<>();
+////                        queryMap3.put("query",s);
+////                        queryMap3.put("minimum_should_match",2);
+////                        queryMapTemp.put(key, queryMap3);
+////                        queryMap.put("match", queryMapTemp);
+////                        queryMapJson.add(queryMap);
+////                    }
+//////                    for (String s : value.split(",")) {
+//////                        Map<String, Object> queryMap = new HashMap<>();
+//////                        Map<String, Object> queryMapTemp = new HashMap<>();
+//////                        Map<String, Object> queryMap3 = new HashMap<>();
+//////                        queryMap3.put("query",s);
+//////                        queryMap3.put("slop",1);
+//////                        queryMapTemp.put(key, queryMap3);
+//////                        queryMap.put("match_phrase", queryMapTemp);
+//////                        queryMapJson.add(queryMap);
+//////                    }
+////                }
+////            }
+////            if(CollectionUtils.isNotEmpty(queryMapJsonTemp)){
+////                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTemp, null, null);
+////                queryMapJsonAll.add(jsonObject);
+////            }
+////            if(CollectionUtils.isNotEmpty(queryMapJson)){
+////                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJson, null, null);
+////                queryMapJsonAll.add(jsonObject);
+////            }
+////        }
+////
+////        String ids = (String) mapTwo.get("ids");
+////        //二次查询条件
+////        if (ObjectUtils.isNotEmpty(mapTwo)) {
+////            mapTwo.remove("ids");
+////            for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
+////                String key = entry.getKey();
+////                String value = (String) entry.getValue();
+////                if (ObjectUtils.isNotEmpty(value)) {
+////                    for (String s : value.split(",")) {
+////                        Map<String, Object> queryMap = new HashMap<>();
+////                        Map<String, Object> queryMapTemp = new HashMap<>();
+////                        Map<String, Object> queryMap3 = new HashMap<>();
+////                        queryMap3.put("query",s);
+////                        queryMap3.put("minimum_should_match",2);
+////                        queryMapTemp.put(key, queryMap3);
+////                        queryMap.put("match", queryMapTemp);
+////                        queryMapJsonTwo.add(queryMap);
+////                    }
+//////                    for (String s : value.split(",")) {
+//////                        Map<String, Object> queryMap = new HashMap<>();
+//////                        Map<String, Object> queryMapTemp = new HashMap<>();
+//////                        Map<String, Object> queryMap3 = new HashMap<>();
+//////                        queryMap3.put("query",s);
+//////                        queryMap3.put("slop",1);
+//////                        queryMapTemp.put(key, queryMap3);
+//////                        queryMap.put("match_phrase", queryMapTemp);
+//////                        queryMapJsonTwo.add(queryMap);
+//////                    }
+////                }
+////            }
+////            if(CollectionUtils.isNotEmpty(queryMapJsonTwo)){
+////                JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(queryMapJsonTwo, null, null);
+////                queryMapJsonAll.add(jsonObject);
+////            }
+////        }
+////
+////        //ids查询条件
+////        if (StringUtils.isNotBlank(ids)) {
+////            for (String s : ids.split(",")) {
+////                Map<String, Object> queryMap = new HashMap<>();
+////                Map<String, Object> queryMapTemp = new HashMap<>();
+////                queryMapTemp.put("id", s);
+////                queryMap.put("match_phrase", queryMapTemp);
+////                queryMapJsonThree.add(queryMap);
+////            }
+////        }
+////        if(CollectionUtils.isNotEmpty(queryMapJsonThree)){
+////            JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree);
+////            queryMapJsonAll.add(jsonObject);
+////        }
+////
+////        //排序
+////        JSONObject sort = new JSONObject();
+////        Map<String,Object> mapSort = new HashMap<>();
+////        Map<String,Object> mapSortTemp = new HashMap<>();
+////        mapSort.put("order","asc");
+////        mapSortTemp.put("file_sort.keyword",mapSort);
+////        sort.putAll(mapSortTemp);
+////
+////        int pageNo = Integer.parseInt(map.get("pageNo").toString());
+////        int pageSize = Integer.parseInt(map.get("pageSize").toString());
+////        //判断第一次传参和第二次传参  inputFieldList
+////        String selectValue = "";
+////        String selectValueTwo = "";
+////        for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
+////            String key = entry.getKey();
+////            String value = (String) entry.getValue();
+////            if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
+////                selectValue = value;
+////            }
+////        }
+////        for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
+////            String key = entry.getKey();
+////            String value = (String) entry.getValue();
+////            if (inputFieldList.contains(key) && StringUtils.isNotBlank(value)) {
+////                selectValueTwo = value;
+////            }
+////        }
+////        //段落的标识
+////        String paragraphFlag = "paragraphFlag";
+////
+////
+////        IPage iPage = getiPage(selectValue, selectValueTwo, queryMapJsonAll, null,null, pageNo, pageSize, paragraphFlag,(String) map.get("cut"),sort);
+////        return iPage;
+////    }
+//
+//}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
index 8e091a1da..d5961d3c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java
@@ -335,7 +335,7 @@ public class LawsWarnService {
         String title = content;
 
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue());
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
index c6b2e871c..25083ab1e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java
@@ -152,7 +152,7 @@ public class TimedTaskWarn implements Job {
     private void sendMessage(String title, String content,String contentInfo,String contentFeiShu, String url, List<String> userIdList, List<String> thirdIdList) {
         //站内消息
         //封装消息的实体类
-        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.WARN.getValue());
+        SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, title, content, contentInfo,MessageTypeEnum.WARN.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
         bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content);
 
diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index b9ecf2551..a5ed87aac 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -142,7 +142,40 @@
   .itemModel-multi .ant-form-explain, .ant-form-extra {
     margin-top: -10px;
   }
-  .anticon-exclamation-circle{
-     display: none!important;
+
+
+  .anticon-exclamation-circle {
+    display: none !important;
+  }
+
+  .ant-select-selection--single {
+    height: 38px !important;
+  }
+
+  .ant-select-selection--multiple {
+    height: 38px !important;
+  }
+
+  .ant-select-selection__rendered {
+    line-height: 38px !important;
+    height: 38px !important;
+  }
+
+  .ant-select-selection--multiple .ant-select-selection__rendered > ul > li {
+    margin-top: 6px;
+  }
+
+  .ant-calendar-picker {
+    line-height: 38px !important;
+    height: 38px !important;
+  }
+
+  .ant-calendar-picker-input {
+    height: 38px !important;
+  }
+
+  .ant-input-number-input-wrap {
+    line-height: 38px !important;
+    height: 38px !important;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js
index eebd43e55..beaf0974f 100644
--- a/jero-web/src/api/manage.js
+++ b/jero-web/src/api/manage.js
@@ -134,7 +134,14 @@ export function downFile(url, parameter) {
     responseType: 'blob'
   })
 }
-
+export function downFilePost(url, parameter) {
+  return axios({
+    url: url,
+    data: parameter,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
 /**
  * 下载文件
  * @param url 文件路径
@@ -226,6 +233,85 @@ export function downloadFile(url, fileName, parameter, callback) {
   })
 }
 
+export function downloadFilePost(url, fileName, parameter, callback) {
+  let langCn = localStorage.language
+// 默认中文
+  let isTrue
+  if (langCn == 'en-us') {
+    isTrue = true
+  } else if (langCn == 'zh-cn') {
+    isTrue = false
+  }
+  index.showDrawer({
+    loading: true,
+    isTrue: isTrue
+  })
+  return downFilePost(url, parameter).then((data) => {
+    let fileReader = new FileReader()
+    fileReader.onload = function(event) {
+      try {
+        let jsonData = JSON.parse(event.target.result)
+        if (jsonData.message.includes('token')) {
+          index.showDrawer({
+            loading: false,
+            isTrue: isTrue
+          })
+          Modal.error({
+            title: '登录已过期',
+            content: '很抱歉，登录已过期，请重新登录',
+            okText: '重新登录',
+            mask: false,
+            onOk: () => {
+              store.dispatch('Logout').then(() => {
+                Vue.ls.remove(ACCESS_TOKEN)
+                try {
+                  let path = window.document.location.pathname
+                  if (path != '/' && path.indexOf('/user/login') == -1) {
+                    window.location.reload()
+                  }
+                } catch (e) {
+                  window.location.reload()
+                }
+              })
+            }
+          })
+        } else {
+          if (!jsonData.success) {
+            index.showDrawer({
+              loading: false,
+              isTrue: isTrue
+            })
+            Vue.prototype['$message'].warning(jsonData.message)
+          }
+        }
+      } catch (e) {
+        if (!data || data.size === 0) {
+          Vue.prototype['$message'].warning('文件下载失败')
+          return
+        }
+        if (typeof window.navigator.msSaveBlob !== 'undefined') {
+          window.navigator.msSaveBlob(new Blob([data]), fileName)
+        } else {
+          let url = window.URL.createObjectURL(new Blob([data]))
+          let link = document.createElement('a')
+          link.style.display = 'none'
+          link.href = url
+          link.setAttribute('download', fileName)
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        }
+        index.showDrawer({
+          loading: false,
+          isTrue: isTrue
+        })
+        callback && callback()
+      }
+    }
+    fileReader.readAsText(data)
+  })
+}
 /**
  * 文件上传 用于富文本上传图片
  * @param url
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index e103b6d61..fbec2b870 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -6,7 +6,7 @@ module.exports = {
   pleaseSelect: 'Please Select',
   male: 'Male',
   female: 'Female',
-  RealName: 'User name',
+  RealName: 'User Name',
   pleaseEnter: 'Please Enter',
   phoneNumber: 'Phone Number',
   query: 'Search',
@@ -23,7 +23,7 @@ module.exports = {
   recycleBin: 'Recycle Bin',
   delete: 'Delete',
   thaw: 'Thaw',
-  batchOperation: 'Batch operation',
+  batchOperation: 'Batch Operation',
   selected: 'Selected',
   term: 'Term',
   empty: 'Empty',
@@ -37,16 +37,16 @@ module.exports = {
   freezePasManagementPage: 'This is the user management page?',
   serialNumber: 'Number',
   userAccount: 'User Account',
-  userName: 'User name',
-  department: 'Department',
+  userName: 'User Name',
+  Department: 'Department',
   status: 'Status',
-  operation: 'Operation',
+  Operation: 'Operation',
   aRcord: 'A Rcord',
-  operationAllowedAccount: 'This operation is not allowed for administrator account, please select again!',
+  OperationAllowedAccount: 'This Operation is not Allowed for administrator account, please select again!',
   confirm: 'Confirm',
   selectedAccount: 'Selected account?',
   whether: 'Whether',
-  adminDoNotAllowOperation: 'The administrator account does not allow this operation!',
+  adminDoNotAllowOperation: 'The administrator account does not Allow this Operation!',
   advancedQuery: 'Advanced Search',
   constructor: 'Constructor',
   advancedQueryEffective: 'Advanced Search criteria are already effective',
@@ -56,12 +56,12 @@ module.exports = {
   no: 'No',
   click: 'Click',
   add: 'Add',
-  FilterMatching: 'Filter condition matching',
-  AllMatching: '(All conditions require matching)',
+  FilterMatching: 'Filter Conditions',
+  AllMatching: '(Meet All Conditions)',
   AnyOneMatches: '(Any one of the conditions matches)',
-  SelectQueryField: 'Select Search field',
+  SelectQueryField: 'Select Search Field',
   matchRules: 'Matching Rules',
-  beEqualTo: 'Be Equal To',
+  beEqualTo: 'Equal to',
   contain: 'Contain',
   withStart: 'With Start',
   withEnd: 'With Ending',
@@ -75,29 +75,29 @@ module.exports = {
   numericalValue: 'Numerical Value',
   not: 'No.',
   notOnlyRz: 'No',
-  EnterValue: 'Please Enter a Value',
+  EnterValue: 'Please Enter A Value',
   SavedQuery: 'Saved Search',
-  NoQueriesSaved: 'No Queries Were Saved',
+  NoQueriesSaved: 'No Search Saved',
   SavedName: 'Saved Name',
-  CannotQueryEmpty: 'Cannot Search empty condition',
+  CannotQueryEmpty: 'Cannot search empty condition',
   EmptyCannotSaved: 'Empty condition cannot be saved',
-  cannotEmpty: 'Cannot be empty',
+  cannotEmpty: 'Cannot Be Empty',
   name: 'Name',
   AlreadyExists: 'Already exists, overwrite?',
-  SavedSuccessfully: 'Saved successfully',
+  SavedSuccessfully: 'Saved Successfully',
   DeleteQuery: 'Delete current Search?',
-  VersionNotSupported: 'Version not supported',
-  SaveQueryCriteria: 'Save Search criteria',
-  roleName: 'Role name',
-  newRole: 'New role',
-  RoleManagement: 'Role management',
+  VersionNotSupported: 'Version Not Supported',
+  SaveQueryCriteria: 'Save Search Conditions',
+  roleName: 'Role Name',
+  newRole: 'New Role',
+  RoleManagement: 'Role Management',
   toGrantAuthorization: 'Authorized',
   newUser: 'New User',
-  ExistingUsers: 'Existing users',
+  ExistingUsers: 'Existing Users',
   total: 'Total',
   strip: 'Data',
   RoleCode: 'Role Code',
-  createTime: 'Creation time',
+  createTime: 'Creation Time',
   userName: 'User Name',
   selectOneRule: 'Please select a role!',
   setAttribute: 'Please set the url.list2 attribute!',
@@ -111,23 +111,23 @@ module.exports = {
   DepartmentInformation: 'Department Information',
   BatchDelete: 'Batch Delete',
   DeleteMultiplePiecesData: 'Delete multiple pieces of data',
-  CurrentSelection: 'Current selection',
+  CurrentSelection: 'Current Selection',
   Deselect: 'Deselect',
-  enterDepartmentName: 'Please enter department name',
+  enterDepartmentName: 'Please enter Department name',
   addTo: 'Add',
   cancel: 'Cancel',
-  checkAll: 'Check all',
-  DeselectAll: 'Deselect all',
-  ExpandAll: 'Expand all',
-  MergeAll: 'Merge all',
-  TreeOperation: 'Tree operation',
-  essentialInformation: 'General information',
+  checkAll: 'Check All',
+  DeselectAll: 'Deselect All',
+  ExpandAll: 'Expand All',
+  MergeAll: 'Merge All',
+  TreeOperation: 'Tree Operation',
+  essentialInformation: 'General Information',
   OrganizationName: 'Organization Name',
   EnterOrganizationDepartment: 'Please enter organization / department name',
-  SuperiorDepartment: 'Superior department',
+  SuperiorDepartment: 'Superior Department',
   enterOrganizationCode: 'Please enter organization code',
   nothing: 'Nothing',
-  OrganizationType: 'Organization type',
+  OrganizationType: 'Organization Type',
   PleaseSelectOrganizationType: 'Please select organization type',
   company: 'Company',
   post: 'Post',
@@ -137,119 +137,119 @@ module.exports = {
   address: 'Address',
   remarks: 'Comments',
   enterComments: 'Please enter comments',
-  selectDepartmentFirst: 'Please select a department first!',
-  OrganizationCode: 'Organization code',
+  selectDepartmentFirst: 'Please select a Department first!',
+  OrganizationCode: 'Organization Code',
   fax: 'Fax',
   enterOrganizationType: 'Please enter organization type',
   sureDeleteSelected: 'Are you sure you want to delete the selected',
-  pieceData: 'piece of data and child node data?',
-  selectSuperiorDepartmentFirst: 'Please click to select the superior department first',
-  deleteDepartmentData: 'Are you sure you want to delete this department and child node data?',
-  DeleteSucceeded: 'Delete succeeded',
-  DeletionFailed: 'Deletion failed',
-  departmentInformationDepartment: 'There is no valid department information under your department',
+  pieceData: 'Piece of data and child node data?',
+  selectSuperiorDepartmentFirst: 'Please click to select the superior Department first',
+  deleteDepartmentData: 'Are you sure you want to delete this Department and child node data?',
+  DeleteSucceeded: 'Delete Succeeded',
+  DeletionFailed: 'Deletion Failed',
+  DepartmentInformationDepartment: 'There is no valid Department Information under your Department',
   permissionTemporrily: 'This permission is temporarily granted to ordinary employees',
-  DepartmentRole: 'Department role',
-  DictionaryName: 'Dictionary name',
+  DepartmentRole: 'Department Role',
+  DictionaryName: 'Dictionary Name',
   enterDictionary: 'Please enter a dictionary name',
-  DictionaryNumber: 'Dictionary number',
-  enterDictionaryNumber: 'Please enter the dictionary number',
-  DictionaryInformation: 'Dictionary information',
-  RefreshCache: 'Refresh cache',
+  DictionaryNumber: 'Dictionary NO.',
+  enterDictionaryNumber: 'Please enter the dictionary no.',
+  DictionaryInformation: 'Dictionary Information',
+  RefreshCache: 'Refresh Cache',
   recycleBin: 'Recycle Bin',
-  DictionaryConfiguration: 'Dictionary configuration',
+  DictionaryConfiguration: 'Dictionary Configuration',
   dataDictionaryPage: 'This is the data dictionary page',
   describe: 'Description',
-  DescriptionRefreshCache: 'Description refresh cache complete!',
-  FailedRefreshCache: 'Failed to refresh cache!',
-  refreshFailed: 'refresh failed',
-  ClassificationDictionary: 'Classification dictionary',
-  ClassifManagementPage: 'Classification dictionary management page',
-  ClassificationName: 'Classification name',
-  ClassificationCode: 'Classification code',
-  AddSubcategory: 'Add subcategory',
-  DataRules: 'Data rules',
+  DescriptionRefreshCache: 'Description Refresh Cache Complete!',
+  FailedRefreshCache: 'Failed To Refresh Cache!',
+  refreshFailed: 'Refresh Failed',
+  ClassificationDictionary: 'Classification Dictionary',
+  ClassifManagementPage: 'Classification Dictionary Management Page',
+  ClassificationName: 'Classification Name',
+  ClassificationCode: 'Classification Code',
+  AddSubcategory: 'Add Subcategory',
+  DataRules: 'Data Rules',
   menuMnagementPage: 'This is the menu management page',
-  MenuName: 'Menu name',
-  MenuEnName: 'Menu En name',
+  MenuName: 'Menu Name',
+  MenuEnName: 'Menu En Name',
   enterMenuEnName: 'Please enter menu En name',
-  MenuType: 'Menu type',
+  MenuType: 'Menu Type',
   menu: 'Menu',
-  ButtonsPermissions: 'Buttons / permissions',
-  ConventionalExport:'Conventional export',
-  CustomExport:'Custom export',
+  ButtonsPermissions: 'Buttons / Permissions',
+  ConventionalExport:'Conventional Export',
+  CustomExport:'Custom Export',
   CustomTemplateName:'Custom template name',
-  assembly: 'Assembly',
+  assembly: 'Component',
   route: 'Route',
-  AddSubmenu: 'Add submenu',
-  NoPicture: 'No picture',
+  AddSubmenu: 'Add Submenu',
+  NoPicture: 'No Picture',
   noFile: 'No File',
   adadManagementPage: 'Adad Management Page',
-  TenantName: 'Tenant name',
-  TenantNumber: 'Tenant number',
-  startTime: 'Start time',
+  TenantName: 'Tenant Name',
+  TenantNumber: 'Tenant Number',
+  startTime: 'Start Time',
   endTime: 'End Time',
   LoginLog: 'Login Log',
-  OperationLog: 'Operation log',
-  SearchLog: 'Search log',
+  OperationLog: 'Operation Log',
+  SearchLog: 'Search Log',
   enterSearchKeyword: 'Please enter a search keyword',
-  OperationType: 'Operation type',
-  selectOperationType: 'Please select operation type',
-  RequestMethod: 'Request method',
-  RequestParameters: 'Request parameters',
+  OperationType: 'Operation Type',
+  selectOperationType: 'Please select Operation type',
+  RequestMethod: 'Request Method',
+  RequestParameters: 'Request Parameters',
   logManagementPage: 'This is the log management page',
-  LogContent: 'Log content',
+  LogContent: 'Log Content',
   OperatorID: 'Operator ID',
-  OperatorName: 'Operator name',
-  ElapsedTime: 'Elapsed time (MS)',
-  LogType: 'Log type',
+  OperatorName: 'Operator Name',
+  ElapsedTime: 'Elapsed Time (MS)',
+  LogType: 'Log Type',
   tableName: 'Table Name',
   enterTableName: 'Please enter a table name',
   DataID: 'Data ID',
-  enterID: 'Please enter ID',
-  DataComparison: 'Data comparison',
-  DataLogManagementPage: 'Data log management page',
+  enterID: 'Please Enter ID',
+  DataComparison: 'Data Comparison',
+  DataLogManagementPage: 'Data Log Management Page',
   VersionNumber: 'Version',
-  DataContent: 'Data content',
+  DataContent: 'Data Content',
   creator: 'Creator',
   selectTwoPiecesData: 'Please select two pieces of data',
   selectSameDatabase: 'Please select the same database table and data ID for comparison',
-  DataComparison: 'Data comparison',
-  PromptInformation: 'Prompt information',
+  DataComparison: 'Data Comparison',
+  PromptInformation: 'Prompt Information',
   enterAccountNumber: 'Please enter the account number',
-  AddExistingUsers: 'Add existing users',
+  AddExistingUsers: 'Add Existing Users',
   newUser: 'New User',
   disassociate: 'Disassociate',
-  AssignDepartmentRoles: 'Assign Department roles',
+  AssignDepartmentRoles: 'Assign Department Roles',
   userDetail: 'User Details',
-  AreYouCancelAssociation: '  Are you sure to cancel the association with the selected department?',
+  AreYouCancelAssociation: '  Are you sure to cancel the association with the selected Department?',
   setURLListAttribute: 'Please set the url.list attribute!',
   setURLDeletebatchAttribute: 'Please set the URL Deletebatch attribute!',
-  NoDepartmentSelected: 'No department is selected, unable to cancel the association between department and user!',
-  ConfirmCancellation: 'Confirm cancellation',
-  CancelAssociation: 'Cancel the association between the user and the selected department?',
-  SuccessfullyDeleted: 'Successfully deleted the relationship between the user and the selected department!',
+  NoDepartmentSelected: 'No Department is selected, unable to cancel the association between Department and user!',
+  ConfirmCancellation: 'Confirm Cancellation',
+  CancelAssociation: 'Cancel the association between the user and the selected Department?',
+  SuccessfullyDeleted: 'Successfully deleted the relationship between the user and the selected Department!',
   setURLDeleteAttribute: 'Please set the url.delete attribute!',
-  DepartmentRole: 'Department role assignment',
-  DepartmentRoleName: 'Department role name',
+  DepartmentRole: 'Department Role Assignment',
+  DepartmentRoleName: 'Department Role Name',
   enterDepartmentRole: 'Please enter department role',
-  NewDepartmentRole: 'New department role',
-  DepartmentRoleInformation: 'Department role information',
-  DepartmentRoleCode: 'Department role code',
+  NewDepartmentRole: 'New Department Role',
+  DepartmentRoleInformation: 'Department Role Information',
+  DepartmentRoleCode: 'Department Role Code',
   enterUserAccount: 'Please enter user account',
   NoConfigurableRoles: 'No configurable roles!',
   AreYouWantDiscardEditing: 'Are you sure you want to discard editing?',
   determine: 'Confirmed',
-  DictionaryCoding: 'Dictionary coding',
+  DictionaryCoding: 'Dictionary Coding',
   enterDictionaryCode: 'Please enter dictionary code',
-  DictionaryList: 'Dictionary list',
+  DictionaryList: 'Dictionary List',
   enterName: 'Please enter a name',
   disable: 'Disable',
-  DataValue: 'Data value',
+  DataValue: 'Data Value',
   enterDataValue: 'Please enter a data value',
-  DictionaryRetrieval: 'Dictionary retrieval',
-  CompletelyDelete: 'Completely delete',
-  FirstLevelMenu: 'First level menu',
+  DictionaryRetrieval: 'Dictionary Retrieval',
+  CompletelyDelete: 'Completely Delete',
+  FirstLevelMenu: 'First Level Menu',
   Submenu: 'Submenu',
   enterMenuName: 'Please enter menu name',
   SuperiorMenu: 'Duperior Menu',
@@ -257,58 +257,58 @@ module.exports = {
   selectParentMenu: 'Please select parent menu',
   MenuPath: 'Menu Route',
   enterMenuPath: 'Please enter the menu path',
-  FrontAssembly: 'Front end assembly',
+  FrontAssembly: 'Front-end Component',
   enterFrontComponents: 'Please enter front-end components',
-  DefaultJumpAddress: 'Default jump address',
+  DefaultJumpAddress: 'Default Redirection Address',
   enterRoutingParameters: 'Please enter routing parameters',
   AuthorizationID: '  Authorization ID',
   enterAuthorizationID: 'Please enter the authorization ID, such as:',
   PleaseEnterAuthorizationID: 'Please enter authorization ID!',
-  AuthorizationPolicy: 'Authorization policy',
+  AuthorizationPolicy: 'Authorization Policy',
   selectAuthorizationPolicy: 'Please select authorization policy',
   selectStatus: 'Please select a status',
-  MenuIcon: 'Menu icon',
+  MenuIcon: 'Menu Icon',
   ClickSelectIcon: 'Click the select icon',
   enterMenuSort: 'Please enter menu sort',
-  RouteMenu: 'Route menu',
-  HideRoute: 'Hide route',
-  CacheRoute: 'Cache route',
-  AggregateRouting: 'Aggregate routing',
-  OpenMode: 'Open mode',
+  RouteMenu: 'Route Menu',
+  HideRoute: 'Hidden Route',
+  CacheRoute: 'Cache Route',
+  AggregateRouting: 'Aggregated Route',
+  OpenMode: 'Open Mode',
   external: 'External',
   inside: 'Inside',
   enterMenuTitle: 'Please enter the menu title',
   enterAuthorizationPolicy: 'Please enter authorization policy',
   AuthorizationIDExists: 'Authorization ID already exists',
   enterPositiveInteger: 'Please enter a positive integer',
-  RuleName: 'Rule name',
+  RuleName: 'Rule Name',
   enterRuleName: 'Please enter a rule name',
-  RuleField: 'Rule field',
+  RuleField: 'Rule Field',
   enterRuleField: 'Please enter the rule field',
-  ConditionalRules: 'Conditional rules',
+  ConditionalRules: 'Conditional Rules',
   enterConditionRule: 'Please enter condition rule',
-  RuleValue: 'Rule value',
+  RuleValue: 'Rule Value',
   enterRuleValue: 'Please enter a rule value',
   effective: 'Effective',
   invalid: 'Invalid',
   selectCondition: 'Please select a condition',
-  DataPermissionRules: 'Data permission rules',
-  LoginPassword: 'Login password',
+  DataPermissionRules: 'Data Permission Rules',
+  LoginPassword: 'Login Password',
   enterLoginPassword: 'Please enter the login password',
-  ConfirmPassword: 'Confirm password',
+  ConfirmPassword: 'Confirm Password',
   reenterLoginPassword: 'Please re-enter your login password',
   enterUserName: 'Please enter user name',
-  RoleAssignment: 'Role assignment',
+  RoleAssignment: 'Role Assignment',
   selectUserRole: 'Please select user role',
-  DepartmentAllocation: 'Department allocation',
-  ClickSelectDepartment: 'Click to select a department',
+  DepartmentAllocation: 'Department Allocation',
+  ClickSelectDepartment: 'Click to select a Department',
   choice: 'Choice',
   identity: 'Identity',
-  OrdinaryUsers: 'Ordinary users',
-  superior: 'superior',
-  ResponsibleDepartment: 'Responsible department',
-  selectResponsibleDepartment: 'Please select the responsible department',
-  selectGender: 'Please select gender',
+  OrdinaryUsers: 'Ordinary Users',
+  superior: 'Superior',
+  ResponsibleDepartment: 'Responsible Department',
+  selectResponsibleDepartment: 'Please select the responsible Department',
+  selectGender: 'Please Select Gender',
   mailbox: 'Mailbox',
   enterEmailAddress: 'Please enter email address',
   enterMobileNumber: 'Please enter your mobile phone number',
@@ -320,60 +320,60 @@ module.exports = {
   passwordsEnteredTwice: 'The passwords entered twice are different',
   PnumberExists: 'Phone number already exists',
   enterPhoneCorrect: 'Please enter the phone number in the correct format',
-  MailboxExists: 'Mailbox already exists',
+  MailboxExists: 'Mailbox Already Exists',
   enterMailboxCorrect: 'Please enter a mailbox in the correct format',
   UserExists: 'User name already exists',
   nameExists: 'User name already exists',
-  uploadPictures: 'Please upload pictures',
-  DepartmentSearch: 'Department search',
-  selectSuperiorDepartment: 'Please select superior department',
+  uploadPictures: 'Please Upload Pictures',
+  DepartmentSearch: 'Department Search',
+  selectSuperiorDepartment: 'Please select superior Department',
   upload1: 'Upload',
-  UploadFailed: 'Upload failed',
-  ResetPassword: 'Reset password',
-  ClearSelection: 'Clear selection',
-  BatchRestore: 'Batch restore',
-  RestoreUser: 'Restore user',
+  UploadFailed: 'Upload Failed',
+  ResetPassword: 'Reset Password',
+  ClearSelection: 'Clear Selection',
+  BatchRestore: 'Batch Restore',
+  RestoreUser: 'Restore User',
   FailedQuery: 'Failed to Search deleted users:',
   headPortrait: 'Head Portrait',
-  RestorUser: 'Restore user',
+  RestorUser: 'Restore User',
   sureRestore: 'Are you sure you want to restore this',
   Users: 'Users',
   reduction: 'Reduction',
   UsersSucceeded: 'Users Succeeded!',
   standard: 'Number',
   title: 'Title',
-  TextStatus: 'TextStatus',
+  TextStatus: 'Text Status',
   PleaseEnter: 'Please enter',
   PleaseSelect: 'Please select',
   PleaseEnterOrSelect: 'Please Enter Or Select',
-  ModificationTime: 'Modification time',
-  ModificationContent: 'Modification content',
+  ModificationTime: 'Modification Time',
+  ModificationContent: 'Modification Content',
   personnel: 'Personnel',
-  dataExport: 'Data export',
-  exportWithFile: 'Export with file',
+  dataExport: 'Data Export',
+  exportWithFile: 'Export With File',
   Push: 'Push',
-  templateDownload: 'Template download',
-  textInformation: 'Document files',
-  relatedInformation: 'Relevant information',
+  templateDownload: 'Download Template',
+  textInformation: 'Document Files',
+  relatedInformation: 'Relevant Information',
   RetrieveFiles: 'Select Stored File',
-  SplitText: 'Split Stored File',
+  SplitText: 'Split Library File',
   ImportResults: 'Import Split Results',
   copy: 'Copy',
-  TemplateDownload: 'Template download',
-  MergerClause: 'Merger clause',
-  BatchSetting: 'Batch setting',
-  BatchCancel: 'Batch cancel collection',
+  TemplateDownload: 'Download Template',
+  MergerClause: 'Merge Item',
+  BatchSetting: 'Batch Set',
+  BatchCancel: 'Batch Cancel Collection',
   SubscriptionManagement: 'Select Tech Fields',
-  BatchCancellation: 'Cancel by batch',
-  clickUpload: 'Click to upload',
-  viewUploadedFiles: 'View uploaded files',
-  standardSelection: 'Standard selection',
-  Collection: 'Add to collection',
-  CancelCollection: 'Cancel from collection',
+  BatchCancellation: 'Batch Delete',
+  clickUpload: 'Click To Upload',
+  viewUploadedFiles: 'View Uploaded Files',
+  standardSelection: 'Standard Selection',
+  Collection: 'Add To Collection',
+  CancelCollection: 'Delete Collection',
   deleteLib: 'Delete',
   subscribe: 'Subscribe',
   CancelSubscribe: 'Unsubscribe',
-  ConfirmCollection: 'Confirm collection ?',
+  ConfirmCollection: 'Confirm Collection ?',
   cancelConfirmCollection: 'Are you sure you want to cancel the collection',
   ConfirmSubscribe: 'Confirm Subscribe ?',
   cancelConfirmSubscribe: 'Are you sure you want to cancel the subscribe',
@@ -381,57 +381,57 @@ module.exports = {
   ConfirmBatchDeletion: 'Confirm Batch Deletion ? ',
   download: 'Download',
   UpdateLog: 'Change Log',
-  DocumentSplitting: 'Document Splitting',
-  DocumentTranslation: 'Document Translation',
-  DocumentComparison: 'Document Comparison',
-  KnowledgeDatabase: 'Knowledge Q & a Database',
+  DocumentSplitting: 'Doc Splitting',
+  DocumentTranslation: 'Doc Translation',
+  DocumentComparison: 'Doc Comparison',
+  KnowledgeDatabase: 'Q&A Knowledge',
   StandardDetails: 'Standard Details',
   whole: 'Whole',
   DocumentLibrary: 'Document Library',
   GeneralExportInformation:'General export information',
   CustomizeExportInformation:'Customize export information',
-  DocumentComparisonLibrary: 'Document comparison Library',
+  DocumentComparisonLibrary: 'Document Comparison Library',
   weekly: 'Weekly',
-  SyncLibrary: 'Sync to doc. library',
+  SyncLibrary: 'Sync To doc. Library',
   check: 'Proofread',
-  enName: 'English name',
+  enName: 'English Name',
   selectLeastOne: 'Please select at least one piece of data',
   selectFileType: 'Please select a file type',
   sureVerified: 'Are you sure this file is not verified?',
   sureSynchronize: 'The file has not been verified. Are you sure you want to synchronize to the document library?',
-  UploadFile: 'Upload file',
+  UploadFile: 'Upload File',
   TagItemManagement: 'Tag Item Management',
   LabelContentManagement: 'Tag Content Management',
-  InputBoxType: 'Input box type',
-  DropDownType: 'Drop down type',
+  InputBoxType: 'Input Box Type',
+  DropDownType: 'Drop Down Type',
   ExhibitionAreaManagement: 'Display Area Management',
-  NewLabelItem: 'Add Tag Item',
+  NewLabelItem: 'Newly Added Tag Item',
   editLabelItem: 'Edit Tag Item',
-  NodeQuickLookup: 'Node quick lookup',
-  AreAllLabelsRead: 'Are all labels read',
+  NodeQuickLookup: 'Node Quick Lookup',
+  AreAllLabelsRead: 'Are All Labels Read',
   AllLabelsRead: 'Labels Read',
-  SubscriptionNotification: 'Subscription notification',
+  SubscriptionNotification: 'Subscription Notification',
   warningInformation: 'Warning Information',
-  ForwardPush: 'Forward push',
+  ForwardPush: 'Forward Push',
   PleaseSelectData: 'Please select data first',
   MessageContent: 'Message Content',
   MessageTitle: 'Message Title',
   MessageType: 'Message Type',
   NotificationTime: 'Notification Time',
   MessageNotification: 'Message Notification',
-  SeeMore: 'See more',
-  OperationSuccessful: 'Operation successful',
-  operationFailed: 'Operation Failed',
-  PersonnelSelection: 'Personnel Selection',
+  SeeMore: 'See More',
+  OperationSuccessful: 'Operation Successful',
+  OperationFailed: 'Operation Failed',
+  PersonnelSelection: 'Select ',
   EmployeeNumber: 'Employee ID',
   EmployeeType: 'Employee Type',
   LabeItemName: 'Label Item Name',
   PleaseEnterLabelName: 'Please enter label name',
-  DisplayArea: 'Display area',
+  DisplayArea: 'Display Area',
   ChineseName: 'Attribute Name',
-  AttributeType: 'Attribute type',
-  FieldLength: 'Field length',
-  DisplayOrder: 'Display order',
+  AttributeType: 'Attribute Type',
+  FieldLength: 'Field Length',
+  DisplayOrder: 'Display Order',
   LabelName: 'Tag Name',
   LabelType: 'Tag Type',
   PleaseSelectLabelType: 'Please select a label type',
@@ -443,29 +443,29 @@ module.exports = {
   PleaseEnterPropertyName: 'Please enter a property name',
   PleaseEnterYourEnglishName: 'Please enter your English name',
   PleaseSelectAttributeType: 'Please select an attribute type',
-  OptionContent: 'Option content',
+  OptionContent: 'Option Content',
   PleaseSelectOptionContent: 'Please select the option content',
   PleaseEnterFieldLength: 'Please enter the field length',
-  DisplayOrder: 'Display order',
+  DisplayOrder: 'Display Order',
   PleaseEnterDisplayOrder: 'Please enter the display order',
   Required: 'Required',
-  DocumentLibraryModuleDisplay: 'Document library module display',
-  DocumentLibraryListDisplay: 'Document library list display',
+  DocumentLibraryModuleDisplay: 'Document Library Module Display',
+  DocumentLibraryListDisplay: 'Document Library List Display',
   SelectWhetherDisplayList: 'Please select whether to display the document library list',
   SelectDisplayArea: 'Please select a display area',
   Search: 'Search',
   SelectWhetherToSearch: 'Please select whether to search',
-  DisplayOtherModules: 'Display of other modules',
-  RegulationsListDisplay: 'Regulations list display',
+  DisplayOtherModules: 'Display Of Other Modules',
+  RegulationsListDisplay: 'Regulations List Display',
   selectDisplayListRegulations: 'Please select whether to display the list of regulations',
-  SearchCenterDisplay: 'Search center display',
+  SearchCenterDisplay: 'Search Center Display',
   selectSearchCenterDisplayed: 'Please select whether the search center is displayed',
   selectWhetherRequired: 'Please select whether it is required',
   SortNumber: 'Order',
   enterDisplayArea: 'Please enter the display area',
   charactersLength: '1 - 50 characters in length',
   enterSortingNumber: 'Please enter the sorting number',
-  ParentName: 'Parent name',
+  ParentName: 'Parent Name',
   charactersLength130: '1 - 30 characters in length',
   charactersLength1to300: '1 - 300 characters in length',
   OnlyOneSelected: 'Only one piece of data can be selected',
@@ -474,9 +474,9 @@ module.exports = {
   away: 'Less',
   toDoProcess: 'To Do',
   processDone: 'Completed',
-  sentProcess: 'Initiated process',
+  sentProcess: 'Initiated',
   monitoringProcess: 'Monitor',
-  ConfirmDeployment: 'Confirm deployment?',
+  ConfirmDeployment: 'Confirm Deployment?',
   terminationProcess: 'Termination Process',
   issue: 'Issue',
   projectInformation: 'Project Information',
@@ -493,20 +493,20 @@ module.exports = {
   notInvolved: 'NA',
   Operator: 'Operator',
   role: 'Role',
-  operationContent: 'Operation Content',
-  operationTime: 'Operation time',
-  ConfirmReplication: 'Confirm replication',
-  ProcessName: 'Process name',
+  OperationContent: 'Operation Content',
+  OperationTime: 'Operation Time',
+  ConfirmReplication: 'Confirm Replication',
+  ProcessName: 'Process Name',
   ProcessType: 'Process Type',
-  AddProcess: 'Add process',
-  RelatedItems: 'Relevant items',
+  AddProcess: 'Add Process',
+  RelatedItems: 'Relevant Project',
   Sponsor: 'Initiator',
-  CurrentProcessor: 'Current processor',
-  LastProcessor: 'Last processor',
-  ProcessingTime: 'Complete Date',
+  CurrentProcessor: 'Current Processor',
+  LastProcessor: 'Last Processor',
+  ProcessingTime: 'Operation Time',
   cutoffTime: 'Due Date',
-  ProcessStatus: 'Process status',
-  CompletionTime: 'Completion time',
+  ProcessStatus: 'Process Status',
+  CompletionTime: 'Completion Time',
   draft: 'Draft',
   CannotExceed100characters: 'Cannot Exceed 100 characters',
   cantExeed: 'Cannot Exceed ',
@@ -530,8 +530,8 @@ module.exports = {
   newClause: 'New Clause',
   clauseNo: 'Item No.',
   functionalAreas: 'Functional Areas',
-  technicalField: 'Technical Field',
-  informationCategory: 'Information Category',
+  technicalField: 'Tech field',
+  informationCategory: 'Info Type',
   contentValidity: 'Content Validity',
   content: 'Content',
   Add: 'Add',
@@ -543,7 +543,7 @@ module.exports = {
   theRelease: 'The release date should Not exceed the standard implementation date',
   zoneOfApplication: 'Area',
   releaseDate: 'Release Date',
-  standardImplementationTime: 'Standard implementation time',
+  standardImplementationTime: 'Standard Implementation Time',
   onlyPicture: 'Only Upload Pictures!',
   fileUploadFailed: 'File Upload Failed',
   deletedSuccessfully: 'Deleted Successfully',
@@ -570,23 +570,23 @@ module.exports = {
   batSetting: 'Batch Setting',
   selectDirectoryTerms: 'Please Select the directory location to add terms',
   StandardBreakdown: 'Standard Breakdown',
-  OnlyWordItem: 'Non GSO file type, PDF file cannot be split',
+  OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
   OnlyWord: 'Only word files can be imported',
-  labelAreaDeleted: 'If it is deleted, all label items under the display area will be deleted',
-  searchInResults: 'Search in results',
-  searchContent: 'Search content',
-  viewFile: 'View file',
+  labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted',
+  searchInResults: 'Search In Results',
+  searchContent: 'Search Content',
+  viewFile: 'View File',
   fileFormatIncorrect: 'The file format is incorrect',
   pleaseUploadFile: 'Please upload the file',
-  documentSplitList: 'Document split list display',
+  documentSplitList: 'Document Split List Display',
   selectSplitListDisplay: 'Please select whether to split the document list for display',
   selectDisplayList: 'Please select whether to display in list',
   documentSplitDisplay: 'Document splitting module display',
-  VirtualListName: 'Virtual list name',
-  listStatus: 'List status',
+  VirtualListName: 'Virtual List Name',
+  listStatus: 'List Status',
   creater: 'Creater',
   withdraw: 'Withdraw',
-  maintenanceList: 'Maintain List',
+  maintenanceList: 'Maintain',
   instructionForUse: 'Instruction',
   subtitle: 'Sub-Title',
   scopeOfApplication: 'Scope',
@@ -600,23 +600,23 @@ module.exports = {
   personLiable: 'Assignee',
   PrehomoConfirmation: 'Pre-Homo Confirmation',
   verificationAndConformityconfirmation: 'Validation Compliance Check',
-  StandardImplementationDate: 'Standard implementation date',
+  StandardImplementationDate: 'New Type Execution Date',
   regulatoryEngineer: 'Regulation Engineer',
   certifiedEngineer: 'Homologation Engineer',
   regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer Or Homologation Engineer',
   engineeringInterfacePerson: 'Engineering Interface',
   typeOfDeliverables: 'Deliverable Type',
   deliverableTemplate: 'Deliverable Template',
-  entryName: 'Name',
+  entryName: 'Project',
   targetMarket: 'Target Market',
   projectStatus: 'Status',
   StudioEngineer: 'R&H Studio',
   CertificationTime: 'Certification Time',
-  NTplatform: 'NT platform',
-  NPplatform: 'NP platform',
-  IPDInformation: 'IPD information',
-  certificationProgramInformation: 'Certification program information',
-  taskReleaseStatus: 'Task release status',
+  NTplatform: 'NT Platform',
+  NPplatform: 'NP Platform',
+  IPDInformation: 'IPD Information',
+  certificationProgramInformation: 'Certification Program Information',
+  taskReleaseStatus: 'Task Release Status',
   task: 'Task',
   TaskCutOffTime: 'Due Date',
   Transfer: 'Transfer',
@@ -624,17 +624,17 @@ module.exports = {
   TaskRequirements: 'Task Requirements',
   CertificationProgress: 'Homologation Progress',
   CurrentProjectStatusEvaluation: 'Current State',
-  NiONumber: 'NIO number',
-  ParameterName: 'Parameter name',
-  ParameterDescription: 'Parameter description',
+  NiONumber: 'NIO Number',
+  ParameterName: 'Parameter Name',
+  ParameterDescription: 'Parameter Description',
   Version: 'Version',
-  certificationProgramTime: 'Certification program time',
-  ArchitecturePlatform: 'Architecture platform',
+  certificationProgramTime: 'Certification Program Time',
+  ArchitecturePlatform: 'Architecture Platform',
   ModelPlatform: 'Model Platform',
-  ListOfRelevantPersonnel: 'Personal List',
+  ListOfRelevantPersonnel: 'Related Personnel',
   DeliverableStatus: 'Deliverable Status',
   CurrentStatusOfTheProject: 'Project Current State',
-  CurrentStatus: 'Current status',
+  CurrentStatus: 'Current Status',
   NonConformance: 'Non-compliant',
   listSubclauses: 'List Subclauses',
   fileType: 'File Type',
@@ -651,8 +651,8 @@ module.exports = {
   onlyOnefileUploaded: 'Only One File can be uploaded',
   typeCannotUploaded: 'This Type of File Cannot be Uploaded',
   confirmWithdraw: 'Confirm Withdraw ?',
-  OperationDetails: 'Operation details',
-  OperationTime: 'Operation time',
+  OperationDetails: 'Operation Details',
+  OperationTime: 'Operation Time',
   oneTableAdded: 'Only one table can be added',
   addATable: 'Please add a table',
   pleaseUploadSplitFile: 'Please Upload Split File',
@@ -660,23 +660,23 @@ module.exports = {
   confirmRelease: 'Confirm Release ?',
   UploadMost: 'You can only upload 20 at most',
   FileUploadFailed: 'File upload failed',
-  FileUploadedSuccessfully: 'File uploaded successfully',
-  DeletedSuccessfully: 'Deleted successfully',
+  FileUploadedSuccessfully: 'File uploaded Successfully',
+  DeletedSuccessfully: 'Deleted Successfully',
   confirmCopy: 'Confirm Copy ?',
   DigitalPlatform: 'Digital Platform',
   dehicleDevelopmentPlan: 'Vehicle Master Plan',
   certificationProgram: 'Homologation Plan',
-  DocumentStandard: 'Document standard',
+  DocumentStandard: 'Document Standard',
   standardName: 'Standard Name',
-  initiateListConfirmation: 'Initiate list confirmation',
-  initiateTaskConfirmation: 'Initiate task confirmation',
+  initiateListConfirmation: 'Initiate List Confirmation',
+  initiateTaskConfirmation: 'Initiate Task Confirmation',
   alteration: 'Change',
-  fixedPlate: 'Baseline',
+  fixedPlate: 'Fix the version ',
   taskAffirmStatus: 'Task Confirmation Status',
   taskAffirm: 'Task Confirmation',
   listConfirmationStatus: 'List Confirmation Status',
   listConfirmation: 'List Confirmation',
-  ListConfirmationDeadline: 'List confirmation deadline',
+  ListConfirmationDeadline: 'List Confirmation Deadline',
   dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
   pleaseSelectPersonFirst: 'Please select a person first',
   onlyOnePersonCanBeSelected: 'Only one person can be selected',
@@ -687,23 +687,23 @@ module.exports = {
   submitted: 'Data has been submitted and cannot be submitted again',
   basicInformationOfParameters: 'Project Basic Information',
   regulatoryCertificationTaskPlan: 'Regulation/Homologation Task Plan',
-  bringInRelevantPersonnel: 'Bring in relevant personnel',
+  bringInRelevantPersonnel: 'Bring In Relevant Personnel',
   confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel',
   problemType: 'Issue Type',
-  projectDetails: 'Project Details',
+  projectDetails: 'Project Info',
   listOfRegulations: 'Regulation List',
   taskList: 'Task List',
-  TaskParameterCollection: 'Task parameter collection',
-  nonConformance: 'Non conformance',
-  deadlineForConfirmationOfDesignCompliance: 'Deadline for confirmation of design compliance',
-  prehomoConfirmationDeadline: 'Pre-Homo confirmation deadline',
-  verificationComplianceConfirmationDeadline: 'Verification compliance confirmation deadline',
+  TaskParameterCollection: 'Task Parameter Collection',
+  nonConformance: 'Non Conformance',
+  deadlineForConfirmationOfDesignCompliance: 'Deadline For Confirmation Of Design Compliance',
+  prehomoConfirmationDeadline: 'Pre-Homo Confirmation Deadline',
+  verificationComplianceConfirmationDeadline: 'Verification Compliance Confirmation Deadline',
   pleaseEnterTheCorrectWebAddress: 'Please enter the correct web address',
   updateTime: 'Update Time',
   comment: 'Comment',
-  historicalVersion: 'Historical version',
-  versionName: 'Version name',
-  finalizationTime: 'Finalization time',
+  historicalVersion: 'Historical Version',
+  versionName: 'Version Name',
+  finalizationTime: 'Finalization Time',
   setting: 'Setting',
   incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed can be submitted',
   date: 'Date',
@@ -712,28 +712,28 @@ module.exports = {
 
   confirmationOfRegulationsList: 'Regulation List Confirmation',
   regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homologation Start',
-  certificationEnd: 'Homologation End',
+  certificationStart: 'Homo KO',
+  certificationEnd: 'Homo Completion',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
   enclosure: 'Enclosure',
   // 认证
   // 认证状态
-  timeoperation: 'You have permission to operate this button.',
+  timeOperation: 'You have permission to operate this button.',
   NiOnumberis: 'NiO number is',
-  NoOperationPermissionForthisbutton: 'No operation permission for this button',
+  NoOperationPermissionForthisbutton: 'No Operation permission for this button',
   Attentionfreeze: 'Note: after freezing, the frozen configuration content cannot be edited.',
   Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.',
   Datastatusis: 'Datastatusis',
-  Dropdownradio: 'Drop down radio',
+  Dropdownradio: 'Drop Down Radio',
   Dropdownmultipleselection: 'Drop down multiple selection',
   a: '+',
-  positiveInteger: 'Positive integer',
+  positiveInteger: 'Positive Integer',
   // 参数收集开始
-  MaintainConfigureInfo: 'Maintain configuration information',
+  MaintainConfigureInfo: 'Maintain Configuration Information',
   ParameteItemCollectionList: 'Parameter item collection list',
-  ParameterViewPage:'Parameter View page',
+  ParameterViewPage:'Parameter View Page',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
@@ -742,16 +742,16 @@ module.exports = {
   Frozenstatus: 'Frozen status, can only be viewed',
   chinese: 'Chinese',
   integerOrDecimal: 'Integer Or Decimal',
-  OneDecimalPlace: 'One Decimal Place',
+  OneDecimalPlace: 'One Decimal Places',
   TwoDecimalplaces: 'Two Decimal places',
-  Threedecimalplaces: 'Threedecimalplaces',
-  FourDecimalplaces: 'FourDecimalplaces',
+  Threedecimalplaces: 'Three decimal places',
+  FourDecimalplaces: 'Four Decimal places',
   Positivefloatingpointnumber: 'Positive floating point number',
-  oneconfigurationInformation: 'Contains at least one configuration information',
+  oneconfigurationInformation: 'Contains at least one configuration Information',
   Correspondingstandarddeleted: 'Correspondingstandarddeleted',
   changeTheTitle: 'Title already exists, please change the title',
-  resetPassword: 'reset Password',
-  departmentAllocation: 'department Allocation',
+  resetPassword: 'Reset Password',
+  DepartmentAllocation: 'Department Allocation',
   ListTitle: 'List Title',
   CopyProjectCollectionparameters: 'Copy Project Collection parameters',
   from: 'From',
@@ -800,20 +800,20 @@ module.exports = {
   parameterTemplate: 'Parameter Template',
   contentDescription: 'Content Description',
   WhetherMergeParameters:'Whether to merge parameters',
-  merge:'merge',
-  nonjoinder:'nonjoinder',
+  merge:'Merge',
+  nonjoinder:'Nonjoinder',
   MergeSeparator:'Merge separator',
   parameterTemplateExportName: 'Parameter List',
   parameterDataExport: 'Parameter Export Data',
   // 参数收集结束
-  circulationInformation: 'Circulation information',
+  circulationInformation: 'Circulation Information',
   circulationHistory: 'Circulation History',
   agree: 'Agree',
   disagree: 'Disagree',
   feedbackMessage: 'Feedback Message',
   result: 'Result',
   opinion: 'Opinion',
-  operationNode: 'Operation Node',
+  OperationNode: 'Operation Node',
   taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
   selectInquiry: 'Select Inquiry',
   sendBack: 'Send Back',
@@ -827,11 +827,11 @@ module.exports = {
   terminationProcessing: 'Termination process',
   publishComment: 'Publish Comment',
   record: 'Record',
-  replyToComments: 'Reply to comments',
-  noComment: 'No comment',
-  theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of all data are received',
-  notEvaluated: 'Not evaluated',
-  cannotExceed: 'Cannot exceed',
+  replyToComments: 'Reply To Comments',
+  noComment: 'No Comment',
+  theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of All data are received',
+  notEvaluated: 'Not Evaluated',
+  cannotExceed: 'Cannot Exceed',
   Characters: 'Characters',
   standardInformation: 'Standard Information',
   VirtualList: 'VirtualList',
@@ -844,19 +844,19 @@ module.exports = {
   completedTime: 'Completed Time',
   replyFromProjectContactPerson: 'Assignee Reply',
   answer: 'Answer',
-  distributionEngineer: 'Distribution Engineer',
-  reminderHandling: 'Reminder handling',
-  addFeedback: 'Add feedback',
+  distributionEngineer: 'Dispatch to Engineer',
+  reminderHandling: 'Reminder',
+  addFeedback: 'Add Feedback',
   engineer: 'Engineer',
-  engineeringConfirmationDetails: 'Engineering confirmation details',
+  engineeringConfirmationDetails: 'Engineering Confirmation Details',
   reminder: 'Reminder',
   adopt: 'Adopt',
   reviewedByThePersonInCharge: 'Reviewed by the person in charge',
   onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted',
-  experimentPassed: 'Test passed',
-  experimentFailed: 'Test failed',
-  toBeStarted: 'Not start',
-  inProgress: 'In progress',
+  experimentPassed: 'Test Passed',
+  experimentFailed: 'Test Failed',
+  toBeStarted: 'Not Start',
+  inProgress: 'In Progress',
   green: 'Green',
   red: 'Red',
   blue: 'Blue',
@@ -865,17 +865,17 @@ module.exports = {
   TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data',
   number: 'No.',
   Deadline: 'Deadline',
-  toBeConfirmed: 'To confirm',
+  toBeConfirmed: 'To Confirm',
   designComplianceReview: 'Design Compliance Confirmation',
-  preHomeConfirmation: 'Pre-Homo confirmation',
+  preHomeConfirmation: 'Pre-Homo Confirmation',
   verificationComplianceReview: 'Validation Compliance Confirmation',
   Deployment: 'Deploy',
   pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
   pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
   pleaseConformityVerification: 'Please complete the data of Conformity verification',
-  virtualListDetails: 'Virtual list details',
-  maintainVirtualList: 'Maintain virtual list',
-  reasonsForRejection: 'Reasons for rejection',
+  virtualListDetails: 'Virtual List Details',
+  maintainVirtualList: 'Maintain Virtual List',
+  reasonsForRejection: 'Reasons For Rejection',
   inconformity: 'Non-Compliance',
   toTrack: 'To be tracked',
   Launch: 'Launch',
@@ -887,10 +887,10 @@ module.exports = {
   authenticationMessage: 'Homo Parameter Task',
   taskRegulationComplianceTask: 'Regulation Compliance Task',
   accept: 'Accept',
-  notLaunch: 'Not start',
+  notLaunch: 'Not Start',
   refuse: 'Reject',
-  taskTermination: 'Task termination',
-  projectStatusAndProgress: 'Project status and progress',
+  taskTermination: 'Task Termination',
+  projectStatusAndProgress: 'Project Status And Progress',
   listConfirmationProgress: 'List Confirmation Progress',
   taskConfirmationProgress: 'Task Confirmation Progress',
   designComplianceConfirmationProgress: 'Design Compliance Confirmation Progress',
@@ -899,30 +899,30 @@ module.exports = {
   totalTable: 'Total',
   newlyAdded: 'Add',
   applicableSupplement: 'Applicable Supplement',
-  taskDescription: 'Task description',
+  taskDescription: 'Task Description',
   descriptionDeliverables: 'Instruction',
   startMonth: 'Start Month',
   endMonth: 'End Month',
   Importing: 'Importing...',
-  projectDeliveryDescription: 'Project delivery description',
+  projectDeliveryDescription: 'Project Delivery Description',
   cancelConfirm: 'Cancel Confirm',
   currentInformation: 'Current Information',
   deliveryHistory: 'Delivery History',
   projectDeliveryRequirements: 'Project delivery requirements',
   personLiableConfirm: 'PersonLiable Confirm',
-  complianceResults: 'Compliance results',
-  noData: 'No data',
+  complianceResults: 'Compliance Results',
+  noData: 'No Data',
   confirmOperation: 'Confirm Operation',
-  sponsorReview: 'Sponsor review',
-  fillInProjectDelivery: 'Fill in project delivery',
+  sponsorReview: 'Sponsor Review',
+  fillInProjectDelivery: 'Engineering Delivery',
   Resubmit: 'Resubmit',
   Quantity: 'Quantity',
-  pleaseConfirmationResults: 'Please select the compliance status according to the engineering confirmation results',
-  pleaseReviewTask: 'Please add the engineering confirmation information for this review task',
-  pleaseWillBeReturned: 'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
-  pleaseSubmitStatus: 'Please submit the data confirmed by the project in the confirmation status',
+  pleaseConfirmationResults: 'Please select the compliance status based on the engineer confirmation result.',
+  pleaseReviewTask: 'Please add engineering confirmation to this review task.',
+  pleaseWillBeReturned: 'Please double confirm the engineering result and owner review result. Submit if it is in accordance with the requirements and reject if it\'s not.',
+  pleaseSubmitStatus: 'Please confirm all engineer data before submission.',
   modelName: 'Model Name',
-  modelYear: 'Model year',
+  modelYear: 'Model Year',
   NoteConfirmTheChange: 'Note: after the change, the list will be in the status of not being reviewed, which will start from the internal review, and the historical data will be discarded Confirm the change',
   onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed',
   inquiry: 'Inquiry',
@@ -932,17 +932,17 @@ module.exports = {
   engineerReply: 'Engineer reply',
   catalogFile: 'Catalogue File',
   testScheme: 'Test Scheme',
-  testReportLocation: 'Report Location',
-  explain: 'Comment',
+  testReportLocation: 'Find Report',
+  explain: 'Illustration',
   dataCannotEmpty: 'Data Cannot Empty',
-  documentDynamics: 'Document Update',
+  documentDynamics: 'Document Updates',
   theNumberAgain: 'The number already exists and cannot be added again',
-  myList: 'My to-do list',
+  myList: 'My To-do List',
   myNews: 'My Message',
   monthlyReportRegulations: 'Regulation Monthly Report',
   Pending: 'Pending',
   custom: 'Custom',
-  notSelected: 'Not selected',
+  notSelected: 'Not Selected',
   ExportReport: 'Export Report',
   basicInformation: 'Basic Information',
   replyFromProjectContact: 'Reply from project contact person',
@@ -951,7 +951,7 @@ module.exports = {
   systemPrompt: 'System Prompt',
   loginExpired: 'Login Expired',
   reportNotUploaded: 'Report not uploaded',
-  position: 'position',
+  position: 'Position',
 //  认证权限状态
   CollectionInitiated: 'Wait Collect',
   handledInterface: 'Wait Sdt',
@@ -963,65 +963,65 @@ module.exports = {
   SynchronizedLibrary: 'Sync Report',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
-  and: 'and',
+  and: 'And',
   judge: 'Judge',
   pleaseWaitWhileRunning: 'Please wait while running',
-  roleSwitching: 'Role switching',
+  roleSwitching: 'Role Switching',
   setCreator: 'Set Creator',
-  documentLibraryDetails: 'Document library details',
+  documentLibraryDetails: 'Document Library Details',
   question: 'Question',
   ConfirmQuestion: 'Confirm Question',
-  disableInput: 'Disable input',
+  disableInput: 'Disable Input',
   taskConfirmationDeadline: 'Task Confirmation Deadline',
   OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out',
   taskConfirmationResponsiblePerson:'Task confirmation of responsible person',
   or: 'or',
-  warningTime: 'Warning time',
+  warningTime: 'Warning Time',
   RegulationMonthlyManagement: 'Regulation Monthly Management',
   RegulationMonthlyFill: 'Regulation Monthly Fill',
   RegulationMonthlyName: 'Regulation monthly name',
-  monthlyLanguage: 'Monthly language',
-  releaseStatus: 'Release status',
-  uploadedBy: 'Uploaded by',
-  uploadMonthly: 'Upload monthly',
-  chapterContents: 'Chapter contents',
-  chineseTitle: 'Chinese title',
-  englishTitle: 'English title',
-  regulatoryContact: 'Regulatory contact',
-  exportStatus: 'Export status',
-  monthlyTitleTemplate: 'Monthly title template',
+  monthlyLanguage: 'Monthly Language',
+  releaseStatus: 'Release Status',
+  uploadedBy: 'Uploaded By',
+  uploadMonthly: 'Upload Monthly',
+  chapterContents: 'Chapter Contents',
+  chineseTitle: 'Chinese Title',
+  englishTitle: 'English Title',
+  regulatoryContact: 'Regulatory Contact',
+  exportStatus: 'Export Status',
+  monthlyTitleTemplate: 'Monthly Title Template',
   monthlyIntegrationAndExport: 'Monthly integration and export',
-  addContent: 'Add content',
-  editContent: 'Edit content',
-  viewContent: 'View content',
+  addContent: 'Add Content',
+  editContent: 'Edit Content',
+  viewContent: 'View Content',
   fillInTheMonth: 'Fill in the month',
-  monthSelection: 'Month selection',
-  bringInStandardInformation: 'Bring in standard information',
-  contentTemplate: 'Content template',
-  moveUp: 'Move up',
-  moveDown: 'Move down',
+  monthSelection: 'Month Selection',
+  bringInStandardInformation: 'Bring in standard Information',
+  contentTemplate: 'Content Template',
+  moveUp: 'Move Up',
+  moveDown: 'Move Down',
   vehicleType: 'Vehicle Type',
   usage: 'Usage',
-  implementationModel: 'Implementation model',
-  primaryCoverageCn: 'Primary coverage (Cn)',
-  primaryCoverageEn: 'Primary coverage (En)',
-  workProgressCn: 'NIO Work progress (Cn)',
-  workProgressEn: 'NIO Work progress (En)',
+  implementationModel: 'Implementation Model',
+  primaryCoverageCn: 'Primary Coverage (Cn)',
+  primaryCoverageEn: 'Primary Coverage (En)',
+  workProgressCn: 'NIO Work Progress (Cn)',
+  workProgressEn: 'NIO Work Progress (En)',
   initiatingProcess: 'Initiating Process',
-  collectResults: 'Collect results',
-  dateOfInitiation: 'Date of initiation',
-  closingDate: 'Closing date',
-  viewProcess: 'View process',
-  evaluationResults: 'Evaluation results',
+  collectResults: 'Collect Results',
+  dateOfInitiation: 'Date Of Initiation',
+  closingDate: 'Closing Date',
+  viewProcess: 'View Process',
+  evaluationResults: 'Evaluation Results',
   Assessor: 'Assessor',
   collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
   collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
   feedbackInformation: 'Feedback Information',
-  relevantSections: 'Relevant sections',
-  questionsSuggestions: 'Questions or Suggestions',
+  relevantSections: 'Relevant Sections',
+  questionsSuggestions: 'Questions Or Suggestions',
   reason: 'Reason',
-  proposedTime:'Proposed time',
-  feedbackPoint: 'Feedback point',
+  proposedTime:'Proposed Time',
+  feedbackPoint: 'Feedback Point',
   link: 'Link',
   planNoChinese: 'Plan No.',
   standardNameCn: 'Standard Name Cn',
@@ -1031,7 +1031,7 @@ module.exports = {
   implemenDate: 'Implementation Date',
 //  上报库
   Enable: 'Enable',
-  Latestupdatetime: 'Latest update time',
+  Latestupdatetime: 'Latest Update Time',
   Exporthistory: 'Exporthistory',
   Exporttype: 'Export Type',
   Exporttime: 'Export Time',
@@ -1047,7 +1047,7 @@ module.exports = {
   ParameterNo: 'Number',
   NRequired: 'Is Must',
   NParameterName: 'Params Name',
-  NtechnicalField: 'Technical Field',
+  NtechnicalField: 'Tech field',
   NparameterBatch: 'Params Batch',
   NareaOfResponsibility: 'Duty Territory',
   NParameterDescription: 'Description',
@@ -1058,11 +1058,11 @@ module.exports = {
   DefaultValue: 'Default Value',
   NattachmentTemplate: 'File Template',
   Ntext: 'Text',
-  NDropdownradio: 'Pull single',
-  NDropdownmultipleselection: 'Pull more',
+  NDropdownradio: 'Pull Single',
+  NDropdownmultipleselection: 'Pull More',
   Nenclosure: 'File',
-  Atext: 'Text+Pull single',
-  Btext: 'Text+Pull more',
+  Atext: 'Text+Pull Single',
+  Btext: 'Text+Pull More',
   Ctext: 'Text+File',
   Dtext: 'Pull single+File',
   Etext: 'Pull more+File',
@@ -1071,14 +1071,14 @@ module.exports = {
   Nnothing: 'Null',
   Nchinese: 'Chinese',
   NpositiveInteger: 'Integer',
-  NPositivefloatingpointnumber: 'Positive float',
-  NintegerOrDecimal: 'Integer decimal',
-  NOneDecimalPlace: 'Decimal one',
-  NTwoDecimalplaces: 'Decimal two',
-  NThreedecimalplaces: 'Decimal three',
-  NFourDecimalplaces: 'Decimal four',
+  NPositivefloatingpointnumber: 'Positive Float',
+  NintegerOrDecimal: 'Integer Decimal',
+  NOneDecimalPlace: 'Decimal One',
+  NTwoDecimalplaces: 'Decimal Two',
+  NThreedecimalplaces: 'Decimal Three',
+  NFourDecimalplaces: 'Decimal Four',
   yes: 'Yes',
-  Copyparameterlist: 'Copy parameter list',
+  Copyparameterlist: 'Copy Parameter List',
   Templatenamelist: 'Template name - parameter item collection list',
   newNiONumber: 'Number',
   English: 'English',
@@ -1090,7 +1090,7 @@ module.exports = {
   theResponsiblePersonAndDeadlineClank:'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface:'Bring in the project interface',
   theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
-  defaultTemplate:'Default template',
+  defaultTemplate:'Default Template',
   newRequestCommentListTemplate:'New request for comment list template',
   NewReleasedStandardTemplate:'New released standard template',
   pleaseSelectStandard:'Please select a standard',
@@ -1098,7 +1098,7 @@ module.exports = {
   theDeadlineEmpty:'The deadline of cannot be empty',
   theDeliveryTypeCannotBeEmpty:'The delivery type of cannot be empty',
   For:'For',
-  markedRejection:'Marked rejection',
+  markedRejection:'Marked Rejection',
   RegulationListConfirmationTask:'Regulation List Confirmation Task',
   RegulationListConfirmationNotification:'Regulation List Confirmation Notification',
   RegulationTaskConfirmation:'Regulation Task Confirmation',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 835fbbdf6..ac2cf6d24 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -576,7 +576,7 @@ module.exports = {
   documentSplitTemplate: '文档拆分模板',
   batSetting: '批量设置',
   selectDirectoryTerms: '请选择添加条款的目录位置',
-  OnlyWordItem: '非GSO文件类型,不能拆分pdf文件',
+  OnlyWordItem: '只有GSO文件类型，才能拆分pdf文件，请重新选择文件',
   OnlyWord: '只能导入word文件',
   labelAreaDeleted: '若进行删除，则该展示区域下标签项都将被删除',
   StandardBreakdown: '标准分解单',
diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue
index 67ba5063f..4dec33c23 100644
--- a/jero-web/src/components/OcrUpload/index.vue
+++ b/jero-web/src/components/OcrUpload/index.vue
@@ -32,7 +32,7 @@
       return{
         visible:false,
         uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
-        downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static',
+        downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static',
         myfileList:[],
         fileList:[],
         fileTypeSatus:false,
diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue
index cdcc74cde..e2ab3ca03 100644
--- a/jero-web/src/components/ReferenceParameter/index.vue
+++ b/jero-web/src/components/ReferenceParameter/index.vue
@@ -327,19 +327,6 @@
     height: 40px;
     margin-bottom: 24px;
   }
-</style>
-<style lang='less'>
-  .area-module {
-    .ant-modal-wrap {
-      .ant-modal {
-        .ant-modal-content {
-          .ant-modal-footer {
-            text-align: center;
-          }
-        }
-      }
-    }
-  }
 
   .page {
     display: flex;
@@ -392,4 +379,17 @@
   .title-text-text {
     margin-top: 9px;
   }
+</style>
+<style lang='less'>
+  .area-module {
+    .ant-modal-wrap {
+      .ant-modal {
+        .ant-modal-content {
+          .ant-modal-footer {
+            text-align: center;
+          }
+        }
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue
index f616626eb..85a0fe05f 100644
--- a/jero-web/src/components/SplitImport/index.vue
+++ b/jero-web/src/components/SplitImport/index.vue
@@ -50,7 +50,7 @@
         visible:false,
         // uploadAction:"http://10.0.1.25:8080/split/sarFileSplitItems/importSplitItems",
         uploadAction:window._CONFIG['domianURL']+"/split/sarFileSplitItems/importSplitItems",
-        downLoadFileUrl:window._CONFIG['domianURL']+'/sys/common/static',
+        downLoadFileUrl:window._CONFIG['domianPreviewURL']+'/sys/common/static',
         myfileList:[],
         fileList:[],
         fileTypeSatus:false,
diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index 6c7a80208..15c818409 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -37,7 +37,7 @@
         visible: false,
         uploadAction: window._CONFIG['domianURL'] + '/split/sarFileSplitItems/upload',
         upDataList: [],
-        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static',
         fileList: [],
         myfileList: [],
         isLoding: false,
diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue
index 8b17e8f92..1225b1edc 100644
--- a/jero-web/src/components/importSplitUpload/index.vue
+++ b/jero-web/src/components/importSplitUpload/index.vue
@@ -34,7 +34,7 @@
       return {
         visible: false,
         uploadAction: window._CONFIG['domianURL'] + '/sys/common/upload',
-        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/static',
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/static',
         myfileList: [],
         fileList: [],
         fileTypeSatus: false,
diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue
index eb17e3b15..8ff499e95 100644
--- a/jero-web/src/components/tools/HeaderNotice.vue
+++ b/jero-web/src/components/tools/HeaderNotice.vue
@@ -15,7 +15,7 @@
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                 <div style="margin-left: 5%;width: 80%;">
                   <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
-                    <a :title="record.msgContent" @click="showAnnouncement(record)">{{ record.msgContent }}</a>
+                    <a :title="record.titile" @click="showAnnouncement(record)">{{ record.titile }}</a>
                   </p>
                 </div>
               </a-list-item>
diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue
index 5b7c3c846..60d65ec72 100644
--- a/jero-web/src/components/uploadFileChange/file.vue
+++ b/jero-web/src/components/uploadFileChange/file.vue
@@ -106,7 +106,7 @@ export default {
       this.fileTypeSatus = true
     },
     mypreview(item) {
-      let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
+      let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
       window.open(url, '_blank')
     },
     handleChange(info) {
@@ -188,17 +188,17 @@ export default {
       let index1 = fileName.lastIndexOf('.')
       let index2 = fileName.length
       let fileSuffix = fileName.substring(index1, index2)
-      if (fileSuffix === '.pdf') {
-        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
-      } else if (fileSuffix === '.docx') {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-        window.open(url, '_blank')
-      } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-        window.open(url, '_blank')
-      } else {
+      // if (fileSuffix === '.pdf') {
+      //   window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+      // } else if (fileSuffix === '.docx') {
+      //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+      //   window.open(url, '_blank')
+      // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+      //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+      //   window.open(url, '_blank')
+      // } else {
         downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
-      }
+      // }
     }
   }
 }
diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue
index 09ba46494..df598bc41 100644
--- a/jero-web/src/components/uploadFileChangeDown/file.vue
+++ b/jero-web/src/components/uploadFileChangeDown/file.vue
@@ -129,7 +129,7 @@ import { mapGetters } from 'vuex'
       this.fileTypeSatus = true
     },
     mypreview(item) {
-      let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
+      let url = window._CONFIG['domianPreviewURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + item.ext1)
       window.open(url, '_blank')
     },
     handleChange(info) {
@@ -211,17 +211,17 @@ import { mapGetters } from 'vuex'
       let index1 = fileName.lastIndexOf('.')
       let index2 = fileName.length
       let fileSuffix = fileName.substring(index1, index2)
-      if (fileSuffix === '.pdf') {
-        window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
-      } else if (fileSuffix === '.docx') {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-        window.open(url, '_blank')
-      } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-        window.open(url, '_blank')
-      } else {
+      // if (fileSuffix === '.pdf') {
+      //   window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
+      // } else if (fileSuffix === '.docx') {
+      //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+      //   window.open(url, '_blank')
+      // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+      //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+      //   window.open(url, '_blank')
+      // } else {
         downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
-      }
+      // }
     }
   }
 }
diff --git a/jero-web/src/components/viewFileModel/index.vue b/jero-web/src/components/viewFileModel/index.vue
index 945838eee..6dafa860e 100644
--- a/jero-web/src/components/viewFileModel/index.vue
+++ b/jero-web/src/components/viewFileModel/index.vue
@@ -2,6 +2,7 @@
   <a-modal
     :title="$t('viewFile')"
     :width="600"
+    style="z-index: 1007"
     :visible="visibleFile"
     :maskClosable="false"
     @cancel="visibleFile = false"
diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue
index 7db505bde..f1d76361c 100644
--- a/jero-web/src/views/dashboard/components/myNews.vue
+++ b/jero-web/src/views/dashboard/components/myNews.vue
@@ -11,8 +11,8 @@
       <div class="myNews-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="magClick(item)">
         <img src="../../../assets/wdxx.png" alt="">
         <div class="content-box">
-          <div class="top" :title="item.msgContent">
-            {{item.msgContent}}
+          <div class="top" :title="item.titile">
+            {{item.titile}}
           </div>
           <div class="botton">
             {{item.sendTime}}
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 750f5e900..9235bdc88 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -21,7 +21,8 @@
             <a-icon type="reload"/>
             {{$t('UpdateLog')}}
           </div>
-          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentSplitting')">
+          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text"
+               :title="$t('DocumentSplitting')">
             <a-icon type="codepen"/>
             {{$t('DocumentSplitting')}}
           </div>
@@ -47,7 +48,8 @@
                 {{val}}
               </div>
               <div class="content-text" v-if="val == $t('essentialInformation')">
-                <div class="text-field" v-for="(ol,index1) in item[val]">
+                <div class="text-field" :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false}"
+                     v-for="(ol,index1) in item[val]">
                   <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
@@ -135,7 +137,8 @@
                 </table>
               </div>
               <div class="content-text" v-else>
-                <div class="text-field" v-for="(ol,index1) in item[val]">
+                <div class="text-field" :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false}"
+                     v-for="(ol,index1) in item[val]">
                   <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
@@ -402,7 +405,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
@@ -414,7 +417,7 @@
         }
       },
       download(item) {
-        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username})
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
       },
       UpdateLog() {
         this.visible = true
@@ -591,6 +594,33 @@
             font-weight: 400;
           }
         }
+
+        .text-content-button-one {
+          width: 100%;
+
+          .text-field-left {
+            width: 124px;
+            display: inline-block;
+            font-size: 14px;
+            font-weight: 400;
+            color: #6F7385;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+            margin-right: 24px;
+          }
+
+          .text-field-right {
+            width: calc(100% - 200px);
+            display: inline-block;
+            font-size: 16px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+            color: #040B29;
+            font-weight: 400;
+          }
+        }
       }
     }
   }
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 894f071fe..5c9a49c3b 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -10,6 +10,8 @@
             @close="onClose"
             width="900"
           >
+<!--            :label-col="labelCol"-->
+<!--            :wrapper-col="wrapperCol"-->
             <a-spin :spinning="loading">
               <a-form>
                 <a-form-model
@@ -17,8 +19,6 @@
                   :model="formInline"
                   :rules="rules"
                   ref="splitEditForm"
-                  :label-col="labelCol"
-                  :wrapper-col="wrapperCol"
                 >
                   <a-row :gutter="24" class="split-form-row">
 
@@ -184,6 +184,7 @@
                               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                                 <j-dict-select-tag v-model="formInline[item.db_field_name]"
                                                    :disabled="disabled"
+                                                   class="box-input"
                                                    @input="handleInput(item.db_field_name)"
                                                    :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                                    :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
@@ -191,7 +192,7 @@
                             </div>
 
 
-                            <div class="box-title-text box-tree-text" :title="item.db_field_txt"  v-else-if="item.field_show_type === '0'">
+                            <div class="box-title-text" :title="item.db_field_txt"  v-else-if="item.field_show_type === '0'">
                               <div class="title-text">
                                 <span class="Required" v-if="item.field_must_input == 1">*</span>
                                 <span class="title-text-text">{{item.db_field_txt}}</span>
@@ -200,6 +201,7 @@
                                 <a-tree-select
                                   tree-node-filter-prop="title"
                                   v-model="formInline[item.db_field_name]"
+                                  class="box-input"
                                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                                   style="width: 100%"
                                   :tree-data="item.tree"
@@ -226,7 +228,6 @@
                               </a-form-model-item>
                             </div>
                           </a-col>
-
                       </a-row>
 
 
@@ -278,16 +279,15 @@
             </a-modal>
 <!--        类型选择弹框-->
             <a-modal
-              :title="Title"
+              :title="$t('Add')"
               class="split-title"
               :visible="addConVisible"
-
               @ok="handleOk"
               @cancel="handleCancel"
             >
               <div class="title-wraper">
                 <div class="title-top">
-                  <span class="title-flex title-text" :class="{'title-flex-active':selected=='TEXT'}" @click="selectTitle('TEXT')">{{$t('text')}}</span>
+                  <span class="title-flex title-text-flex" :class="{'title-flex-active':selected=='TEXT'}" @click="selectTitle('TEXT')">{{$t('text')}}</span>
                   <span class="title-flex title-pic" :class="{'title-flex-active':selected=='IMG'}" @click="selectTitle('IMG')">{{$t('picture')}}</span>
                   <span class="title-flex title-table" :class="{'title-flex-active':selected=='TABLE'}" @click="selectTitle('TABLE')">{{$t('table')}}</span>
                 </div>
@@ -303,7 +303,7 @@
 <!--                      <span class="title-num-add">{{$t('addQuantity')}}</span>-->
                         <a-row :gutter="24">
                           <a-col :span="24">
-                            <a-input-number class="title-num-edit" :min="0" :max="100" v-model="numberForm.textNumber" :placeholder="$t('enterQuantity')" :formatter="limitNumber" :parser="limitNumber" ></a-input-number>
+                            <a-input-number  class="title-num-edit box-input" :min="0" :max="100" v-model="numberForm.textNumber" :placeholder="$t('enterQuantity')" :formatter="limitNumber" :parser="limitNumber" ></a-input-number>
                           </a-col>
                         </a-row>
                       </a-form-model-item>
@@ -333,12 +333,12 @@
                 >
                   <a-form-model-item :label="$t('numberRows')" prop="rowCount">
 <!--                    <a-form-item :label="$t('numberRows')">-->
-                      <a-input-number v-model="rowColForm.rowCount" :min="1" :max="100"  :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%"  />
+                      <a-input-number class="box-input" v-model="rowColForm.rowCount" :min="1" :max="100"  :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%"  />
 <!--                    </a-form-item>-->
                   </a-form-model-item>
                   <a-form-model-item :label="$t('numberColumns')" prop="colCount">
 <!--                    <a-form-item :label="$t('numberColumns')">-->
-                      <a-input-number v-model="rowColForm.colCount" :min="1" :max="100"  :placeholder="$t('pleaseEnter')+$t('numberColumns')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%" />
+                      <a-input-number class="box-input" v-model="rowColForm.colCount" :min="1" :max="100"  :placeholder="$t('pleaseEnter')+$t('numberColumns')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%" />
 <!--                    </a-form-item>-->
                   </a-form-model-item>
                 </a-form-model>
@@ -1214,7 +1214,6 @@
           margin-top: 2px;
         }
 
-
       }
       .con-divider{
         font-size: 16px;
@@ -1310,8 +1309,21 @@
   text-align: center;
   img{
   }
-
 }
+  .box-input {
+    /*min-width: 200px;*/
+    display: inline-block;
+    height: 38px;
+    margin-top: 2px;
+  }
+  .button-text {
+    height: 38px;
+    width: calc(100% - 100px);
+    line-height: 38px;
+    background: #fff;
+    border: 1px #00B3BE solid;
+    color: #00B3BE;
+  }
 </style>
 
 <style lang="less">
@@ -1366,10 +1378,10 @@
     }
   }
   .split-content{
-    .box-input .ant-input-number-input-wrap{
-      height: 30px;
-      line-height: 30px;
-    }
+    /*.box-input .ant-input-number-input-wrap{*/
+    /*  height: 30px;*/
+    /*  line-height: 30px;*/
+    /*}*/
     .ant-input-number{
       width: 100%;
     }
@@ -1399,15 +1411,10 @@
       }
     }
   }
-  .box-tree-text{
-    .ant-select-selection--multiple{
-      height: 32px;
-      overflow-y: auto;
-    }
-  }
-  .box-input .ant-select-selection__rendered {
-    line-height: 32px;
-    height: 32px;
-    /*overflow-y: auto;*/
-  }
+  /*.box-tree-text{*/
+  /*  .ant-select-selection--multiple{*/
+  /*    height: 32px;*/
+  /*    overflow-y: auto;*/
+  /*  }*/
+  /*}*/
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 881792170..cd1553cc5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1170,17 +1170,18 @@
   @import '~@assets/less/common.less';
 
   .split-detail {
-    height: 100% !important;
+    /*height: 100% !important;*/
 
     .split-detail-wrap {
-      display: flex;
-      justify-content: space-between;
+      /*display: flex;*/
+      /*justify-content: space-between;*/
 
       .split-detail-left {
-        height: 100%;
-        min-width: 300px;
+        /*height: 100%;*/
+        width: 300px;
+        float: left;
         padding-right: 20px;
-        border-right: 1px solid #E6E7EC;
+        /*border-right: 1px solid #E6E7EC;*/
         overflow-y: auto;
 
         .split-detail-left-tree {
@@ -1206,7 +1207,10 @@
 
       .split-detail-right {
         padding-left: 20px;
-        flex: 1;
+        width: calc(100% - 300px);
+        float: right;
+        border-left: 1px solid #E6E7EC;
+        /*flex: 1;*/
 
         .split-detail-search-header {
           margin-bottom: 20px;
@@ -1381,26 +1385,26 @@
       margin-right: 20px !important;
     }
 
-    .title-text {
-      min-width: 73px !important;
-    }
+    /*.title-text {*/
+    /*  min-width: 73px !important;*/
+    /*}*/
 
-    .split-detail-wrap {
-      height: 481px !important;
-    }
+    /*.split-detail-wrap {*/
+    /*  height: 481px !important;*/
+    /*}*/
 
-    .mainItem {
-      height: 500px;
-    }
+    /*.mainItem {*/
+    /*  height: 500px;*/
+    /*}*/
   }
 
   @media screen and (min-width: 1600px) and (max-width: 2000px) {
-    .split-detail .split-detail-wrap .split-detail-left {
-      height: 735px !important;
-    }
+    /*.split-detail .split-detail-wrap .split-detail-left {*/
+    /*  height: 735px !important;*/
+    /*}*/
 
-    .mainItem {
-      height: 800px !important;
-    }
+    /*.mainItem {*/
+    /*  height: 800px !important;*/
+    /*}*/
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 43aaff7fb..58f5f365c 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -11,31 +11,32 @@
           <div class="text-text-right"
                :class="{ 'null-input':item.checked }">
             <div class="text-header" @click="titleClick(item)">
-              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" >
+              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
                 <template slot="title">
                   <span v-html="item.module_type"></span>
                 </template>
-                <span style="cursor: pointer" v-html="item.module_type"></span>
+                <span class="text-header-text" style="cursor: pointer" v-html="item.module_type"></span>
                 <template slot="title">
                   <span v-html="item.serial_number"></span>
                 </template>
                 <span style="cursor: pointer"
+                      class="text-header-text"
                       v-html="item.serial_number"></span>
                 <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
-                <span style="cursor: pointer" v-html="item.title"></span>
+                <span class="text-header-text" style="cursor: pointer" v-html="item.title"></span>
                 <template slot="title">
                   <span v-html="item.file_name"></span>
                 </template>
-                <span style="cursor: pointer" v-html="item.file_name"></span>
+                <span class="text-header-text" style="cursor: pointer" v-html="item.file_name"></span>
               </a-tooltip>
-<!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
+              <!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
 
-<!--              </a-tooltip>-->
-<!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
+              <!--              </a-tooltip>-->
+              <!--              <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">-->
 
-<!--              </a-tooltip>-->
+              <!--              </a-tooltip>-->
               <a-tooltip placement="topLeft" :mouseEnterDelay="0.5">
 
               </a-tooltip>
@@ -107,6 +108,7 @@
         conList: [],
         total: 0,
         pageSize: 10,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         pageNo: 1,
         queryParam: {}
       }
@@ -157,7 +159,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32)+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id.slice(0, 32) + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id.slice(0, 32) + fileSuffix)
           window.open(url, '_blank')
@@ -259,17 +261,29 @@
   .text-header {
     margin-bottom: 11px;
 
-    span {
+    .text-header-text {
       margin-right: 52px;
       font-size: 16px;
       font-weight: bold;
       color: #040B29;
       display: inline-block;
-      max-width: 500px;
+      max-width: 180px;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
     }
+
+    /*span {*/
+    /*  margin-right: 52px;*/
+    /*  font-size: 16px;*/
+    /*  font-weight: bold;*/
+    /*  color: #040B29;*/
+    /*  display: inline-block;*/
+    /*  max-width: 500px;*/
+    /*  text-overflow: ellipsis;*/
+    /*  white-space: nowrap;*/
+    /*  overflow: hidden;*/
+    /*}*/
   }
 
   .text-content {
diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
index 6f9d8d207..d5540a03c 100644
--- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    title="添加"
+    :title="$t('add')"
     :maskClosable="false"
     :width="1000"
     placement="right"
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 6a178e9a5..7ae3c6526 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -162,6 +162,12 @@
                     {{text}}
                   </span>
               </span>
+
+              <span slot="standard" slot-scope="text,record" :title="text">
+              <a class="textName" @click="standardClick(record)">
+                 {{text}}
+              </a>
+              </span>
               <span slot="designDeliverableTemplateName" slot-scope="text,record">
           <span>{{record.designDeliverableTypeName}}</span><br v-if="record.designDeliverableTypeName">
            <a v-if="record.designDeliverableTemplate && record.designDeliverableTemplate.split(',').length == 1"
@@ -306,7 +312,7 @@
             dataIndex: 'serialNumber',
             width: 180,
             fixed: 'left',
-            scopedSlots: { customRender: 'titleName' }
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
@@ -840,6 +846,15 @@
             this.loading = false
           }
         })
+      },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.bussDocumentLibraryId
+          }
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 0ef417a29..c3bf52f65 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -389,7 +389,7 @@ export default {
         ],
         paramsName: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' },
-          { min:1, max: 30, message: this.$t('cantExeed')+'30'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 100, message: this.$t('cantExeed')+'100'+this.$t('characters'), trigger: 'blur' },
         ],
         technologyTerritory: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('technicalField'), trigger: 'change' },
@@ -401,7 +401,7 @@ export default {
           { required: true, message: this.$t('PleaseSelect')+this.$t('areaOfResponsibility'), trigger: 'change' },
         ],
         description: [
-          { min:1, max: 1000, message: this.$t('cantExeed')+'1000'+this.$t('characters'), trigger: 'blur' },
+          { min:1, max: 2000, message: this.$t('cantExeed')+'2000'+this.$t('characters'), trigger: 'blur' },
         ],
         controlType: [
           { required: true, message: this.$t('pleaseSelect')+this.$t('controlType'), trigger: 'change' },
@@ -689,15 +689,15 @@ export default {
           this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty'))
           falg = 0
           return
-        } else if(item.paramsName.length > 30){
-          this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'30'+this.$t('Characters'))
+        } else if(item.paramsName.length > 100){
+          this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'100'+this.$t('Characters'))
           falg = 0
           return
         }
         if(item.description !== undefined && item.description !== null){
           // 参数说明的限制
-          if(item.description.length > 1000){
-            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'1000'+this.$t('Characters'))
+          if(item.description.length > 2000){
+            this.$message.warning(this.$t('ParameterDescription')+this.$t('cantExeed')+'2000'+this.$t('Characters'))
             falg = 0
             return
           }
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index f486e8b1c..c5390aa79 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -84,7 +84,8 @@
           {},
           {
             title: this.$t('standard'),
-            value: 'serialNumber'
+            value: 'serialNumber',
+            type: '4'
           },
           {
             title: this.$t('title'),
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index e5ee987c5..d23200165 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1219,7 +1219,8 @@
           if (valid) {
             let query = {
               roleCode: this.formInlineRoleSwitching.roleSwitchingCode,
-              id: this.AndUserId
+              id: this.AndUserId,
+              projectLibraryId: this.$route.query.id
             }
             this.confirmLoadingRoleSwitching = true
             postAction(this.url.AndUserIdEdit, query).then((res) => {
@@ -1503,7 +1504,7 @@
             }
           }
           for (let i = 0; i < dataList.length; i++) {
-            if ((dataList[i].taskAffirmStatus == 'Not started' || dataList.taskAffirmStatus == 'Rejected') &&
+            if ((dataList[i].taskAffirmStatus == 'Not started' || dataList[i].taskAffirmStatus == 'Rejected') &&
               dataList[i].inventoryAffirmStatus == 'Accepted') {
               if (dataList[i].engineeringInterfacePerson) {
                 if (dataList[i].verifyDeliverableType) {
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 3a2c95ba4..bac8f1274 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage'
   import store from '@/store/'
 
   export default {
@@ -214,9 +214,9 @@
         let query = {
           ...this.queryParam,
           projectLibraryId: this.$route.query.id,
-          ncrTrackVOList: JSON.stringify(this.content)
+          ncrTrackVOList: this.content
         }
-        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+        downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },
       getList() {
         let query = {
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 00ff61adc..fa55f2727 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -36,7 +36,7 @@
         :scroll="{x: 1000}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
         :loading="loading">
 
       </a-table>
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 3b7565f88..a2e1e0a74 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import store from '@/store/'
 
@@ -354,9 +354,9 @@
       handleExport() {
         let query = {
           ...this.queryParam,
-          ncrTrackVOList: JSON.stringify(this.content)
+          ncrTrackVOList: this.content
         }
-        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+        downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 6039934a4..3bf72e72d 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -235,12 +235,10 @@ export default {
     loadData() {
       let _this = this
       let params = {
-        pageNo: this.pageNo,
-        pageSize: this.pageSize,
-        paramsManifestId:this.paramsManifestId,
+        id:this.paramsManifestId,
         ...this.formData
       }
-      getAction('params/report/exportHistoryPage', params).then((res) => {
+      getAction('project/lawsComplianceBoard/queryComplianceResultList', params).then((res) => {
         if (res.success) {
           this.areaTable = res.result.records
           this.total = res.result.total
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index bbbf53682..5c49ea3e2 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -18,7 +18,7 @@
                 <span>{{$t('title')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.projectName"></j-input>
+                       v-model="queryParam.title"></j-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -26,7 +26,7 @@
               <div class="title-text" :title="$t('status')">
                 <span>{{ $t('status') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+              <j-dict-select-tag class="box-input" v-model="queryParam.state"
                                  :placeholder="$t('PleaseSelect')+$t('status')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -37,7 +37,7 @@
               <div class="title-text" :title="$t('technicalField')">
                 <span>{{ $t('technicalField') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+              <j-dict-select-tag class="box-input" v-model="queryParam.technologyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -130,7 +130,7 @@ export default {
       fieldList: [
         {
           type: 'string',
-          value: 'standard',
+          value: 'serialNumber',
           text: this.$t('standard')
         },
         {
@@ -140,18 +140,18 @@ export default {
         },
         {
           type: '',
-          value: 'status',
+          value: ' state',
           text: this.$t('status'),
           dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
-        {
-          type: 'string',
-          value: 'category',
-          text: this.$t('category')
-        },
+        // {
+        //   type: 'string',
+        //   value: 'technologyTerritory',
+        //   text: this.$t('category')
+        // },
         {
           type: '',
-          value: 'technicalField',
+          value: 'technologyTerritory',
           text: this.$t('technicalField'),
           dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
         },
@@ -160,7 +160,7 @@ export default {
       dataSource: [],
       confirmLoading: false,
       url: {
-        list: 'params/report/page'
+        list: 'project/lawsComplianceBoard/page'
       },
       total: 0,
       pageSize: 10,
@@ -170,7 +170,7 @@ export default {
         {
           title: this.$t('standard'),
           align: 'center',
-          dataIndex: 'standard'
+          dataIndex: 'serialNumber'
         },
         {
           title: this.$t('title'),
@@ -180,7 +180,7 @@ export default {
         {
           title: this.$t('status'),
           align: 'center',
-          dataIndex: 'status'
+          dataIndex: 'state'
         },
         // {
         //   title: this.$t('category'),
@@ -190,7 +190,7 @@ export default {
         {
           title: this.$t('technicalField'),
           align: 'center',
-          dataIndex: 'technicalField'
+          dataIndex: 'technologyTerritory'
         },
         {
           title: this.$t('RegulatoryProcessEvaluationResults'),
diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue
index 800be4f7e..ab48a5967 100644
--- a/jero-web/src/views/system/UserAnnouncementList.vue
+++ b/jero-web/src/views/system/UserAnnouncementList.vue
@@ -100,12 +100,12 @@
         description: '系统通告表管理页面',
         queryParam: {},
         selectedRowKeys: [],
+        // '5': this.$t('taskRegulationComplianceTask'),
         msgCategoryQuery: {
           '1': this.$t('SubscriptionNotification'),
           '2': this.$t('warningInformation'),
           '3': this.$t('ForwardPush'),
           '4': this.$t('authenticationMessage'),
-          '5': this.$t('taskRegulationComplianceTask'),
           '6':this.$t('RegulationListConfirmationTask'),
           '7':this.$t('RegulationListConfirmationNotification'),
           '8':this.$t('RegulationTaskConfirmation'),
@@ -125,6 +125,12 @@
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
+          {
+            title: this.$t('Sponsor'),
+            align: 'center',
+            dataIndex: 'initiator',
+            width: 200,
+          },
           {
             title: this.$t('MessageType'),
             align: 'center',