Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -894,6 +894,10 @@ UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Fail' WHERE `id` = '149678
 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Depart' WHERE `id` = '1174511244036587521';
 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Company' WHERE `id` = '1174511197735665665';
 UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Position' WHERE `id` = '1174509082208395266';
+-- 项目状态 project_status 2022-08-12
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Development' WHERE `id` = '1513769417081630721';
+UPDATE `laws_weilai`.`sys_dict_item` SET `en_name` = 'Production' WHERE `id` = '1513769467044179970';
+
 
 -- 表字段 英文修改 2022-08-11
 -- OCR识别转换记录表
@@ -913,3 +917,13 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item No.' WHER
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Name' WHERE `id` = '9e91b704de198ccf2f5fb7297e675404';
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Item Content' WHERE `id` = '120a92b6d595c2fd68d2b90278357ce4';
 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Technical Field' WHERE `id` = 'ccf68e6578a0a446a6ac34018f0a477d';
+-- 文档库信息表 2022-08-12
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Standard Type' WHERE `id` = '441588d80cc31ce68fbdf2ce8b36f93c';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Area' WHERE `id` = '9f82d58f22a12792a53e202d64a39f06';
+-- 参数项收集清单 2022-08-12
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Batch' WHERE `id` = '161c35a16e92682972dd1aeb26151fa2';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Para Name' WHERE `id` = 'e586bd87d4d826ce3d7d373caf54c6f6';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Status' WHERE `id` = '9050dc65a7b2fe82927b74a9ef4a4bb4';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Field' WHERE `id` = 'ed57f77975218560b37ea497a20109c6';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6';
+UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b';

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

@@ -11,15 +11,15 @@ import java.util.Map;
  * @Date: Created in 15:17 2022/5/7
  */
 public enum CollectManifestStateEnum {
-    WAIT_COLLECT("待发起收集","Wait Collect","1"),
+    WAIT_COLLECT("待发起收集","To be collected","1"),
-    WAIT_SDT("待工程接口人处理","Wait Sdt","2"),
+    WAIT_SDT("待工程接口人处理","To be processed by eng. interface","2"),
-    SDT_BACK("工程接口人退回","Sdt Back","3"),
+    SDT_BACK("工程接口人退回","Rejected by eng. interface","3"),
-    WAIT_FILL("待填写","Wait Fill","4"),
+    WAIT_FILL("待填写","To be filled","4"),
-    DRE_BACK("填写人退回","Dre Back","5"),
+    DRE_BACK("填写人退回","Rejected by the applicant","5"),
-    SUBMIT("已提交","Submit","6"),
+    SUBMIT("已提交","Submitted","6"),
-    CERT_BACK("认证工程师退回","Cert Back","7"),
+    CERT_BACK("认证工程师退回","Rejected by homo engineer","7"),
-    SYNC_REPORT("已同步至上报库","Sync Report","8"),
+    SYNC_REPORT("已同步至上报库","Synced to library","8"),
-    CHANGE("变更","Change","9");
+    CHANGE("变更","Modify","9");
 
     String name;
     String enName;

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

@@ -9,9 +9,9 @@ import java.util.List;
  * @Date: Created in 16:47 2022/5/11
  */
 public enum CollectManifestUserTypeEnum {
-    HOMO("认证工程师", "Homologation Engineer", "homo"),
+    HOMO("认证工程师", "Homo Engineer", "homo"),
-    SDT("工程接口人", "Sdt People","sdt"),
+    SDT("工程接口人", "Eng. Interface","sdt"),
-    DRE("填写人", "Dre People","dre"),
+    DRE("填写人", "Filled by","dre"),
     STUDIO("R&H Studio","R&H Studio","studio"),
     MANAGER("R&H Manager","R&H Manager","manager"),
     ADMIN("系统","Administrator","admin"),

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

@@ -386,7 +386,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if (CutEnum.CN.getValue().equals(cut)) {
 				bussExportParams.setSheetName("企业参数表");
 			} else {
-				bussExportParams.setSheetName("Company Params");
+				bussExportParams.setSheetName("Company parameter");
 			}
 			bussExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题
 			bussExportParams.setStyle(CommonExcelExportStyler.class);
@@ -727,7 +727,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		// 创建参数对象（用来设定excel得sheet得内容等信息）
 		ExportParams bussExportParams = new ExportParams();
 		// 设置sheet得名称
-		bussExportParams.setSheetName("Company Params");
+		bussExportParams.setSheetName("Company parameter");
 		bussExportParams.setType(ExcelType.XSSF); // 解决HSSFRichTextString cannot cast XSSFRichTextString问题
 		bussExportParams.setStyle(CommonExcelExportStyler.class);
 		// 创建sheet1使用得map
@@ -930,8 +930,8 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					// 第几个sheet页
 					if (numSheet == 0) { // 企业参数表
 						if (CutEnum.EN.getValue().equals(cut)) {
-							String fields[] ={ "*NIO Number", "*Is Must", "*Params Name","*Params Batch","*Duty Territory",
+							String fields[] ={ "*NIO Number", "*Required", "*Para Name","*Para Batch","*Responsible Field",
-									"Description", "*Control Type", "Control Verify", "Control Values", "Default Value", "File Template"};
+									"Description", "*Control Component", "Validate Component", "Component Value", "Default Value", "File Template"};
 							params.setImportFields(fields);
 
 							ExcelImportResult<ParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params);
@@ -950,7 +950,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if (certCategoryMap.containsKey(sheetName)) {
 							List<CertCategoryParamsInfoCnImport> list = new ArrayList<>();
 							if (CutEnum.EN.getValue().equals(cut)) {
-								String fields[] ={ "*NIO Number", "*Number", "*Params Name","Description"};
+								String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"};
 								params.setImportFields(fields);
 
 								ExcelImportResult<CertCategoryParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params);
@@ -1235,7 +1235,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					if(CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
 					} else {
-						errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces;";
+						errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
 					}
 					countError++;
 				}
@@ -1257,10 +1257,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 是否必填
 			String isMust = dto.getIsMust();
-			resultMap = validateMustAndLength(isMust, "是否必填", "Is Must", IsMustEnum.YES.getValue(), "50", false, cut);
+			resultMap = validateMustAndLength(isMust, "是否必填", "Required", IsMustEnum.YES.getValue(), "50", false, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(isMust,"是否必填","Is Must","enum",paramsIsMustEnumMap,null,null,cut);
+			resultMap = getCodeByName(isMust,"是否必填","Required","enum",paramsIsMustEnumMap,null,null,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 			isMust = (String)resultMap.get("value");
@@ -1268,7 +1268,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 参数名称
 			String paramsName = dto.getParamsName();
-			resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(), "100", false, cut);
+			resultMap = validateMustAndLength(paramsName, "参数名称", "Para Name", IsMustEnum.YES.getValue(), "100", false, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
@@ -1285,10 +1285,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 参数批次
 			String paramsBatch = dto.getParamsBatch();
-			resultMap = validateMustAndLength(paramsBatch, "参数批次", "Params Batch", IsMustEnum.YES.getValue(), "50", true, cut);
+			resultMap = validateMustAndLength(paramsBatch, "参数批次", "Para Batch", IsMustEnum.YES.getValue(), "50", true, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(paramsBatch,"参数批次", "Params Batch", "dicCode",null,itemNameList,dictItemList,cut);
+			resultMap = getCodeByName(paramsBatch,"参数批次", "Para Batch", "dicCode",null,itemNameList,dictItemList,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 			paramsBatch = (String)resultMap.get("value");
@@ -1296,10 +1296,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 责任领域
 			String dutyTerritory = dto.getDutyTerritory();
-			resultMap = validateMustAndLength(dutyTerritory, "责任领域", "Duty Territory", IsMustEnum.YES.getValue(), "50",true, cut);
+			resultMap = validateMustAndLength(dutyTerritory, "责任领域", "Responsible Field", IsMustEnum.YES.getValue(), "50",true, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(dutyTerritory,"责任领域", "Duty Territory", "dicCode",null,itemNameList,dictItemList,cut);
+			resultMap = getCodeByName(dutyTerritory,"责任领域", "Responsible Field", "dicCode",null,itemNameList,dictItemList,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 			dutyTerritory = (String)resultMap.get("value");
@@ -1323,10 +1323,10 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			// 控件类型
 			String controlType = dto.getControlType();
-			resultMap = validateMustAndLength(controlType, "控件类型", "Control Type", IsMustEnum.YES.getValue(), "50", false, cut);
+			resultMap = validateMustAndLength(controlType, "控件类型", "Control Component", IsMustEnum.YES.getValue(), "50", false, cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
-			resultMap = getCodeByName(controlType,"控件类型", "Control Type", "enum",controlTypeEnumMap,null,null,cut);
+			resultMap = getCodeByName(controlType,"控件类型", "Control Component", "enum",controlTypeEnumMap,null,null,cut);
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 			controlType = (String)resultMap.get("value");
@@ -1352,9 +1352,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
-				resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.YES.getValue(), "500", false, cut);
+				resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.YES.getValue(), "500", false, cut);
 			} else {
-				resultMap = validateMustAndLength(controlValues, "控件备选值", "Control Values", IsMustEnum.NO.getValue(), "500", false, cut);
+				resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.NO.getValue(), "500", false, cut);
 				dto.setControlValues(null);
 			}
 			errorMsg += (String)resultMap.get("errorMsg");
@@ -1367,22 +1367,22 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
-				resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.YES.getValue(), "50", false, cut);
+				resultMap = validateMustAndLength(controlVerify, "控件校验", "Validate Component", IsMustEnum.YES.getValue(), "50", false, cut);
 
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
-				resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
+				resultMap = getCodeByName(controlVerify,"控件校验", "Validate Component", "enum",controlVerifyEnumMap,null,null,cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 				controlVerify = (String)resultMap.get("value");
 				dto.setControlVerify(controlVerify);
 
 			} else {
-				resultMap = validateMustAndLength(controlVerify, "控件校验", "Control Verify", IsMustEnum.NO.getValue(), "50", false, cut);
+				resultMap = validateMustAndLength(controlVerify, "控件校验", "Validate Component", IsMustEnum.NO.getValue(), "50", false, cut);
 
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
-				resultMap = getCodeByName(controlVerify,"控件校验", "Control Verify", "enum",controlVerifyEnumMap,null,null,cut);
+				resultMap = getCodeByName(controlVerify,"控件校验", "Validate Component", "enum",controlVerifyEnumMap,null,null,cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 
@@ -1409,7 +1409,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					if (CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += "附件模板只能上传一个文件;";
 					} else {
-						errorMsg += "File template only can upload one;";
+						errorMsg += "File template only can upload one; ";
 					}
 				}
 				for (String fileName : fileTemplateName.split(",")) {
@@ -1419,7 +1419,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if (CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += "附件模板压缩包中没有" + fileName + "文件; ";
 						} else {
-							errorMsg += "File template " + fileName + "isn't present in the cabinet;";
+							errorMsg += "File template " + fileName + "isn't present in the cabinet; ";
 						}
 						countError++;
 					} else {
@@ -1493,16 +1493,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if(CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
 						} else {
-							errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces;";
+							errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
 						}
 						countError++;
 					}
 					if (CollectionUtil.isNotEmpty(ccNioNumberImport)) {
 						if (ccNioNumberImport.contains(ccDto.getNioNumber())) {
 							if (CutEnum.CN.getValue().equals(cut)) {
-								errorMsg += "NIO编号重复！";
+								errorMsg += "NIO编号重复；";
 							} else {
-								errorMsg += "NIO number already exists!";
+								errorMsg += "NIO number already exists; ";
 							}
 							countError++;
 						} else {
@@ -1524,14 +1524,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if(CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += "编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格；";
 						} else {
-							errorMsg += "Number formatting errors, can only letters, numbers, dash (-),dot (.),left slash,spaces;";
+							errorMsg += "Number formatting errors, can only letters, numbers, dash (-),dot (.),left slash,spaces; ";
 						}
 						countError++;
 					}
 				}
 				// 参数名称
 				String paramsName = ccDto.getParamsName();
-				resultMap = validateMustAndLength(paramsName, "参数名称", "Params Name", IsMustEnum.YES.getValue(),"100", false, cut);
+				resultMap = validateMustAndLength(paramsName, "参数名称", "Para Name", IsMustEnum.YES.getValue(),"100", false, cut);
 				errorMsg += (String)resultMap.get("errorMsg");
 				countError += (int)resultMap.get("countError");
 				// 参数说明
@@ -1558,7 +1558,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					if (CutEnum.CN.getValue().equals(cut)) {
 						stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；");
 					} else {
-						stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + ";");
+						stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + "; ");
 					}
 				}
 			}
@@ -1579,7 +1579,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				if (CutEnum.CN.getValue().equals(cut)) {
 					stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；");
 				} else {
-					stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + ";");
+					stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + "; ");
 				}
 			}
 		}
@@ -1635,7 +1635,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if(CutEnum.CN.getValue().equals(cut)) {
 				errorMsg += fieldNameCn + "为必填项,不能为空；";
 			} else {
-				errorMsg += fieldNameEn + " is mandatory and cannot be empty;";
+				errorMsg += fieldNameEn + " is mandatory and cannot be empty; ";
 			}
 			countError++;
 		}
@@ -1644,7 +1644,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			if(CutEnum.CN.getValue().equals(cut)) {
 				errorMsg += fieldNameCn + "不能超过" + dbLength + "个字符；";
 			} else {
-				errorMsg += fieldNameEn + " can not be more than " + dbLength + " char;";
+				errorMsg += fieldNameEn + " can not be more than " + dbLength + " char; ";
 			}
 			countError++;
 		}
@@ -1655,7 +1655,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				if (CutEnum.CN.getValue().equals(cut)) {
 					errorMsg += fieldNameCn + "为单选项；";
 				} else {
-					errorMsg += fieldNameEn + " is single type;";
+					errorMsg += fieldNameEn + " is single type; ";
 				}
 				countError++;
 			}
@@ -1687,7 +1687,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if(CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += fieldNameCn + "中的" + lastValue + "与数据字典不匹配；";
 						} else {
-							errorMsg += fieldNameEn +" "+ lastValue + " does not match the data dictionary;";
+							errorMsg += fieldNameEn +" "+ lastValue + " does not match the data dictionary; ";
 						}
 						countError++;
 					}
@@ -1742,7 +1742,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 						if(CutEnum.CN.getValue().equals(cut)) {
 							errorMsg += fieldNameCn + "中的" + valueTemp + "与数据字典不匹配；";
 						} else{
-							errorMsg += fieldNameEn + " " + valueTemp + " does not match the data dictionary";
+							errorMsg += fieldNameEn + " " + valueTemp + " does not match the data dictionary; ";
 						}
 						countError++;
 					}
@@ -1777,7 +1777,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					if(CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += fieldNameCn + "中的" + value + "不正确；";
 					} else{
-						errorMsg += fieldNameEn + " " + value + " is not correct";
+						errorMsg += fieldNameEn + " " + value + " is not correct; ";
 					}
 					countError++;
 				}

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

@@ -47,7 +47,7 @@ public class CertCategoryParamsInfoEnExport {
     private String paramsNumber;
 
     /**参数名称*/
-    @Excel(name = "*Params Name", width = 15, orderNum = "3")
+    @Excel(name = "*Para Name", width = 15, orderNum = "3")
     @ApiModelProperty(value = "参数名称")
     private String paramsName;
 

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

@@ -47,7 +47,7 @@ public class CertCategoryParamsInfoEnImport {
     private String paramsNumber;
 
     /**参数名称*/
-    @Excel(name = "*Params Name", width = 15, orderNum = "3")
+    @Excel(name = "*Para Name", width = 15, orderNum = "3")
     @ApiModelProperty(value = "参数名称")
     private String paramsName;
 

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

@@ -50,12 +50,12 @@ public class ParamsInfoEnExport {
     private String nioNumber;
 
     /**是否必填*/
-    @Excel(name = "*Is Must", width = 15, replace = {"yes_1","no_0"})
+    @Excel(name = "*Required", width = 15, replace = {"yes_1","no_0"})
     @ApiModelProperty(value = "是否必填")
     private String isMust;
 
     /**参数名称*/
-    @Excel(name = "*Params Name", width = 15)
+    @Excel(name = "*Para Name", width = 15)
     @ApiModelProperty(value = "参数名称")
     private String paramsName;
 
@@ -66,13 +66,13 @@ public class ParamsInfoEnExport {
     private String technologyTerritory;
 
     /**参数批次*/
-    @Excel(name = "*Params Batch", width = 15, dicCode = "params_batch_en")
+    @Excel(name = "*Para Batch", width = 15, dicCode = "params_batch_en")
     @Dict(dicCode = "params_batch")
     @ApiModelProperty(value = "参数批次")
     private String paramsBatch;
 
     /**责任领域*/
-    @Excel(name = "*Duty Territory", width = 15, dicCode = "duty_territory_en")
+    @Excel(name = "*Responsible Field", width = 15, dicCode = "duty_territory_en")
     @Dict(dicCode = "duty_territory")
     @ApiModelProperty(value = "责任领域")
     private String dutyTerritory;
@@ -89,17 +89,17 @@ public class ParamsInfoEnExport {
     private String certCategory;
 
     /**控件类型*/
-    @Excel(name = "*Control Type", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10","Title_11"})
+    @Excel(name = "*Control Component", width = 15, replace = {"Text_1","Pull single_2","Pull more_3","File_4","Text+Pull single_5","Text+Pull more_6","Text+File_7","Pull single+File_8","Pull more+File_9","Text+Pull single+File_10","Title_11"})
     @ApiModelProperty(value = "控件类型")
     private String controlType;
 
     /**控件校验*/
-    @Excel(name = "Control Verify", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
+    @Excel(name = "Validate Component", width = 15, replace = {"Null_1","Chinese_2","Integer_3","Positive float_4","Integer decimal_5","Decimal one_6","Decimal two_7","Decimal three_8","Decimal four_9"})
     @ApiModelProperty(value = "控件校验")
     private String controlVerify;
 
     /**控件备选值*/
-    @Excel(name = "Control Values", width = 15)
+    @Excel(name = "Component Value", width = 15)
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 

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

@@ -18,12 +18,12 @@ public class ParamsInfoEnImport {
     private String nioNumber;
 
     /**是否必填*/
-    @Excel(name = "*Is Must", width = 15)
+    @Excel(name = "*Required", width = 15)
     @ApiModelProperty(value = "是否必填")
     private String isMust;
 
     /**参数名称*/
-    @Excel(name = "*Params Name", width = 15)
+    @Excel(name = "*Para Name", width = 15)
     @ApiModelProperty(value = "参数名称")
     private String paramsName;
 
@@ -33,12 +33,12 @@ public class ParamsInfoEnImport {
     private String technologyTerritory;
 
     /**参数批次*/
-    @Excel(name = "*Params Batch", width = 15)
+    @Excel(name = "*Para Batch", width = 15)
     @ApiModelProperty(value = "参数批次")
     private String paramsBatch;
 
     /**责任领域*/
-    @Excel(name = "*Duty Territory", width = 15)
+    @Excel(name = "*Responsible Field", width = 15)
     @ApiModelProperty(value = "责任领域")
     private String dutyTerritory;
 
@@ -53,17 +53,17 @@ public class ParamsInfoEnImport {
     private String certCategory;
 
     /**控件类型*/
-    @Excel(name = "*Control Type", width = 15)
+    @Excel(name = "*Control Component", width = 15)
     @ApiModelProperty(value = "控件类型")
     private String controlType;
 
     /**控件校验*/
-    @Excel(name = "Control Verify", width = 15)
+    @Excel(name = "Validate Component", width = 15)
     @ApiModelProperty(value = "控件校验")
     private String controlVerify;
 
     /**控件备选值*/
-    @Excel(name = "Control Values", width = 15)
+    @Excel(name = "Component Value", width = 15)
     @ApiModelProperty(value = "控件备选值")
     private String controlValues;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

@@ -1,16 +1,16 @@
 package com.jero.modules.project.enums;
 
 public enum ProjectTaskPlanningNameEnum {
-    LIST_CONFIRMATION("清单确认"," Checklist confirmation"),
+    LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"),
-    LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"),
+    LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"),
-    DESIGN_DEADLINE("设计符合性","Design compliance"),
+    DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"),
 //    PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"),
 //    ATTESTATION_START_TIME("认证开始","Certification begins"),
 //    ATTESTATION_END_TIME("认证结束"," End of certification"),
-    PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo   value:Pre-Homo
+    PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Confirmation"), // name:Pre-Homo   value:Pre-Homo
-    ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),//  name:认证开始   value:Certification begins
+    ATTESTATION_START_TIME("认证结束","Homo Completion"),//  name:认证开始   value:Certification begins
-    ATTESTATION_END_TIME("认证批准","Type Approval"),//  name:认证结束   value:End of certification
+    ATTESTATION_END_TIME("认证开始","Homo KO"),//  name:认证结束   value:End of certification
-    VERIFY_DEADLINE("验证符合性","Verify compliance"),
+    VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"),
     ;
     String name;
     String value;

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

@@ -2320,7 +2320,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
 			userIdList.add(designDutyId);
 			msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
-					+ ". you sumitted has been approved.";
+					+ " you submitted has been approved.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a design compliance task to complete";
 
@@ -2338,7 +2338,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			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.";
+					+ " you submitted has been approved.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a Pre-Homo task to complete";
 
@@ -2356,7 +2356,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
 			msgContentEN = "The validation compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
-					+ "you sumitted has been approved.";
+					+ " you submitted has been approved.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a validation compliance task to complete";
 

jero-web/src/common/lang/en-us.js

@@ -1213,7 +1213,7 @@ module.exports = {
   displayPermission: 'Display permission',
   authorizedUser: 'Authorized user',
   problemClassification: 'Problem classification',
-  market: 'market',
+  market: 'Market',
   documentNumber: 'Document Number',
   documentTitle: 'Document Title',
   bringInDocumentInformation: 'Bring in document information',

jero-web/src/components/search/index.vue

@@ -195,7 +195,7 @@
         this.queryParam = {}
         if (this.isDefault) {
           let startTime = moment(new Date()).format('YYYY-MM-DD')
-          let endTime = this.getNewDate('after', 6)
+          let endTime = this.haflYear()
           this.queryParam['WarnTime'] = [startTime, endTime]
           this.queryParam = { ...this.queryParam }
         }
@@ -217,68 +217,26 @@
           }
         })
       },
-      getNewDate(flag, many) {
+      haflYear() {
-
+        // 先获取当前时间
-        const thirtyDays = [4, 6, 9, 11] // 30天的月份
+        var curDate = (new Date()).getTime()
-
+        // 将半年的时间单位换算成毫秒
-        const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份
+        var halfYear = 365 / 2 * 24 * 3600 * 1000
-
+        // 半年前的时间（毫秒单位）
-        const currDate = new Date() // 今天日期
+        var pastResult = curDate - halfYear
-
+        // 日期函数，定义起点为半年前
-        const year = currDate.getFullYear()
+        var pastDate = new Date(pastResult)
-
+        var pastYear = pastDate.getFullYear()
-        let month = currDate.getMonth() + 1
+        var pastMonth = pastDate.getMonth() + 1
-
+        var pastDay = pastDate.getDate()
-        let targetDateMilli = 0
+        if (pastMonth >= 1 && pastMonth <= 9) {
-
+          pastMonth = '0' + pastMonth
-        let GMTDate = '' // 中国标准时间
-
-        let targetYear = '' // 年
-
-        let targetMonth = '' // 月
-
-        let targetDate = '' // 日
-
-        let dealTargetDays = '' // 目标日期
-
-        const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年
-
-        let countDays = 0 // 累计天数
-
-        for (let i = 0; i < many; i++) {
-
-          if (flag === 'before') {
-
-            month = month - 1 <= 0 ? 12 : month - 1
-
-          } else {
-
-            month = month + 1 > 12 ? 1 : month + 1
-
-          }
-
-          thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28)
         }
-
+        if (pastDay >= 0 && pastDay <= 9) {
-        targetDateMilli = currDate.setDate(
+          pastDay = '0' + pastDay
-          currDate.getDate() - (flag === 'before' ? countDays : countDays * -1)
+        }
-        )
+        var endDate = pastYear + '-' + pastMonth + '-' + pastDay
-
+        return endDate
-        GMTDate = new Date(targetDateMilli)
-
-        targetYear = GMTDate.getFullYear()
-
-        targetMonth = GMTDate.getMonth() + 1
-
-        targetDate = GMTDate.getDate()
-
-        targetMonth = targetMonth.toString().padStart(2, '0')
-
-        targetDate = targetDate.toString().padStart(2, '0')
-
-        dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}`
-
-        return dealTargetDays
       },
       dateChange(item) {
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -587,4 +587,7 @@
   ::v-deep .itemModel-explain .ant-form-explain {
     margin-top: 60px
   }
+  ::v-deep .ql-tooltip {
+    z-index: 10 !important;
+  }
 </style>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -123,8 +123,8 @@
           }
         })
       },
-      classificationMaintenanceModelForm(){
+      classificationMaintenanceModelForm() {
-         this.replacePage()
+        this.replacePage()
       },
       onSearch() {
         this.pageNo = 1
@@ -361,6 +361,18 @@
     text-align: center;
     line-height: 10;
   }
+
+  ::v-deep .ant-tag {
+    padding: 2px 4px;
+    background: #9B9DA9;
+    color: #fff!important;
+  }
+  ::v-deep .ant-tag-checkable:not(.ant-tag-checkable-checked):hover{
+    color: #fff!important;
+  }
+  ::v-deep .ant-tag-checkable-checked{
+    background: #21c9cc;
+  }
 </style>
 <style>
   .box-content-left .ant-tag {

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue

@@ -22,7 +22,7 @@
                  {{$t('issuedBy')}}:{{this.queryForm.createBy}}
               </span>
             <span>
-                 {{$t('releaseDate')}}:{{this.queryForm.createTime}}
+                 {{$t('releaseDate')}}:{{this.queryForm.createTime?this.queryForm.createTime.slice(0,11):''}}
              </span>
           </div>
           <div class="content-text">
@@ -254,21 +254,26 @@
           this.$message.warning(this.$t('pleaseEnter'))
           return
         }
-        let query = {
+        this.$refs.ruleForm.validate(valid => {
-          problemKnowledgeBaseId: this.$route.query.id,
+          if (valid) {
-          commentContent: this.formInline.commentContent,
+            let query = {
-          commentUserId: this.userInfo().id
+              problemKnowledgeBaseId: this.$route.query.id,
-        }
+              commentContent: this.formInline.commentContent,
-        this.loading = true
+              commentUserId: this.userInfo().id
-        postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => {
+            }
-          if (res.success) {
+            this.loading = true
-            this.$message.success(this.$t('OperationSuccessful'))
+            postAction('/problemKnowledgeBase/problemKnowledgeBaseCommentEO/add', query).then((res) => {
-            this.releaseData()
+              if (res.success) {
-            this.formInline = {}
+                this.$message.success(this.$t('OperationSuccessful'))
-            this.loading = false
+                this.$refs.ruleForm.clearValidate()
-          } else {
+                this.releaseData()
-            this.$message.warning(this.$t('operationFailed'))
+                this.formInline = {}
-            this.loading = false
+                this.loading = false
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+                this.loading = false
+              }
+            })
           }
         })
       },
@@ -398,6 +403,7 @@
     font-size: 16px;
     color: #040B29;
     font-weight: 400;
+    word-break: break-word;
   }
 
   .content-icon {
@@ -510,4 +516,5 @@
     font-size: 16px;
     margin-bottom: 20px;
   }
+
 </style>

jero-web/src/views/externalReports/index.vue

@@ -1239,7 +1239,10 @@ export default {
     }
   }
 }
-
+::v-deep .ant-modal-body {
+  max-height: 500px;
+  overflow-y: auto;
+}
 ///deep/ .ant-table-body {
 //  overflow: hidden !important; ?????
 //}
@@ -1350,10 +1353,10 @@ export default {
 
 }
 
-.ant-modal-body {
+/*.ant-modal-body {*/
-  max-height: 500px;
+/*  max-height: 500px;*/
-  overflow-y: auto;
+/*  overflow-y: auto;*/
-}
+/*}*/
 
 .split-detail-table {
   .ant-table-body {

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -232,74 +232,32 @@
       },
       clearSelected() {
         let startTime = moment(new Date()).format('YYYY-MM-DD')
-        let endTime = this.getNewDate('after', 6)
+        let endTime = this.haflYear()
         this.searchParmes['WarnTime'] = [startTime, endTime]
         this.searchParmes = { ...this.searchParmes }
         this.pageNo = 1
         this.getList()
       },
-      getNewDate(flag, many) {
+      haflYear() {
-
+        // 先获取当前时间
-        const thirtyDays = [4, 6, 9, 11] // 30天的月份
+        var curDate = (new Date()).getTime()
-
+        // 将半年的时间单位换算成毫秒
-        const thirtyOneDays = [1, 3, 5, 7, 8, 10, 12] // 31天的月份
+        var halfYear = 365 / 2 * 24 * 3600 * 1000
-
+        // 半年前的时间（毫秒单位）
-        const currDate = new Date() // 今天日期
+        var pastResult = curDate - halfYear
-
+        // 日期函数，定义起点为半年前
-        const year = currDate.getFullYear()
+        var pastDate = new Date(pastResult)
-
+        var pastYear = pastDate.getFullYear()
-        let month = currDate.getMonth() + 1
+        var pastMonth = pastDate.getMonth() + 1
-
+        var pastDay = pastDate.getDate()
-        let targetDateMilli = 0
+        if (pastMonth >= 1 && pastMonth <= 9) {
-
+          pastMonth = '0' + pastMonth
-        let GMTDate = '' // 中国标准时间
-
-        let targetYear = '' // 年
-
-        let targetMonth = '' // 月
-
-        let targetDate = '' // 日
-
-        let dealTargetDays = '' // 目标日期
-
-        const isLeapYear = !!((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) // 是否是闰年
-
-        let countDays = 0 // 累计天数
-
-        for (let i = 0; i < many; i++) {
-
-          if (flag === 'before') {
-
-            month = month - 1 <= 0 ? 12 : month - 1
-
-          } else {
-
-            month = month + 1 > 12 ? 1 : month + 1
-
-          }
-
-          thirtyDays.includes(month) ? (countDays += 30) : thirtyOneDays.includes(month) ? (countDays += 31) : isLeapYear ? (countDays += 29) : (countDays += 28)
         }
-
+        if (pastDay >= 0 && pastDay <= 9) {
-        targetDateMilli = currDate.setDate(
+          pastDay = '0' + pastDay
-          currDate.getDate() - (flag === 'before' ? countDays : countDays * -1)
+        }
-        )
+        var endDate = pastYear + '-' + pastMonth + '-' + pastDay
-
+        return endDate
-        GMTDate = new Date(targetDateMilli)
-
-        targetYear = GMTDate.getFullYear()
-
-        targetMonth = GMTDate.getMonth() + 1
-
-        targetDate = GMTDate.getDate()
-
-        targetMonth = targetMonth.toString().padStart(2, '0')
-
-        targetDate = targetDate.toString().padStart(2, '0')
-
-        dealTargetDays = `${targetYear}-${targetMonth}-${targetDate}`
-
-        return dealTargetDays
       },
       pageOnChange(page) {
         this.pageNo = page