Merge remote-tracking branch 'origin/master'

SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql

@@ -46,3 +46,7 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
 
 ALTER TABLE `laws_weilai`.`params_report_detail`
     CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`;
+
+---2022-06-15
+ALTER TABLE `laws_weilai`.`sys_user_role`
+    MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @Date: Created in 10:56 2022/6/11
  */
 public enum CollectManifestRoleIdEnum {
-    STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1),
+//    STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1),
     ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2),
     MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3);
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -37,7 +37,9 @@ import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.ocr.util.LineHumpUtil;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectRelatedPersonnel;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.system.entity.SysAnnouncement;
 import com.jero.modules.system.entity.SysDictItem;
@@ -109,6 +111,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
 	@Autowired
 	private ISysUserRoleService sysUserRoleService;
+	@Autowired
+	private ProjectLibraryBaseMapper projectLibraryBaseMapper;
 
 
 
@@ -804,15 +808,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				.distinct()
 				.collect(Collectors.toList());
 
-		// 查询当前登录用户角色 是否包含管理员/领导/studio
+		// 查询当前登录用户角色 是否包含管理员/领导
 		List<SysUserRole> userRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色
-		List<String> userRoleIds = new ArrayList<>(); // 用户管理员/领导/studio角色
+		List<String> userRoleIds = new ArrayList<>(); // 用户管理员/领导
 		if (CollectionUtil.isNotEmpty(userRoles)) {
 			List<String> roleIdList = CollectManifestRoleIdEnum.getIdList();
 			List<String> userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
 			userRoleIds = roleIdList.stream().filter(e->userRoleIdList.contains(e)).collect(Collectors.toList());
 		}
-		if (CollectionUtil.isEmpty(userRoleIds) && !homoList.contains(loginUser.getUsername())
+		// TODO 查询当前登录用户角色 是否是当前项目的studio
+		List<String> studioList = new ArrayList<>();
+		List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectId);
+		if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) {
+			studioList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getStudioEngineerName).collect(Collectors.toList());
+		}
+
+		if (CollectionUtil.isEmpty(userRoleIds) && !studioList.contains(loginUser.getUsername())
+				&& !homoList.contains(loginUser.getUsername())
 				&& !sdtList.contains(loginUser.getUsername())
 				&& !dreListOfPCM.contains(loginUser.getUsername())) {
 
@@ -860,6 +872,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			userTypeList.add(map);
 		}
 
+		if (studioList.contains(loginUser.getUsername())) {
+			Map<String, String> map = new HashMap<>();
+			if (CutEnum.CN.getValue().equals(cut)) {
+				map.put("label", CollectManifestUserTypeEnum.STUDIO.getName());
+			} else {
+				map.put("label", CollectManifestUserTypeEnum.STUDIO.getEnName());
+			}
+			map.put("value", CollectManifestUserTypeEnum.STUDIO.getValue());
+			userTypeList.add(map);
+		}
+
 		if (CollectionUtil.isNotEmpty(userRoleIds)) {
 			List<CollectManifestRoleIdEnum> collectManifestRoleIdEnumList = CollectManifestRoleIdEnum.getByIdList(userRoleIds);
 			for (CollectManifestRoleIdEnum collectManifestRoleIdEnum : collectManifestRoleIdEnumList) {
@@ -912,6 +935,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean goBack(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 
@@ -928,6 +954,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean withdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 
@@ -955,6 +984,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || paramsCollectManifestVO.getDeadline() == null) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		Date deadline = paramsCollectManifestVO.getDeadline();
 
@@ -971,6 +1003,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getSdt())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
 		String sdt = paramsCollectManifestVO.getSdt();
 
@@ -982,6 +1017,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDre()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String dre = paramsCollectManifestVO.getDre();
 		String projectId = paramsCollectManifestVO.getProjectId();
@@ -1024,7 +1063,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		// 发送飞书消息
 		try {
-			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.PUSH.getName(), hrefFeishu);
+			feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu);
 		} catch (IOException e) {
 			log.error("飞书消息推送失败");
 		}
@@ -1034,6 +1073,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String projectId = paramsCollectManifestVO.getProjectId();
 
@@ -1051,6 +1093,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		// 消息内容
 		List<ParamsCollectManifestEO> paramsCollectManifestEOList = listByIds(Arrays.asList(paramsCollectManifestIdStr));
 		List<String> sdtList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getSdt).distinct().collect(Collectors.toList());
+		if (CollectionUtil.isEmpty(sdtList)) {
+			throw new JeroBootException("没有可下发的工程接口人！");
+		}
 		for(String sdt : sdtList) {
 
 			StringBuilder connectBuilder = new StringBuilder();
@@ -1067,7 +1112,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			thirdIds[0] = sysUser.getThirdId();
 			String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + projectId; // TODO 后续可能有变动
 			String href = "<a href='/ParameterItemCollection?id=" + projectId + "'" + " target='_blank'>the link</a>,";
-			String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " to handle it.";
+			String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 
 			// 发送系统消息
 			SysAnnouncement sysAnnouncement  = new SysAnnouncement();
@@ -1083,7 +1128,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			// 发送飞书消息
 			try {
-				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.PUSH.getName(), hrefFeishu);
+				feishuService.batchSendMessage(thirdIds, content, MessageTypeEnum.COLLECT.getName(), hrefFeishu);
 			} catch (IOException e) {
 				log.error("飞书消息推送失败");
 			}
@@ -1123,6 +1168,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsConfigIds())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 		String paramsConfigIds = paramsCollectManifestVO.getParamsConfigIds();
 		List<String> paramsConfigIdList = Arrays.asList(paramsConfigIds.split(","));
@@ -1153,6 +1201,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getSourceConfigId()) || StringUtils.isEmpty(paramsCollectManifestVO.getTargetConfigIds())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String sourceConfigId = paramsCollectManifestVO.getSourceConfigId();
 		String targetConfigIds = paramsCollectManifestVO.getTargetConfigIds();
@@ -1199,6 +1251,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	@Override
 	public boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())) {
+			throw new JeroBootException("参数不能为空！");
+		}
 		String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -145,13 +145,15 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	 */
 	@Override
     public boolean editById(ParamsManifestEO paramsManifestEO) {
-		ParamsManifestEO oldParamsManifestEO = getById(paramsManifestEO.getTitle());
+		ParamsManifestEO oldParamsManifestEO = getById(paramsManifestEO.getId());
-		LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
+		if (!oldParamsManifestEO.getTitle().equals(paramsManifestEO.getTitle())) {
-		queryWrapper.eq(ParamsManifestEO::getTitle, oldParamsManifestEO.getTitle());
+			LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
+			queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle());
-		List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
+			queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId());
-		if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+			List<ParamsManifestEO> paramsManifestEOList = list(queryWrapper);
-			throw new JeroBootException("标题已存在！");
+			if (CollectionUtil.isNotEmpty(paramsManifestEOList)) {
+				throw new JeroBootException("标题已存在！");
+			}
 		}
 
 		ParamsManifestEO updateEO = new ParamsManifestEO();

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java

@@ -100,7 +100,7 @@ public class ParamsInfoEO implements Serializable {
     private String description;
 
 	/**认证类别*/
-	@Excel(name = "认证类别", width = 15, dicCode = "cert_category")
+	@Excel(name = "*认证类别", width = 15, dicCode = "cert_category")
     @Dict(dicCode = "cert_category")
     @ApiModelProperty(value = "认证类别")
     private String certCategory;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java

@@ -97,7 +97,6 @@ public interface IParamsInfoEOService extends IService<ParamsInfoEO> {
 								   String paramsTemplateId,
 								   String cut);
 
-
 	int deleteByParamsTemplateIds(String paramsTemplateIds);
 
 	List<ParamsInfoEO> selectListByParamsTemplateIds(String paramsTemplateIds);

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java

@@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.constant.enums.IsMustEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.util.oss.CosBootUtil;
 import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
 import com.jero.modules.cert.template.entity.ParamsInfoEO;
 import com.jero.modules.cert.template.enums.ControlTypeEnum;
@@ -34,6 +35,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
@@ -313,10 +315,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			Map<String, Object> bussExportMap = new HashMap<>();
 			bussExportMap.put("title", bussExportParams);
-			bussExportMap.put("entity", ParamsInfoEO.class);
+
 			if (CutEnum.CN.getValue().equals(cut)) {
+				bussExportMap.put("entity", ParamsInfoEO.class);
 				bussExportMap.put("data", new ArrayList<ParamsInfoEO>());
 			} else if (CutEnum.EN.getValue().equals(cut)) {
+				bussExportMap.put("entity", ParamsInfoEnExport.class);
 				bussExportMap.put("data", new ArrayList<ParamsInfoEnExport>());
 			}
 			sheetsList.add(bussExportMap);
@@ -332,10 +336,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					certExportParams.setStyle(CommonExcelExportStyler.class);
 					Map<String, Object> certExportMap = new HashMap<>();
 					certExportMap.put("title", certExportParams);
-					certExportMap.put("entity", CertCategoryParamsInfoEO.class);
+
 					if (CutEnum.CN.getValue().equals(cut)) {
+						certExportMap.put("entity", CertCategoryParamsInfoEO.class);
 						certExportMap.put("data", new ArrayList<CertCategoryParamsInfoEO>());
 					} else if (CutEnum.EN.getValue().equals(cut)) {
+						certExportMap.put("entity", CertCategoryParamsInfoEnExport.class);
 						certExportMap.put("data", new ArrayList<CertCategoryParamsInfoEnExport>());
 					}
 					sheetsList.add(certExportMap);
@@ -613,15 +619,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		for(OSSFile fileExportDto : fileTemplateList){
 			String oldPath = fileExportDto.getUrl();
 			String newPath = fileNowPath + File.separator + fileExportDto.getFileName();
-			File oldFile = new File(oldPath);
+			if (CosBootUtil.doesObjectExist(oldPath)){
-			if (oldFile.exists()){
+				InputStream in = CosBootUtil.download(oldPath);
-				copyFile(oldPath, newPath);
+				copyFile(in, newPath);
 			}
 		}
 	}
 
-	private void copyFile(String srcPath, String destPath) throws IOException {
+	private void copyFile(InputStream in, String destPath) throws IOException {
-		BufferedInputStream bis = new BufferedInputStream(Files.newInputStream(Paths.get(srcPath)));
+		BufferedInputStream bis = new BufferedInputStream(in);
 		BufferedOutputStream bos =
 				new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath),
 						StandardOpenOption.CREATE,
@@ -744,12 +750,25 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					String sheetName = workbook.getSheetName(numSheet);
 					// 第几个sheet页
 					if (numSheet == 0) { // 企业参数表
-						ExcelImportResult<ParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoCnImport.class, params);
+						if (CutEnum.EN.getValue().equals(cut)) {
-						paramsInfoEOList = result.getList();
+							ExcelImportResult<ParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params);
+							List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
+							copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
+						} else {
+							ExcelImportResult<ParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params);
+							paramsInfoEOList = result.getList();
+						}
 					} else { // 认证类别参数表
 						if (certCategoryMap.containsKey(sheetName)) {
-							ExcelImportResult<CertCategoryParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params);
+							List<CertCategoryParamsInfoCnImport> list = new ArrayList<>();
-							List<CertCategoryParamsInfoCnImport> list = result.getList();
+							if (CutEnum.EN.getValue().equals(cut)) {
+								ExcelImportResult<CertCategoryParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params);
+								List<CertCategoryParamsInfoEnImport> listEn = resultEn.getList();
+								copycertCategoryParamsInfoList(listEn, list);
+							} else {
+								ExcelImportResult<CertCategoryParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params);
+								list = result.getList();
+							}
 							if (CollectionUtil.isNotEmpty(list)) {
 								for (CertCategoryParamsInfoCnImport certCategoryParamsInfoEO : list){
 									//判断此行数据是否全部为空,是则不读取
@@ -822,6 +841,27 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		}
 	}
 
+	// 集合复制
+	private void copyParamsInfoList(List<ParamsInfoEnImport> sourceList, List<ParamsInfoCnImport> targetList) {
+		if (CollectionUtil.isNotEmpty(sourceList)) {
+			sourceList.forEach(item -> {
+				ParamsInfoCnImport target = new ParamsInfoCnImport();
+				BeanUtils.copyProperties(item, target);
+				targetList.add(target);
+			});
+		}
+	}
+	// 集合复制
+	private void copycertCategoryParamsInfoList(List<CertCategoryParamsInfoEnImport> sourceList, List<CertCategoryParamsInfoCnImport> targetList) {
+		if (CollectionUtil.isNotEmpty(sourceList)) {
+			sourceList.forEach(item -> {
+				CertCategoryParamsInfoCnImport target = new CertCategoryParamsInfoCnImport();
+				BeanUtils.copyProperties(item, target);
+				targetList.add(target);
+			});
+		}
+	}
+
 	@Override
 	public Result<?> importParamsInfoData(List<ParamsInfoCnImport> paramsInfoEOList,
 										  Map<String,List<CertCategoryParamsInfoCnImport>> certCategoryParamsInfoEOListMap,
@@ -1129,7 +1169,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 							MultipartFile multipartFile =
 									new MockMultipartFile(nowFileList.get(0).getName(), nowFileList.get(0).getName(), "text/plain", input);
 							//文件存入文件表
-							OSSFile ossFile = ossFileService.uploadLocal(multipartFile, "", null,null);
+							OSSFile ossFile = ossFileService.uploadLocalOfCos(multipartFile, "", null,null);
 							if (ObjectUtils.isNotEmpty(ossFile)) {
 								sb.append(ossFile.getId() + ",");
 							}

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java

@@ -0,0 +1,71 @@
+package com.jero.modules.cert.template.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 10:41 2022/6/15
+ */
+@Data
+public class CertCategoryParamsInfoEnImport {
+    /**主键*/
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+    /**编号*/
+    @Excel(name = "*number", width = 15, orderNum = "2")
+    @ApiModelProperty(value = "编号")
+    private String paramsNumber;
+
+    /**参数名称*/
+    @Excel(name = "*params name", width = 15, orderNum = "3")
+    @ApiModelProperty(value = "参数名称")
+    private String paramsName;
+
+    /**参数说明*/
+    @Excel(name = "参数说明", width = 36, orderNum = "4")
+    @ApiModelProperty(value = "参数说明")
+    private String description;
+
+    /**nio编号*/
+    @Excel(name = "*nio number", width = 15, orderNum = "1")
+    @ApiModelProperty(value = "nio编号")
+    private String nioNumber;
+
+    /**所属认证类别*/
+    @ApiModelProperty(value = "所属认证类别")
+    private String certCategory;
+
+    /**参数模板id*/
+    @ApiModelProperty(value = "参数模板id")
+    private String paramsTemplateId;
+}

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoCnImport.java

@@ -48,7 +48,7 @@ public class ParamsInfoCnImport {
     private String description;
 
     /**认证类别*/
-    @Excel(name = "认证类别", width = 15)
+    @Excel(name = "*认证类别", width = 15)
     @ApiModelProperty(value = "认证类别")
     private String certCategory;
 

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnExport.java

@@ -83,7 +83,7 @@ public class ParamsInfoEnExport {
     private String description;
 
     /**认证类别*/
-    @Excel(name = "cert category", width = 15, dicCode = "cert_category_en")
+    @Excel(name = "*cert category", width = 15, dicCode = "cert_category_en")
     @Dict(dicCode = "cert_category")
     @ApiModelProperty(value = "认证类别")
     private String certCategory;

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/ParamsInfoEnImport.java

@@ -48,7 +48,7 @@ public class ParamsInfoEnImport {
     private String description;
 
     /**认证类别*/
-    @Excel(name = "cert category", width = 15)
+    @Excel(name = "*cert category", width = 15)
     @ApiModelProperty(value = "认证类别")
     private String certCategory;
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java

@@ -20,7 +20,7 @@ public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
     @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc")
     public List<SysDictItem> selectItemsByMainId(String mainId);
 
-    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sort_order asc, item_value asc")
+    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE sys_dict_item.DEL_FLAG = 0 and DICT_CODE = #{dictCode} order by sort_order asc, item_value asc")
     public List<SysDictItem> selectItemsByDictCode(String dictCode);
 
     @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.sort_order asc")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -2578,8 +2578,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         StringBuilder msgContentSb = new StringBuilder();
         StringBuilder msgContentInfoSb = new StringBuilder();
         //适用车型
-        StringBuilder msgContentSbCarType = new StringBuilder("Applicable Models of the " + category + " " + serialNumber + " " + titleEn);
+        StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + serialNumber + " " + titleEn);
-        StringBuilder msgContentInfoSbCarType = new StringBuilder("Applicable Models of the " + category + " "  + href);
+        StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + category + " "  + href);
         //状态
         StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + category + " " + serialNumber + " " + titleEn);
         StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + category + " "  + href);
@@ -2616,8 +2616,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 }
                 //
                 if(StringUtils.isBlank(value)){
-                    msgContentSbStatus.append(" has been modified to be empty ,");
+                    msgContentSbStatus.append(" has been modified to be null ,");
-                    msgContentInfoSbStatus.append(" has been modified to be empty ,");
+                    msgContentInfoSbStatus.append(" has been modified to be null ,");
                     msgContentSb.append(msgContentSbStatus);
                     msgContentInfoSb.append(msgContentInfoSbStatus);
                 }else{
@@ -2652,8 +2652,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     value = substring;
                 }
                 if(StringUtils.isBlank(value)){
-                    msgContentSbCarType.append(" has been modified to be empty ,");
+                    msgContentSbCarType.append(" has been modified to be null ,");
-                    msgContentInfoSbCarType.append(" has been modified to be empty ,");
+                    msgContentInfoSbCarType.append(" has been modified to be null ,");
                     msgContentSb.append(msgContentSbCarType);
                     msgContentInfoSb.append(msgContentInfoSbCarType);
                 }else{
@@ -2887,13 +2887,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 if (ObjectUtils.isNotEmpty(value)) {
                                     if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt +" "+ value + " to " + valueTemp + ",");
+                                            sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
                                         }
                                     } else if (ObjectUtils.isEmpty(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " "+value + " to empty " + ",");
+                                            sb.append(dbFieldTxt + " from "+value + " to null " + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
                                         }
@@ -2901,7 +2901,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 } else {
                                     if (ObjectUtils.isNotEmpty(valueTemp)) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " empty to " + valueTemp + ",");
+                                            sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
                                         }
@@ -2930,13 +2930,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     if (fileNameListTemp.size() != 0 && !checkDiffrent) {
                                         if("1".equals(flag)){
                                             //sysUser
-                                            sb.append(dbFieldTxt +" "+ StringUtils.join(fileNameList, ",") + " to " + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt +" from "+ StringUtils.join(fileNameList, ",") + " to " + StringUtils.join(fileNameListTemp, ",") + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
                                         }
                                     } else if (fileNameListTemp.size() == 0) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " "+StringUtils.join(fileNameList, ",") + " to empty " + ",");
+                                            sb.append(dbFieldTxt + " from "+StringUtils.join(fileNameList, ",") + " to null " + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为空" + ",");
                                         }
@@ -2945,7 +2945,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                 } else {
                                     if (fileNameListTemp.size() != 0) {
                                         if("1".equals(flag)){
-                                            sb.append(dbFieldTxt + " empty to " + StringUtils.join(fileNameListTemp, ",") + ",");
+                                            sb.append(dbFieldTxt + " from null to " + StringUtils.join(fileNameListTemp, ",") + ",");
                                         }else{
                                             sb.append(dbFieldTxt + "由空改为" + StringUtils.join(fileNameListTemp, ",") + ",");
                                         }
@@ -2966,13 +2966,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     if (ObjectUtils.isNotEmpty(value)) {
                                         if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt +" "+ value + " to " + valueTemp + ",");
+                                                sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
                                             }else{
                                                 sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
                                             }
                                         } else if (ObjectUtils.isEmpty(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt + " "+value + " to empty " + ",");
+                                                sb.append(dbFieldTxt + " from "+value + " to null " + ",");
                                             }else{
                                                 sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
                                             }
@@ -2980,7 +2980,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                                     } else {
                                         if (ObjectUtils.isNotEmpty(valueTemp)) {
                                             if("1".equals(flag)){
-                                                sb.append(dbFieldTxt + " empty to " + valueTemp + ",");
+                                                sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
                                             }else{
                                                 sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
                                             }
@@ -4712,8 +4712,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you, Please pay attention to check.";
+        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 pay attention to check.";
+        String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -4729,7 +4729,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         list.add(serialNumber);
                     }
                 });
-                String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you, Please pay attention to check.";
+                String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out.";
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
             }
         } catch (IOException e) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java

@@ -350,7 +350,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryBaseEO.getId());
             List<DummyInventoryInfoEO> dummyInventoryInfoEOList = iDummyInventoryInfoEOService.list(lambdaQueryWrapper);
-            String contentLog = null;
+            String contentLog = "";
 
             if(dummyContentChangeEOList.size() == 0){
                 //没有添加过需要进行第一次添加
@@ -418,11 +418,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                                     .eq("is_en_log",CutEnum.EN.getValue());
                             List<DummyLogEO> updateLogList = dummyLogEOService.list(logEOQueryWrapper);
                             if(CollectionUtils.isNotEmpty(updateLogList)){
-                                contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("</br></br>"));
+                                List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
+                                for(int i=0 ; i < contentLogList.size() ;i++){
+                                    contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
+                                }
                             }
                         }
 
-
                         //列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
                         if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) {
                             //向订阅该领域管理的人发消息和飞书
@@ -1115,10 +1117,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx
                     content = "The " + baseName + " virtual list you subscribed to has been updated.";
                     contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "</br>";
-                    contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "</br>";
+                    contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " ;
                     //拼接维护清单的消息
                     contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
-                    contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog);
+                    contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog).replace("</br>"," ");
                     //封装消息的实体类
                     SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
                     sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1130,8 +1132,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         log.error("飞书消息推送失败");
                     }
                 }else{//撤回的消息
-                    content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
+                    content = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
-                    contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
+                    contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
 
                     //封装消息的实体类
                     SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
@@ -1172,7 +1174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             }
         }
         if (StringUtils.isNotBlank(contentLog)){
-            contentInfo += contentLog;
+            contentInfo += row +". Maintenance list has been modified as follows :</br>"+ contentLog;
         }
 
         return contentInfo;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -127,7 +127,7 @@ public class InventoryAffirmJob implements Job {
                         // XXX .
                         String msgContentEN = "The remaining processing time for the regulation list confirmation of"
                                 + projectNameInfoEO.getProjectName()
-                                + " is 3 days. Please check and handle it in time.";
+                                + " are 3 days. Please check and handle it in time.";
 
                         //飞书跳转链接
                         String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();
@@ -148,9 +148,9 @@ public class InventoryAffirmJob implements Job {
                         currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList());
 
                         /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/
-                        String msgContentEN = "The the regulation list confirmation of "
+                        String msgContentEN = "The the regulation list confirmation for "
                                 + projectNameInfoEO.getProjectName()
-                                + " is coming to an end today. Please check and deal with it in time";
+                                + " will expire today. Please check and address it in a timely manner.";
 
                         //飞书跳转链接
                         String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java

@@ -133,7 +133,7 @@ public class PrehomoJob implements Job {
                                 //The remaining processing time for the Pre-Homo confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time.
                                 String msgContentEN = "The remaining processing time for the Pre-Homo confirmation of "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is 3 days. Please check and handle it in time.";
+                                        + " are 3 days. Please check and handle it in time.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType();
@@ -157,7 +157,7 @@ public class PrehomoJob implements Job {
                                 //The the Pre-Homo confirmation of GB 7258 in XXX (project name)  is coming to an end today. Please check and deal with it in time
                                 String msgContentEN = "The the Pre-Homo confirmation of "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is coming to an end today. Please check and deal with it in time.";
+                                        + " will expire today. Please check and address it in time.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -130,9 +130,9 @@ public class VerifyComplianceJob implements Job {
 
                                 //您XXX（项目名称）中GB 7258的验证符合性确认剩余处理时间还有3天，请及时查看处理
                                 //The remaining processing time for the Verify compliance confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time.
-                                String msgContentEN = "The remaining processing time for the Verify compliance confirmation of "
+                                String msgContentEN = "The remaining processing time for the validation compliance confirmation of "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is 3 days. Please check and handle it in time.";
+                                        + " are 3 days. Please check and handle it in time.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType();
@@ -154,9 +154,9 @@ public class VerifyComplianceJob implements Job {
 
                                 //您XXX（项目名称）中GB 7258的验证符合性确认任务今天即将结束，请及时查看处理
                                 //The the Verify compliance confirmation of GB 7258 in XXX (project name)  is coming to an end today. Please check and deal with it in time
-                                String msgContentEN = "The the Verify compliance confirmation of "
+                                String msgContentEN = "The the validation compliance confirmation of "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is coming to an end today. Please check and deal with it in time.";
+                                        + " will expire today. Please check and address it in time.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java

@@ -128,9 +128,9 @@ public class designComplianceJob implements Job {
                                 threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());
 
                                 //您XXX（项目名称）中GB 7258的设计符合性确认剩余处理时间还有3天，请及时查看处理
-                                String msgContentEN = "The remaining processing time for the design compliance confirmation of "
+                                String msgContentEN = "The remaining processing time for the design compliance confirmation for "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is 3 days. Please check and handle it in time.";
+                                        + " are 3 days.  Please check and address it in a timely manner.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();
@@ -151,9 +151,9 @@ public class designComplianceJob implements Job {
                                 currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList());
 
                                 //您XXX（项目名称）中GB 7258的设计符合性确认任务今天即将结束，请及时查看处理
-                                String msgContentEN = "The the design compliance confirmation of "
+                                String msgContentEN = "The the design compliance confirmation for "
                                         + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
-                                        + " is coming to an end today. Please check and deal with it in time.";
+                                        + " will expire today. Please check and address it in time.";
 
                                 //飞书跳转链接
                                 String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -1089,8 +1089,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
 
 					//消息内容
-					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation of " + projectNameInfoEO.getProjectName()
+					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " + projectNameInfoEO.getProjectName()
-							+ ". The due date is：" +inventoryAffirmDueDate+ ". Please check and deal with it in time.";
+							+ ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
 
 					//飞书跳转链接
 					String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();
@@ -1595,12 +1595,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
-			msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
+			msgContentEN = sysUser.getUsername() + " assigned the regulation task confirmation of " + projectNameInfoEO.getProjectName()
-					+ ".The due date is：" +taskAffirmDueDate+ " Please check and deal with it in time.";
+					+ ".The due date is：" +taskAffirmDueDate+ " Please check and address it in a timely manner.";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
-			msgContentEN = sysUser.getUsername() + " has distributed the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
 					+ ".to you. the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java

@@ -3,12 +3,16 @@ package com.jero.modules.project.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
-import com.jero.modules.project.mapper.*;
+import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
+import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
+import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
+import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
 import com.jero.modules.project.util.SendMessageUtils;
@@ -23,8 +27,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 项目库-任务清单明细表
  * @Author: jero-boot
@@ -263,12 +265,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 					+ " to you. Please check and handle it in time.";
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.PREHOMO_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Pre-Homo confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
-			msgContentEN = currentUser.getUsername() + " has distributed the Pre-Homo confirmation process of "
+			msgContentEN = currentUser.getUsername() + " has assigned the Pre-Homo confirmation process of "
 					+ projectLawsInventoryEO.getSerialNumber() + " in "+ projectNameInfoEO.getProjectName()
 					+ " to you. Please check and handle it in time.";
 		}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.VERIFY_ISSUE_DRE_MSG.getValue())){
 			//XXX has distributed the Verify compliance confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
-			msgContentEN = currentUser.getUsername() + " has distributed the Verify compliance confirmation process of "
+			msgContentEN = currentUser.getUsername() + " has assigned the validation compliance confirmation process of "
 					+ projectLawsInventoryEO.getSerialNumber() + " in "+ projectNameInfoEO.getProjectName()
 					+ " to you. Please check and handle it in time.";
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java

@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
@@ -31,17 +32,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * @Description: 项目库-任务清单表
  * @Author: jero-boot
@@ -317,12 +315,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 					+ " in time.";
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_REMIND_MSG.getValue())){
 			//Please check and deal with the Pre-Homo confirmation process of GB 7258 in XXX (project name) in time.
-			msgContentEN = "Please check and deal with the Pre-Homo confirmation process of "
+			msgContentEN = "Please check and address the Pre-Homo confirmation process of "
 					+ serialNumber + " in "+ projectNameInfoEO.getProjectName()
 					+ " in time.";
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.VERIFY_REMIND_MSG.getValue())){
 			//Please check and deal with the Verify compliance confirmation process of GB 7258 in XXX (project name) in time.
-			msgContentEN = "Please check and deal with the Verify compliance confirmation process of "
+			msgContentEN = "Please check and address the Verify compliance confirmation process of "
 					+ serialNumber + " in "+ projectNameInfoEO.getProjectName()
 					+ " in time.";
 		}
@@ -606,7 +604,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 		userIdList.addAll(Arrays.asList(dreUserIds.split(",")));
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
-			msgContentEN = sysUser.getUsername() + "has distributed the design compliance confirmation process of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+			msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
 					+ " to you.  Please check and handle it in time.";
 		}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java

@@ -306,7 +306,9 @@ public class FileSpiltService {
                                     SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                                     treeList.add(sarFileSplitMenuEO);
                                     message.setMenuId(sarFileSplitMenuEO.getId());
-                                    addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                    if(!StringUtils.isEmpty(itemName)){
+                                        addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                    }
                                     messageList.add(message);
                                     nowStart = getNewNowStart(nowStart.get(i));
                                     menuCanAdd = true;
@@ -544,7 +546,9 @@ public class FileSpiltService {
                             SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                             treeList.add(sarFileSplitMenuEO);
                             message.setMenuId(sarFileSplitMenuEO.getId());
-                            addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            if(!StringUtils.isEmpty(itemName)){
+                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            }
                             messageList.add(message);
                             nowStart = getNewNowStart(nowStart.get(i));
                             menuCanAdd = true;
@@ -728,7 +732,9 @@ public class FileSpiltService {
                                 SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                                 treeList.add(sarFileSplitMenuEO);
                                 message.setMenuId(sarFileSplitMenuEO.getId());
-                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                if(!StringUtils.isEmpty(itemName)){
+                                    addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                }
                                 messageList.add(message);
                                 nowStart = getNewNowStartUS(nowStart.get(i));
                                 menuCanAdd = true;
@@ -1102,7 +1108,9 @@ public class FileSpiltService {
                             SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                             treeList.add(sarFileSplitMenuEO);
                             message.setMenuId(sarFileSplitMenuEO.getId());
-                            addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            if(!StringUtils.isEmpty(itemName)){
+                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            }
                             messageList.add(message);
                             nowStart = getNewNowStartJapanTwo(lastStrTemp, secondStrTemp, nowStart.get(i));
                             menuCanAdd = true;
@@ -1276,7 +1284,10 @@ public class FileSpiltService {
                                 SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                                 treeList.add(sarFileSplitMenuEO);
                                 message.setMenuId(sarFileSplitMenuEO.getId());
-                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+//                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                if(!StringUtils.isEmpty(itemName)){
+                                    addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                                }
                                 messageList.add(message);
                                 nowStart = getNewNowStartEU(nowStart.get(i));
                                 menuCanAdd = true;
@@ -1453,7 +1464,9 @@ public class FileSpiltService {
                             SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                             treeList.add(sarFileSplitMenuEO);
                             message.setMenuId(sarFileSplitMenuEO.getId());
-                            addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            if(!StringUtils.isEmpty(itemName)){
+                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            }
                             messageList.add(message);
                             nowStart = getNewNowStartKmvssArticle(lastStr, nowStart.get(i));
                             menuCanAdd = true;
@@ -1676,7 +1689,9 @@ public class FileSpiltService {
                             SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
                             treeList.add(sarFileSplitMenuEO);
                             message.setMenuId(sarFileSplitMenuEO.getId());
-                            addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            if(!StringUtils.isEmpty(itemName)){
+                                addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
+                            }
                             messageList.add(message);
                             nowStart = getNewNowStartKmvssTable(catalogerArr, nowStart.get(i), menuLevel);
                             menuCanAdd = true;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -3300,7 +3300,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         for(OSSFile fileExportDto : allRelevFileList){
             String oldPath = fileExportDto.getUrl();
             String newPath = fileNowPath + File.separator + fileExportDto.getFileName();
-            File oldFile = new File(oldPath);
             if (CosBootUtil.doesObjectExist(oldPath)){
                 InputStream in = CosBootUtil.download(oldPath);
                 copyFile1(in, newPath);

jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

@@ -217,6 +217,7 @@ export default {
           if (valid) {
             this.flag = true
             this.spinLoading = true
+            this.confirmLoading = true
               let postDate = {
                 title: this.formData.title,
                 paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
@@ -241,6 +242,7 @@ export default {
                 ).finally(() => {
                   this.flag = false
                   this.spinLoading = false
+                  this.confirmLoading = false
                   this.newVisible = false
                 })
               } else {
@@ -257,12 +259,14 @@ export default {
                 ).finally(() => {
                   this.flag = false
                   this.spinLoading = false
+                  this.confirmLoading = false
                   this.newVisible = false
                 })
               }
             } else {
               // this.$message.warning(this.$t('changeTheTitle'))
               this.spinLoading = false
+              this.confirmLoading = false
             }
         })
       }