合并分支 'fix_20230420' 到 'master'

Fix 20230420

查看合并请求 laws-nio/laws-weilai!314

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java

@@ -142,6 +142,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/opensso/**", "anon"); //单点登录
 
         filterChainDefinitionMap.put("/project/projectLibraryBase/getProjectInfo", "anon"); // 对接火山引擎接口-获取项目统计信息
+        filterChainDefinitionMap.put("/project/projectLibraryBase/getProjectProgressInfo", "anon"); // 对接火山引擎接口-获取项目统计信息
         filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除
         filterChainDefinitionMap.put("/project/projectLawsInventoryEO/updateFlowInfoByProjectLibraryIds", "anon"); // 项目库-法规清单 根据项目库id更新符合性流程发起人、责任人接口排除
         filterChainDefinitionMap.put("/project/projectTaskInventoryEO/processCall", "anon"); // 项目库-任务清单 工作流处理数据接口排除

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectCertificationInventoryEOController.java

@@ -323,4 +323,15 @@ public class ProjectCertificationInventoryEOController extends JeroController<Pr
 	 public Result<?> addConfigByIds(@RequestBody JSONObject json) {
 		 return this.projectCertificationInventoryEOService.addConfigByIds(json);
 	 }
+
+	 /**
+	  * 获取责任人和接口人
+	  * @return
+	  */
+	 @AutoLog(value = "项目库-认证清单表-获取责任人和接口人")
+	 @ApiOperation(value="项目库-认证清单表-获取责任人和接口人", notes="项目库-认证清单表-获取责任人和接口人")
+	 @GetMapping(value = "/queryDutyPersonByProjectId")
+	 public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params) {
+		 return Result.OK(this.projectCertificationInventoryEOService.queryDutyPersonByProjectId(params));
+	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java

@@ -527,4 +527,17 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	public Result<?> compulsoryTransfer(@RequestBody JSONObject json) {
 		return this.projectLawsInventoryEOService.compulsoryTransfer(json);
 	}
+
+	/**
+	 * 通过projectId查询责任人
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "项目库-法规清单表-通过projectId查询责任人")
+	@ApiOperation(value="项目库-法规清单表-通过projectId查询责任人", notes="项目库-法规清单表-通过projectId查询责任人")
+	@GetMapping(value = "/queryDutyPersonByProjectId")
+	public Result<?> queryDutyPersonByProjectId(@RequestParam Map<String,Object> params){
+		Map<String, List<Map<String, Object>>> res = this.projectLawsInventoryEOService.queryDutyPersonByProjectId(params);
+		return Result.OK(res);
+	}
 }

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

@@ -253,4 +253,5 @@ public interface IProjectCertificationInventoryEOService extends IService<Projec
 	void certificationInventoryEOListSortByEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
 	void certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
 	void certificationInventoryEOListSortByTaskConfirmEndTimeAsc(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOList);
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
 }

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

@@ -255,4 +255,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
     Result<?> citeDeliverable(JSONObject json);
 
     Result<?> compulsoryTransfer(JSONObject json);
+
+	Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params);
 }

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

@@ -5277,4 +5277,55 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 
 		return Result.OK("添加配置成功！");
 	}
+
+	@Override
+	public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
+		Map<String, List<Map<String, Object>>> result = new HashMap<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isNotEmpty(projectLibraryId)) {
+			LambdaQueryWrapper<ProjectCertificationInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryId);
+			List<ProjectCertificationInventoryEO> pciList = this.list(queryWrapper);
+			List<String> dutyList = new ArrayList<>();
+			List<String> interfaceList = new ArrayList<>();
+			for (ProjectCertificationInventoryEO pci : pciList) {
+				if(StringUtils.isNotEmpty(pci.getDutyPerson())){
+					dutyList.add(pci.getDutyPerson());
+				}
+				if(StringUtils.isNotEmpty(pci.getSdt())){
+					interfaceList.add(pci.getSdt());
+				}
+			}
+			if(CollectionUtils.isNotEmpty(dutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(dutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("dutyList",resList);
+			}
+
+			if(CollectionUtils.isNotEmpty(interfaceList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(interfaceList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("interfaceList",resList);
+			}
+		}
+		return result;
+	}
+
+
 }

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

@@ -45,6 +45,7 @@ import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.message.websocket.WebSocket;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.ota.entity.OtaBaCxTxjl;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.*;
 import com.jero.modules.project.mapper.*;
@@ -709,6 +710,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 编辑法规清单，发送消息
+	 *
 	 * @param projectLawsInventoryEO
 	 */
 	private void updateProjectLawsInventorySendMessage(ProjectLawsInventoryEO projectLawsInventoryEO) {
@@ -1123,6 +1125,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 更新流程信息
+	 *
 	 * @param projectLawsInventoryEO
 	 */
 	public void updateFlowInfo(ProjectLawsInventoryEO projectLawsInventoryEO) {
@@ -1152,6 +1155,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 更新流程办理人
+	 *
 	 * @param projectLawsInventoryEO 法规清单数据
 	 * @param projectTaskInventoryEO 任务清单数据
 	 * @param pId                    流程实例id
@@ -1209,6 +1213,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 更新待办中心流程信息明细表，处理人
+	 *
 	 * @param projectLawsInventoryEO
 	 * @param pId
 	 * @param flowType
@@ -1216,6 +1221,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	public void updateProcessInfoDetailAssignee(ProjectLawsInventoryEO projectLawsInventoryEO, String pId, String flowType) {
 		this.processInfoDetailEOService.updateProcessInfoDetailUserId(projectLawsInventoryEO, pId, flowType);
 	}
+
 	/**
 	 * 通过id删除
 	 *
@@ -1401,7 +1407,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//查当前用户Viewer对应责任领域
 			List<String> dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
 			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
-				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+//				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+				result = result.stream().filter(data -> {
+					boolean flag = false;
+					if (StringUtils.isNotEmpty(data.getDutyTerritory())) {
+						for (String dutyTerritory : dutyTerritoryList) {
+							if (StringUtils.contains(data.getDutyTerritory(), dutyTerritory)) {
+								flag = true;
+								break;
+							}
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
 			} else {
 				result = new ArrayList<>();
 			}
@@ -1709,6 +1727,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			return dummyInventoryInfoEOList;
 		}
 	}
+
 	// 任务确认状态排序
 	private List<ProjectLawsInventoryEO> taskSort(String orderBy, String orderByField,
 												  List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
@@ -1745,6 +1764,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			return dummyInventoryInfoEOList;
 		}
 	}
+
 	//认证级别
 	private List<ProjectLawsInventoryEO> attestationRankSort(String orderBy, String orderByField,
 															 List<ProjectLawsInventoryEO> dummyInventoryInfoEOList,
@@ -1812,6 +1832,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			});
 		}
 	}
+
 	//倒序
 	private void attestationRankReverse(String orderBy, List<ProjectLawsInventoryEO> list, Collator comparator) {
 		if (OrderEnum.POSITIVE.getValue().equals(orderBy)) {
@@ -1827,6 +1848,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 数据字典数据处理方法
+	 *
 	 * @param result 返回值
 	 * @param cut    中英文切换
 	 */
@@ -1945,6 +1967,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 处理展示数据字典值
+	 *
 	 * @param sysDictItems 所有的数据字典项
 	 * @param fieldValues  字段值
 	 * @param cut          中英文切换标识
@@ -1992,6 +2015,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 数据处理
+	 *
 	 * @param list
 	 */
 	@Override
@@ -2410,6 +2434,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证数据
+	 *
 	 * @param projectLibraryId 项目id
 	 * @param lawsInventoryId  法规详情id
 	 * @param currentUserId    当前登录人id
@@ -2439,6 +2464,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证用户在该项目中的角色
+	 *
 	 * @param projectLibraryId 项目库id
 	 * @param currentUserId    登录人id
 	 * @param lawsInventoryId  法规清单id
@@ -2485,6 +2511,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 批量更新状态
+	 *
 	 * @param json
 	 * @return
 	 */
@@ -2992,6 +3019,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 发送消息
+	 *
 	 * @param msgContent
 	 * @param userIdList
 	 * @param projectLibraryId
@@ -3056,6 +3084,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 匹配相关人员
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -3376,6 +3405,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 获取一个用户的id
+	 *
 	 * @param roleCode
 	 * @param projectRelatedPersonnelList
 	 * @return
@@ -3439,6 +3469,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 流程调用
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -3584,6 +3615,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 工作流发送消息
+	 *
 	 * @param jsonObject
 	 */
 	public void workFlowSendMsg(JSONObject jsonObject) {
@@ -4118,8 +4150,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())
 					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())
 					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())
-					||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue()))
+					|| StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())) {
-			{
 				hrefFeishu = backUrl
 						+ JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
 				//href = "<a href='" + JumpLinkEnum.TASK_AFFIRM_LINK.getLink() + "'>" + " View details" + "</a>";
@@ -4131,8 +4162,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())
 					|| StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())
 					|| StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())
-					||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue()))
+					|| StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) {
-			{
 				hrefFeishu = backUrl
 						+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink()
 						+ projectLibraryBase.getId()
@@ -4703,9 +4733,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) {
 		return contentLogBuilder.append("\'" + fieldName + "\'由" + oldValue + "改为了" + newValue).append("</br>");
 	}
+
 	public StringBuilder setUpdateEnContentLog(StringBuilder contentLogBuilder, String fieldName, String oldValue, String newValue) {
 		return contentLogBuilder.append("\'" + fieldName + "\' changed from " + oldValue + " to " + newValue).append("</br>");
 	}
+
 	private void translateData(List<ProjectLawsInventoryEO> infoList) {
 		for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) {
 			//子标题
@@ -6902,6 +6934,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 列表数据验证
+	 *
 	 * @param dataList
 	 * @param dictItemList
 	 * @param zipEntryName
@@ -7257,6 +7290,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 模板数据验证
+	 *
 	 * @param dataList
 	 * @param dictItemList
 	 * @param zipEntryName
@@ -8263,101 +8297,179 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	private String fieldConvert(String field) {
 		if (field == null) return null;
 		switch (field) {
-			case "*编号": return "serialNumber";
+			case "*编号":
-			case "*Number": return "serialNumber";
+				return "serialNumber";
+			case "*Number":
+				return "serialNumber";
 //			case "标题": return "title";
-			case "子标题": return "subtitle";
+			case "子标题":
-			case "Sub-Title": return "subtitle";
+				return "subtitle";
-			case "适用范围": return "shi4Yong4Fan4Wei2";
+			case "Sub-Title":
-			case "状态": return "state";
+				return "subtitle";
+			case "适用范围":
+				return "shi4Yong4Fan4Wei2";
+			case "状态":
+				return "state";
 //			case "对应标准": return "correspondingStandard";
-			case "实施类别": return "implementType";
+			case "实施类别":
-			case "Usage": return "implementType";
+				return "implementType";
-			case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+			case "Usage":
+				return "implementType";
+			case "新车实施日期":
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
 //			case "在产车实施日期": return "implementTime";
-			case "WVTA ID": return "wvtaId";
+			case "WVTA ID":
-			case "认证类型": return "attestationType";
+				return "wvtaId";
-			case "Certification Type": return "attestationType";
+			case "认证类型":
-			case "*认证级别": return "attestationRank";
+				return "attestationType";
-			case "*Certification Level": return "attestationRank";
+			case "Certification Type":
-			case "适用增补件": return "applicableSupplement";
+				return "attestationType";
-			case "Applicable Supplement": return "applicableSupplement";
+			case "*认证级别":
-			case "技术领域": return "technologyTerritory";
+				return "attestationRank";
-			case "*责任领域": return "dutyTerritory";
+			case "*Certification Level":
-			case "*Responsible Field": return "dutyTerritory";
+				return "attestationRank";
+			case "适用增补件":
+				return "applicableSupplement";
+			case "Applicable Supplement":
+				return "applicableSupplement";
+			case "技术领域":
+				return "technologyTerritory";
+			case "*责任领域":
+				return "dutyTerritory";
+			case "*Responsible Field":
+				return "dutyTerritory";
 //			case "适用地区": return "region";
-			case "备注": return "remark";
+			case "备注":
-			case "Comments": return "remark";
+				return "remark";
-			case "法规工程师": return "regulationOwnerId";
+			case "Comments":
-			case "Regulation Engineer": return "regulationOwnerId";
+				return "remark";
-			case "认证工程师": return "homologationEngineerId";
+			case "法规工程师":
-			case "Homologation Engineer": return "homologationEngineerId";
+				return "regulationOwnerId";
-			case "工程接口人": return "engineeringInterfacePerson";
+			case "Regulation Engineer":
-			case "Engineering Interface": return "engineeringInterfacePerson";
+				return "regulationOwnerId";
-			case "设计交付物类型": return "designDeliverableType";
+			case "认证工程师":
-			case "design Deliverable Type": return "designDeliverableType";
+				return "homologationEngineerId";
-			case "设计交付物模板": return "designDeliverableTemplate";
+			case "Homologation Engineer":
-			case "design Deliverable Template": return "designDeliverableTemplate";
+				return "homologationEngineerId";
-			case "设计发起人": return "designInitiatorId";
+			case "工程接口人":
-			case "design Reviewer": return "designInitiatorId";
+				return "engineeringInterfacePerson";
-			case "设计责任人": return "designDutyId";
+			case "Engineering Interface":
-			case "design Assignee": return "designDutyId";
+				return "engineeringInterfacePerson";
-			case "设计截止时间": return "designDueDate";
+			case "设计交付物类型":
-			case "design Due Date": return "designDueDate";
+				return "designDeliverableType";
+			case "design Deliverable Type":
+				return "designDeliverableType";
+			case "设计交付物模板":
+				return "designDeliverableTemplate";
+			case "design Deliverable Template":
+				return "designDeliverableTemplate";
+			case "设计发起人":
+				return "designInitiatorId";
+			case "design Reviewer":
+				return "designInitiatorId";
+			case "设计责任人":
+				return "designDutyId";
+			case "design Assignee":
+				return "designDutyId";
+			case "设计截止时间":
+				return "designDueDate";
+			case "design Due Date":
+				return "designDueDate";
 
-			case "设计交付物说明": return "designRemark";
+			case "设计交付物说明":
-			case "design Deliverable Description": return "designRemark";
+				return "designRemark";
+			case "design Deliverable Description":
+				return "designRemark";
 
-			case "pre交付物类型": return "prehomoDeliverableType";
+			case "pre交付物类型":
-			case "pre Deliverable Type": return "prehomoDeliverableType";
+				return "prehomoDeliverableType";
-			case "pre交付物模板": return "prehomoDeliverableTemplate";
+			case "pre Deliverable Type":
-			case "pre Deliverable Template": return "prehomoDeliverableTemplate";
+				return "prehomoDeliverableType";
-			case "pre发起人": return "prehomoInitiatorId";
+			case "pre交付物模板":
-			case "pre Reviewer": return "prehomoInitiatorId";
+				return "prehomoDeliverableTemplate";
-			case "pre责任人": return "prehomoDutyId";
+			case "pre Deliverable Template":
-			case "pre Assignee": return "prehomoDutyId";
+				return "prehomoDeliverableTemplate";
-			case "pre截止时间": return "prehomoDueDate";
+			case "pre发起人":
-			case "pre Due Date": return "prehomoDueDate";
+				return "prehomoInitiatorId";
+			case "pre Reviewer":
+				return "prehomoInitiatorId";
+			case "pre责任人":
+				return "prehomoDutyId";
+			case "pre Assignee":
+				return "prehomoDutyId";
+			case "pre截止时间":
+				return "prehomoDueDate";
+			case "pre Due Date":
+				return "prehomoDueDate";
 
-			case "pre交付物说明": return "prehomoRemark";
+			case "pre交付物说明":
-			case "pre Deliverable Description": return "prehomoRemark";
+				return "prehomoRemark";
+			case "pre Deliverable Description":
+				return "prehomoRemark";
 
-			case "验证交付物类型": return "verifyDeliverableType";
+			case "验证交付物类型":
-			case "verify Deliverable Type": return "verifyDeliverableType";
+				return "verifyDeliverableType";
-			case "验证交付物模板": return "verifyDeliverableTemplate";
+			case "verify Deliverable Type":
-			case "verify Deliverable Template": return "verifyDeliverableTemplate";
+				return "verifyDeliverableType";
-			case "验证发起人": return "verifyInitiatorId";
+			case "验证交付物模板":
-			case "verify Reviewer": return "verifyInitiatorId";
+				return "verifyDeliverableTemplate";
-			case "验证责任人": return "verifyDutyId";
+			case "verify Deliverable Template":
-			case "verify Assignee": return "verifyDutyId";
+				return "verifyDeliverableTemplate";
-			case "验证截止时间": return "verifyDueDate";
+			case "验证发起人":
-			case "verify Due Date": return "verifyDueDate";
+				return "verifyInitiatorId";
+			case "verify Reviewer":
+				return "verifyInitiatorId";
+			case "验证责任人":
+				return "verifyDutyId";
+			case "verify Assignee":
+				return "verifyDutyId";
+			case "验证截止时间":
+				return "verifyDueDate";
+			case "verify Due Date":
+				return "verifyDueDate";
 
-			case "验证交付物说明": return "verifyRemark";
+			case "验证交付物说明":
-			case "verify Deliverable Description": return "verifyRemark";
+				return "verifyRemark";
+			case "verify Deliverable Description":
+				return "verifyRemark";
 
-			case "标题": return "title";
+			case "标题":
-			case "Title": return "title";
+				return "title";
+			case "Title":
+				return "title";
 
-			case "清单确认状态": return "inventoryAffirmStatus";
+			case "清单确认状态":
-			case "List Confirmation Status": return "inventoryAffirmStatus";
+				return "inventoryAffirmStatus";
+			case "List Confirmation Status":
+				return "inventoryAffirmStatus";
 
-			case "任务确认状态": return "taskAffirmStatus";
+			case "任务确认状态":
-			case "Task Confirmation Status": return "taskAffirmStatus";
+				return "taskAffirmStatus";
+			case "Task Confirmation Status":
+				return "taskAffirmStatus";
 
-			case "适用地区": return "region";
+			case "适用地区":
-			case "Area": return "region";
+				return "region";
+			case "Area":
+				return "region";
 
-			case "对应标准": return "correspondingStandard";
+			case "对应标准":
-			case "Compare EU/CN": return "correspondingStandard";
+				return "correspondingStandard";
+			case "Compare EU/CN":
+				return "correspondingStandard";
 
-			case "新车型实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+			case "新车型实施日期":
-			case "New Type Execution Date": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
+			case "New Type Execution Date":
+				return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
 
-			case "在产车实施日期": return "implementTime";
+			case "在产车实施日期":
-			case "New Vehicle Execution Date": return "implementTime";
+				return "implementTime";
+			case "New Vehicle Execution Date":
+				return "implementTime";
 
-			default: return null;
+			default:
+				return null;
 			//"Deliverable Type,Deliverable Template,initiator,Assignee,Due Date," +
 		}
 	}
@@ -8408,6 +8520,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 获取文件
+	 *
 	 * @param dataList
 	 * @return
 	 */
@@ -8443,6 +8556,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		return fileInfos;
 	}
+
 	@NotNull
 	private StringBuilder getStringBuilder(ProjectLawsInventoryEO projectLawsInventoryEO, List<SysCategory> sysCategoryList, String technologyTerritory) {
 		StringBuilder sb = new StringBuilder();
@@ -8462,6 +8576,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 数据转换(文件名称,技术领域,对应标准)
+	 *
 	 * @param dataList
 	 * @param fileInfos
 	 */
@@ -8630,6 +8745,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 模板名称转换
+	 *
 	 * @param fileInfos
 	 * @param value
 	 * @return
@@ -8704,6 +8820,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证用户是否是该项目的studio工程师。
+	 *
 	 * @param projectLibraryId
 	 * @param cut
 	 */
@@ -9247,6 +9364,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 		}
 	}
+
 	//表格高度
 	private static int high = 25;
 	//表格宽度
@@ -9773,6 +9891,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 下载docx报告
+	 *
 	 * @param params
 	 * @param req
 	 * @param resp
@@ -10030,6 +10149,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设置表内容
+	 *
 	 * @param tableIndex    表的下标
 	 * @param wordMLPackage
 	 * @param params
@@ -10152,6 +10272,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 催办
+	 *
 	 * @param json
 	 * @return
 	 */
@@ -10420,6 +10541,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证符合性 结果待提交状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10484,6 +10606,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证符合性 清单待确认状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10548,6 +10671,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证符合性 结果待审查状态数据催办。
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10612,6 +10736,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证符合性 清单待校核状态数据催办。
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10670,6 +10795,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设计符合性 结果待提交状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10734,6 +10860,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设计符合性 清单待确认状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10798,6 +10925,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设计符合性 结果待审查状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -10862,6 +10990,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设计符合性 清单待校核状态数据催办
+	 *
 	 * @param projectLibraryId
 	 * @param projectLawsInventoryEOList
 	 */
@@ -11084,8 +11213,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 
 
-
-
 		List<SysRole> roleList = sysRoleMapper.getRoleByUserId(loginUser.getId());
 		//studio角色,法规工程师/认证工程师,领导角色,管理员角色,Viewer
 		if (roleList.size() != 0) {
@@ -11212,6 +11339,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 初始化 法规清单对应的 项目状态评估表
+	 *
 	 * @param projectLawsInventoryId
 	 */
 	public void initConditionAssessmentEO(String projectLawsInventoryId) {
@@ -11229,6 +11357,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 添加流程信息
+	 *
 	 * @param processInfoEO
 	 * @param projectLibraryId
 	 * @param endTime
@@ -11263,6 +11392,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 添加流程信息，用户的待办、已办信息。
+	 *
 	 * @param processInfoId
 	 * @param processInfoDetailEOList
 	 * @param endTime
@@ -11290,6 +11420,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 更新流程信息，用户的待办、已办任务信息
+	 *
 	 * @param projeceLawsInventoryId
 	 */
 	public void updateProcessInfoDetail(String projeceLawsInventoryId) {
@@ -11327,6 +11458,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 任务清单催办
+	 *
 	 * @param projectTaskUrgVo
 	 * @return
 	 */
@@ -11976,6 +12108,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 系统内所有用户验证
+	 *
 	 * @param projectLawsInventoryEO
 	 * @param errorMsg
 	 * @param msgList
@@ -12282,6 +12415,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 设计符合性相关待办任务强制转办
+	 *
 	 * @param projectLibraryId
 	 * @param designTransferUserId
 	 * @param pliEoList
@@ -12386,6 +12520,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 	/**
 	 * 验证符合性相关待办任务强制转办
+	 *
 	 * @param projectLibraryId
 	 * @param verifyTransferUserId
 	 * @param pliEoList
@@ -12488,4 +12623,53 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			}
 		}
 	}
+
+	@Override
+	public Map<String, List<Map<String, Object>>> queryDutyPersonByProjectId(Map<String, Object> params) {
+		Map<String, List<Map<String, Object>>> result = new HashMap<>();
+		String projectLibraryId = (String) params.get("projectLibraryId");
+		if(StringUtils.isNotEmpty(projectLibraryId)){
+			LambdaQueryWrapper<ProjectLawsInventoryEO> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
+			List<ProjectLawsInventoryEO> pliList = this.list(queryWrapper);
+			List<String> designDutyList = new ArrayList<>();
+			List<String> verifyDutyList = new ArrayList<>();
+			for (ProjectLawsInventoryEO pli: pliList) {
+				if(StringUtils.isNotEmpty(pli.getDesignDutyId())){
+					designDutyList.add(pli.getDesignDutyId());
+				}
+				if(StringUtils.isNotEmpty(pli.getVerifyDutyId())){
+					verifyDutyList.add(pli.getVerifyDutyId());
+				}
+			}
+			if(CollectionUtils.isNotEmpty(designDutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(designDutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("designDutyList",resList);
+			}
+
+			if(CollectionUtils.isNotEmpty(verifyDutyList)){
+				List<Map<String, Object>> resList = new ArrayList<>();
+				List<SysUser> userList = this.sysUserService.querySysUserListByIdList(verifyDutyList);
+				if(CollectionUtils.isNotEmpty(userList)){
+					for (SysUser user : userList) {
+						Map<String,Object> userMap = new HashMap<>();
+						userMap.put("id",user.getId());
+						userMap.put("userName",user.getUsername());
+						resList.add(userMap);
+					}
+				}
+				result.put("verifyDutyList",resList);
+			}
+		}
+		return result;
+	}
 }

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

@@ -13,8 +13,8 @@ module.exports = {
   userStatues: 'User Status',
   normal: 'Normal',
   frozen: 'Frozen',
-  reset: 'Clear',
+  reset: 'Reset',
-  putAway: 'Put Away',
+  putAway: 'Less',
   open: 'More',
   addUser: 'Add User',
   userInformation: 'User Information',
@@ -25,11 +25,11 @@ module.exports = {
   thaw: 'Thaw',
   batchOperation: 'Batch Operation',
   selected: 'Selected',
-  term: 'Term',
+  term: 'Item',
   empty: 'Empty',
   edit: 'Edit',
   more: 'More',
-  areYouSure: 'Are you sure to delete?',
+  areYouSure: 'Confirm to delete?',
   details: 'Details',
   password: 'Password',
   freezePassword: 'Are you sure to freeze?',
@@ -49,22 +49,22 @@ module.exports = {
   adminDoNotAllowOperation: 'The administrator account does not Allow this Operation!',
   advancedQuery: 'Advanced Search',
   constructor: 'Constructor',
-  advancedQueryEffective: 'Advanced Search criteria are already effective',
+  advancedQueryEffective: 'Advanced Search on',
   preservation: 'Save',
   condition: 'Condition',
   close: 'Close',
   no: 'No',
   click: 'Click',
   add: 'Add',
-  FilterMatching: 'Filter Conditions',
+  FilterMatching: 'Match Filter Conditions',
-  AllMatching: '(Meet All Conditions)',
+  AllMatching: '(Must Meet All Conditions)',
-  AnyOneMatches: '(Any one of the conditions matches)',
+  AnyOneMatches: '(Meet Either Conditions)',
   SelectQueryField: 'Select Search Field',
   matchRules: 'Matching Rules',
   beEqualTo: 'Equal to',
   contain: 'Contain',
-  withStart: 'With Start',
+  withStart: 'Start with',
-  withEnd: 'With Ending',
+  withEnd: 'End with',
   in: 'In',
   notEqual: 'Not Equal To',
   granter: 'Greater Than',
@@ -72,19 +72,19 @@ module.exports = {
   less: 'Less Than',
   lessOrEqual: 'Less Than Or Equal To',
   user: 'User',
-  numericalValue: 'Numerical Value',
+  numericalValue: 'Value',
   not: 'No.',
   notOnlyRz: 'No',
-  EnterValue: 'Please Enter A Value',
+  EnterValue: 'Enter Value',
   SavedQuery: 'Saved Search',
-  NoQueriesSaved: 'No Search Saved',
+  NoQueriesSaved: 'Not Found',
   SavedName: 'Saved Name',
-  CannotQueryEmpty: 'Cannot search empty condition',
+  CannotQueryEmpty: 'Conditions cannot be empty',
-  EmptyCannotSaved: 'Empty condition cannot be saved',
+  EmptyCannotSaved: 'Empty conditions cannot be saved',
   cannotEmpty: 'Cannot Be Empty',
   name: 'Name',
   AlreadyExists: 'Already exists, overwrite?',
-  SavedSuccessfully: 'Saved Successfully',
+  SavedSuccessfully: 'Saved',
   DeleteQuery: 'Delete current Search?',
   VersionNotSupported: 'Version Not Supported',
   SaveQueryCriteria: 'Save Search Conditions',
@@ -97,7 +97,7 @@ module.exports = {
   total: 'Total',
   strip: 'Items',
   RoleCode: 'Role Code',
-  createTime: 'Creation Time',
+  createTime: 'Time of Creation',
   userName: 'User Name',
   userManual:'User Manual',
   selectOneRule: 'Please select a role!',
@@ -110,8 +110,8 @@ module.exports = {
   AddDepartment: 'Add Department',
   AddSubordinate: 'Add Subordinate',
   DepartmentInformation: 'Department Information',
-  BatchDelete: 'Batch Delete',
+  BatchDelete: 'Delete in Batch',
-  DeleteMultiplePiecesData: 'Delete multiple pieces of data',
+  DeleteMultiplePiecesData: 'Delete Multiple Items',
   CurrentSelection: 'Current Selection',
   Deselect: 'Deselect',
   enterDepartmentName: 'Please enter Department name',
@@ -199,7 +199,7 @@ module.exports = {
   SearchLog: 'Search Log',
   enterSearchKeyword: 'Please enter a search keyword',
   enterSearchContent:'Please enter Search Content',
-  enterStandard:'Please enter Number',
+  enterStandard:'Please enter No.',
   entertitle:'Please enter Title',
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
@@ -251,7 +251,7 @@ module.exports = {
   enterUserAccount: 'Please enter user account',
   NoConfigurableRoles: 'No configurable roles!',
   AreYouWantDiscardEditing: 'Are you sure you want to discard editing?',
-  determine: 'Confirmed',
+  determine: 'Confirm',
   DictionaryCoding: 'Dictionary Coding',
   enterDictionaryCode: 'Please enter dictionary code',
   DictionaryList: 'Dictionary List',
@@ -376,7 +376,7 @@ module.exports = {
   BatchSetting: 'Batch Set',
   BatchCancel: 'Batch Cancel Collection',
   SubscriptionManagement: 'Select Tech Fields',
-  BatchCancellation: 'Batch Delete',
+  BatchCancellation: 'Batch Cancellation',
   clickUpload: 'Click To Upload',
   viewUploadedFiles: 'View Uploaded Files',
   standardSelection: 'Standard Selection',
@@ -407,7 +407,7 @@ module.exports = {
   SyncLibrary: 'Sync To doc. Library',
   check: 'Proofread',
   enName: 'English Name',
-  selectLeastOne: 'Please select at least one piece of data',
+  selectLeastOne: 'Please select at least one item',
   selectFileType: 'Please select a file type',
   sureVerified: 'Are you sure this file is not verified?',
   sureSynchronize: 'The file has not been verified. Are you sure you want to synchronize to the document library?',
@@ -419,7 +419,7 @@ module.exports = {
   ExhibitionAreaManagement: 'Display Management',
   NewLabelItem: 'Newly Added Tag Item',
   editLabelItem: 'Edit Tag Item',
-  NodeQuickLookup: 'Node Quick Lookup',
+  NodeQuickLookup: 'Node Quick Find',
   AreAllLabelsRead: 'Are All Mark as Read',
   AllLabelsRead: 'Mark as Read',
   SubscriptionNotification: 'Subscription Notification',
@@ -436,7 +436,7 @@ module.exports = {
   OperationSuccessful: 'Operation Successful',
   Intheexport: 'In The Export...',
   OperationFailed: 'Operation Failed',
-  PersonnelSelection: 'Select ',
+  PersonnelSelection: 'Select People',
   EmployeeNumber: 'Employee ID',
   EmployeeType: 'Employee Type',
   LabeItemName: 'Label Item Name',
@@ -484,14 +484,14 @@ module.exports = {
   charactersLength1to300: '1 - 300 characters in length',
   OnlyOneSelected: 'Only one piece of data can be selected',
   OnlyPDF: 'Only PDF files can be imported',
-  open: 'Expand',
+  open: 'More',
   away: 'Collapse',
-  toDoProcess: 'To Do',
+  toDoProcess: 'To-Do',
-  processDone: 'Completed',
+  processDone: 'Done',
-  sentProcess: 'Initiated',
+  sentProcess: 'Issued',
   monitoringProcess: 'Monitor',
-  ConfirmDeployment: 'Confirm Deployment?',
+  ConfirmDeployment: 'Confirm to deploy?',
-  terminationProcess: 'Termination Process',
+  terminationProcess: 'Terminate Process',
   issue: 'Issue',
   projectInformation: 'Project Information',
   standardContent: 'Standard Content',
@@ -499,7 +499,7 @@ module.exports = {
   reviewResults: 'Review Results',
   selectReviewResult: 'Please select the review result',
   feedback: 'Feedback',
-  approvalHistory: 'Cpproval History',
+  approvalHistory: 'Approval History',
   cannotExceed500characters: 'Cannot Exceed 500 characters',
   accord: 'Compliance',
   nonConformity: 'Non-Compliance',
@@ -509,15 +509,15 @@ module.exports = {
   role: 'Role',
   OperationContent: 'Operation Content',
   OperationTime: 'Operation Time',
-  ConfirmReplication: 'Confirm Replication',
+  ConfirmReplication: 'Confirm to copy?',
   ProcessName: 'Process Name',
   ProcessType: 'Process Type',
   AddProcess: 'Add Process',
   RelatedItems: 'Project',
   Sponsor: 'Creator',
-  CurrentProcessor: 'Current Processor',
+  CurrentProcessor: 'Current Operator',
-  LastProcessor: 'Last Processor',
+  LastProcessor: 'Last Operator',
-  ProcessingTime: 'Complete Date',
+  ProcessingTime: 'Operation Time',
   cutoffTime: 'Due Date',
   ProcessStatus: 'Process Status',
   CompletionTime: 'Completion Time',
@@ -530,8 +530,8 @@ module.exports = {
   labelNameCannotDuplicate: 'Label name cannot be duplicate',
   list: 'List',
   paragraph: 'Paragraph',
-  enterNumber: 'Please Enter The Number',
+  enterNumber: 'Please enter No.',
-  enterTitle: 'Please Enter a Title',
+  enterTitle: 'Please enter Title',
   backDocument: 'Back To Document Library',
   fileName: 'File Name',
   splitTime: 'Split Time',
@@ -544,7 +544,7 @@ module.exports = {
   newClause: 'New Clause',
   clauseNo: 'Item No.',
   functionalAreas: 'Functional Areas',
-  technicalField: 'Tech Field',
+  technicalField: 'Technical Field',
   informationCategory: 'Info Type',
   contentValidity: 'Content Validity',
   TechnicalfieldSupplementCn:'Tech Field Supplement (Cn)',
@@ -558,7 +558,7 @@ module.exports = {
   confirmCancelCollection: 'Confirm To Cancel Collection?',
   theRelease: 'The release date should Not exceed the standard implementation date',
   zoneOfApplication: 'Area',
-  releaseDate: 'Release Date',
+  releaseDate: 'Issue Date',
   standardImplementationTime: 'Standard Implementation Time',
   onlyPicture: 'Only Upload Pictures!',
   fileUploadFailed: 'File Upload Failed',
@@ -584,7 +584,7 @@ module.exports = {
   leastTwo: 'Please Select at Least two pieces of data',
   mergeTerms: 'Determine Merger Terms',
   documentSplitTemplate: 'Document Split Template',
-  batSetting: 'Batch Setting',
+  batSetting: 'Batch Set',
   batchSettingInformation:'Batch Setting Information',
   batchSettingPersonnel:'Batch Setting Personnel',
   selectDirectoryTerms: 'Please Select the directory location to add terms',
@@ -601,29 +601,29 @@ module.exports = {
   selectSplitListDisplay: 'Please select whether to split the document list for display',
   selectDisplayList: 'Please select whether to display in list',
   documentSplitDisplay: 'Document splitting module display',
-  VirtualListName: 'Market Regulation List Name',
+  VirtualListName: 'Market List',
-  CertificationListName:'Certification List Name',
+  CertificationListName:'Homologation List',
   listStatus: 'List Status',
-  creater: 'Creater',
+  creater: 'Created By',
   withdraw: 'Withdraw',
   maintenanceList: 'Maintain',
   instructionForUse: 'Instruction',
-  subtitle: 'Sub-title',
+  subtitle: 'Subtitle',
   scopeOfApplication: 'Scope',
   correspondingStandard: 'Compare EU/CN',
   implementationCategory: 'Usage',
-  certificationType: 'Certification Type',
+  certificationType: 'Homo Type',
-  certificationLevel: 'Certification Level',
+  certificationLevel: 'Homo Level',
   areaOfResponsibility: 'Responsible Field',
   confirmationOfDesignConformity: 'Design Compliance Check ',
   Deliverables: 'Deliverables',
-  personLiable: 'Assignee',
+  personLiable: 'Owner',
-  PrehomoConfirmation: 'Pre-Homo Confirmation',
+  PrehomoConfirmation: 'Pre-Homo Check',
   verificationAndConformityconfirmation: 'Validation Compliance Check',
-  StandardImplementationDate: 'New Type Execution Date',
+  StandardImplementationDate: 'Standard Effective Date',
   regulatoryEngineer: 'Regulation Engineer',
   certifiedEngineer: 'Homo Engineer',
-  regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer Or Homologation Engineer',
+  regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer/Homo Engineer',
   engineeringInterfacePerson: 'Eng. Interface',
   typeOfDeliverables: 'Deliverable Type',
   deliverableTemplate: 'Deliverable Template',
@@ -632,32 +632,32 @@ module.exports = {
   projectStatus: 'Project Status',
   projectStatus: 'Project Status',
   StudioEngineer: 'R&H Studio',
-  CertificationTime: 'Certification Time',
+  CertificationTime: 'Homologation Time',
   NTplatform: 'NT Platform',
   NPplatform: 'NP Platform',
   IPDInformation: 'IPD Information',
-  certificationProgramInformation: 'Certification Program Information',
+  certificationProgramInformation: 'Homologation Plan',
-  taskReleaseStatus: 'Task Release Status',
+  taskReleaseStatus: 'Homo Release Status',
   task: 'Task',
   TaskCutOffTime: 'Due Date',
-  Transfer: 'Transfer',
+  Transfer: 'Retrieve',
   CertificationDirectory: 'Homologation Catalogue',
   TaskRequirements: 'Task Requirements',
   CertificationProgress: 'Homologation Progress',
-  CurrentProjectStatusEvaluation: 'Current State',
+  CurrentProjectStatusEvaluation: 'Project Status Evaluation',
   NiONumber: 'NIO Number',
   ParameterName: 'Parameter Name',
   ParameterDescription: 'Parameter Description',
   Version: 'Version',
-  certificationProgramTime: 'Certification Program Time',
+  certificationProgramTime: 'Planned Homo Date',
   ArchitecturePlatform: 'Architecture Platform',
   ModelPlatform: 'Model Platform',
   ListOfRelevantPersonnel: 'Related Personnel',
   DeliverableStatus: 'Deliverable Status',
-  CurrentStatusOfTheProject: 'Project Current State',
+  CurrentStatusOfTheProject: 'Project Status',
   CurrentStatus: 'Current Status',
   NonConformance: 'Non-compliant',
-  listSubclauses: 'List Subclauses',
+  listSubclauses: 'List Items',
   fileType: 'File Type',
   view: 'View',
   KMVSS_Table: 'KMVSS Table',
@@ -691,51 +691,51 @@ module.exports = {
   standardName: 'Standard Name',
   initiateListConfirmation: 'Initiate List Confirmation',
   initiateTaskConfirmation: 'Initiate Task Confirmation',
-  alteration: 'Modify',
+  alteration: 'Change',
-  fixedPlate: 'Fix the version ',
+  fixedPlate: 'Final Version',
   taskAffirmStatus: 'Task Confirmation Status',
   taskAffirm: 'Task Confirmation',
   listConfirmationStatus: 'List Confirmation Status',
   listConfirmation: 'List Confirmation',
   ListConfirmationDeadline: 'List Confirmation Deadline',
-  dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
+  dataConfirmation: 'Please select data with List Confirmation Status labeled Not Initiated or Rejected, and the Regulation Engineer and Homo Engineer cannot not empty',
   pleaseSelectPersonFirst: 'Please select a person first',
-  onlyOnePersonCanBeSelected: 'Only one person can be selected',
+  onlyOnePersonCanBeSelected: 'You can only select one',
-  overrule: 'Overrule',
+  overrule: 'Reject',
-  confirmSubmit: 'Confirm Submit',
+  confirmSubmit: 'Confirm to submit?',
-  confirmOverrule: 'Confirm Overrule',
+  confirmOverrule: 'Confirm to reject?',
-  The: 'The',
+  The: 'No.',
-  submitted: 'Data has been submitted and cannot be submitted again',
+  submitted: 'Already submitted. Please do not submit again',
   basicInformationOfParameters: 'General Info',
   regulatoryCertificationTaskPlan: 'Regulation/Homologation Task Plan',
-  bringInRelevantPersonnel: 'Bring In Relevant Personnel',
+  bringInRelevantPersonnel: 'Involve Relevant Personnel',
-  confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel',
+  confirmBringInRelevantPersonnel: 'Confirm to involve relevant personnel?',
   problemType: 'Issue Type',
   projectDetails: 'Project Details',
   listOfRegulations: 'Regulation List',
   taskList: 'Task List',
-  TaskParameterCollection: 'Task Parameter Collection',
+  TaskParameterCollection: 'Homo Parameter List',
-  nonConformance: 'Non Conformance',
+  nonConformance: 'Non-Compliant Items',
-  deadlineForConfirmationOfDesignCompliance: 'Deadline For Confirmation Of Design Compliance',
+  deadlineForConfirmationOfDesignCompliance: 'Design Compliance Confirmation Deadline',
   prehomoConfirmationDeadline: 'Pre-Homo Confirmation Deadline',
-  verificationComplianceConfirmationDeadline: 'Verification Compliance Confirmation Deadline',
+  verificationComplianceConfirmationDeadline: 'Validation Compliance Confirmation Deadline',
-  pleaseEnterTheCorrectWebAddress: 'Please enter the correct web address',
+  pleaseEnterTheCorrectWebAddress: 'Please enter the correct address',
-  updateTime: 'Update Time',
+  updateTime: 'Last Updated',
   comment: 'Comment',
   historicalVersion: 'History Version',
   versionName: 'Version Name',
-  finalizationTime: 'Finalization Time',
+  finalizationTime: 'Time of Finalization',
   setting: 'Setting',
-  incorrectsubmitted: 'The data status is incorrect; Only data with status to be confirmed or rejected can be submitted',
+  incorrectsubmitted: 'Incorrect data status; Only data labeled To Be Confirmed or Rejected can be submitted',
   date: 'Date',
   time: 'Time',
-  uploadMaximumATime: 'Upload a Maximum of 20 Images at a time',
+  uploadMaximumATime: 'No More than 20 Images at a Time',
 
-  confirmationOfRegulationsList: 'Regulation List Confirmation ',
+  confirmationOfRegulationsList: 'Regulation List Confirmed ',
-  regulatoryTaskConfirmation: 'Regulation Task Confirmation ',
+  regulatoryTaskConfirmation: 'Regulation Task Confirmed ',
-  certificationStart: 'Homo Completion ',
+  certificationStart: 'Homo Completed ',
-  preHomoCompletion: 'Pre-Homo Confirmation ',
+  preHomoCompletion: 'Pre-Homo Completed ',
-  certificationEnd: 'Homo KO ',
+  certificationEnd: 'Homo Approved ',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
@@ -761,7 +761,7 @@ module.exports = {
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration information is added and cannot be viewed',
   theCurrent: 'The current status of this data is',
-  thisbuttonCompleted: 'You can operate this button only when the state is Completed or not Collected',
+  thisbuttonCompleted: 'Use this button when the status is Completed or Not Collected only',
   Frozenstatus: 'Frozen status, can only be viewed',
   chinese: 'Chinese',
   integerOrDecimal: 'Integer Or Decimal',
@@ -803,12 +803,12 @@ module.exports = {
   historicalVersion: 'Historical Version',
   configure: 'Configuration',
   parameter: 'Parameter',
-  changeExtension: 'Change Extension',
+  changeExtension: 'Extension',
-  addDetailList: 'Add',
+  addDetailList: 'Add List',
   editDetailList:'Edit DetailList',
   detailedList: 'DetailedList',
   copyParamDetailList: 'Copy Parameter List',
-  collectionCompletionTime: 'Collection Completed',
+  collectionCompletionTime: 'Collection Completion Time',
   parameterTemplateName: 'Parameter Template Name',
   onlyThree: 'enter only letters, numbers, hyphens (-), left slashes, and Spaces',
   templateName: 'Template Name',
@@ -839,22 +839,22 @@ module.exports = {
   result: 'Result',
   opinion: 'Opinion',
   OperationNode: 'Operation Node',
-  taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
+  taskDataConfirmation: 'Please select data with List Confirmation Status labeled Accepted and Task Confirmation Status labeled Not Initiated or Rejected, and the Eng. Interface cannot be empty',
   selectInquiry: 'Select Inquiry',
   sendBack: 'Reject',
   taskConfirmationProcess: 'Task confirmation process',
   notFinished: 'Assigned',
   Finished: 'Completed',
-  theRequirementst: 'The engineering interface person confirms the compliance requirements',
+  theRequirementst: 'The Eng. Interface confirms the compliance requirements',
   dataLoading: 'Data loading...',
-  Submitting: 'Submitting',
+  Submitting: 'Submitting...',
   Returning: 'Returning',
-  terminationProcessing: 'Termination process',
+  terminationProcessing: 'Terminating the process',
-  publishComment: 'Publish Comment',
+  publishComment: 'Comment',
   record: 'Record',
   replyToComments: 'Reply To Comments',
-  noComment: 'No Comment',
+  noComment: 'No Comments',
-  theReceived: 'Finalize all process data only after completing the task responsibility confirmation node',
+  theReceived: 'All process data can only be finalized after the task responsibility is confirmed',
   notEvaluated: 'Not Evaluated',
   cannotExceed: 'Cannot Exceed',
   Characters: 'Characters',
@@ -862,54 +862,54 @@ module.exports = {
   VirtualList: 'MarketList',
   importTemplate: 'Import Template',
   verificationConfirmationDeadline: 'Verification compliance confirmation deadline',
-  technicalEvaluationResults: 'Technical Evaluation Results',
+  technicalEvaluationResults: 'Technical Evaluation Result',
   engineeringConfirmation: 'Engineering Deliverables',
-  feedbackFromTheEngineer: 'Engineer Comment',
+  feedbackFromTheEngineer: 'Engineer\'s Feedback',
   completedBy: 'Filled by',
-  completedTime: 'Completed Time',
+  completedTime: 'Time',
-  replyFromProjectContactPerson: 'Assignee Reply',
+  replyFromProjectContactPerson: 'Owner\'s Reply',
-  answer: 'Answer',
+  answer: 'Reply',
-  distributionEngineer: 'Dispatch to Engineer',
+  distributionEngineer: 'Assigner',
   reminderHandling: 'Reminder',
   addFeedback: 'Add Feedback',
   engineer: 'Engineer',
-  engineeringConfirmationDetails: 'Engineering Confirmation Details',
+  engineeringConfirmationDetails: 'Engineering Deliverable Details',
   reminder: 'Reminder',
-  adopt: 'Adopt',
+  adopt: 'Pass',
-  reviewedByThePersonInCharge: 'Reviewed by the person in charge',
+  reviewedByThePersonInCharge: 'Reviewed by Owner',
-  onlyDeleted: 'Only data that has not started or ended the process can be deleted',
+  onlyDeleted: 'Only delete data when the process is not started or already ended',
   experimentPassed: 'Test Passed',
   experimentFailed: 'Test Failed',
-  toBeStarted: 'Not Start',
+  toBeStarted: 'To Be Started',
   inProgress: 'In Progress',
-  Underway: 'Underway',
+  Underway: 'Ongoing',
   green: 'Green',
   red: 'Red',
   blue: 'Blue',
   yellow: 'Yellow',
-  resultReported: 'Result Reported',
+  resultReported: 'Result Report',
-  TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data',
+  TheDoesNotContainData: 'The maintenance list of the market list does not contain any data. Confirm to add?',
   number: 'No.',
   Deadline: 'Deadline',
-  toBeConfirmed: 'To Confirm',
+  toBeConfirmed: 'To Be Confirmed',
   designComplianceReview: 'Design Compliance Confirmation',
   preHomeConfirmation: 'Pre-Homo Confirmation',
   verificationComplianceReview: 'Validation Compliance Confirmation',
-  verificationComplianceExamine:'Verification compliance examine',
+  verificationComplianceExamine:'Validation Compliance Review',
   Deployment: 'Deploy',
-  pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
+  pleaseDesignConformityConfirmation: 'Please complete the data of design compliance confirmation',
-  pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
+  pleaseConfirmedByPrehomo: 'Please complete the data of Pre-Homo confirmation',
-  pleaseConformityVerification: 'Please complete the data of Conformity verification',
+  pleaseConformityVerification: 'Please complete the data of validation compliance confirmation',
   virtualListDetails: 'Market List Details',
-  virtualAuthenticationListDetails: 'Virtual Authentication List Details',
+  virtualAuthenticationListDetails: 'Virtual Homo List Details',
-  VirtualAuthenticationList: 'Virtual Authentication List',
+  VirtualAuthenticationList: 'Virtual Homo List',
   maintainVirtualList: 'Maintain Market List',
-  certificationListMaintenance: 'Certification List Maintenance',
+  certificationListMaintenance: 'Homo List Maintenance',
   reasonsForRejection: 'Reasons For Rejection',
   inconformity: 'Non-Compliance',
   toTrack: 'To be tracked',
-  Launch: 'Launch',
+  Launch: 'Initiate',
-  maintainProgress: 'Maintain',
+  maintainProgress: 'Maintain Schedule',
   redSchedule: 'Red: unqualified without available solutions or timeline. ',
   yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ',
   greenRequirements: 'Green: qualified and confirmed.',
@@ -917,9 +917,9 @@ module.exports = {
   authenticationMessage: 'Homo Parameter Task',
   taskRegulationComplianceTask: 'Regulation Compliance Task',
   accept: 'Accept',
-  notLaunch: 'Not Start',
+  notLaunch: 'Not Initiated',
   refuse: 'Reject',
-  taskTermination: 'Task Termination',
+  taskTermination: 'Task Terminated',
   projectStatusAndProgress: 'Project Status And Progress',
   listConfirmationProgress: 'List Confirmation Progress',
   taskConfirmationProgress: 'Task Confirmation Progress',
@@ -930,40 +930,40 @@ module.exports = {
   newlyAdded: 'Add',
   applicableSupplement: 'Applicable Supplement',
   taskDescription: 'Task Description',
-  descriptionDeliverables: 'Instruction',
+  descriptionDeliverables: 'Deliverable Description',
-  startMonth: 'Start Month',
+  startMonth: 'Start Date',
-  endMonth: 'End Month',
+  endMonth: 'End Date',
   Importing: 'Importing...',
-  projectDeliveryDescription: 'Project Delivery Description',
+  projectDeliveryDescription: 'Engineering Delivery Description',
-  cancelConfirm: 'Cancel Confirm',
+  cancelConfirm: 'Cancel Confirmation',
   currentInformation: 'Current Information',
   deliveryHistory: 'Delivery History',
   projectDeliveryRequirements: 'Project delivery requirements',
-  personLiableConfirm: 'PersonLiable Confirm',
+  personLiableConfirm: 'Confirm by Owner',
-  complianceResults: 'Feedback',
+  complianceResults: 'Compliance Result',
   noData: 'No Data',
   confirmOperation: 'Confirm Operation',
-  sponsorReview: 'Sponsor Review',
+  sponsorReview: 'Initiator Review',
-  fillInProjectDelivery: 'Engineering Delivery',
+  fillInProjectDelivery: 'Fill in Engineering Delivery',
   Resubmit: 'Resubmit',
   Quantity: 'Quantity',
-  pleaseConfirmationResults: 'Please select the compliance status based on the engineer confirmation result.',
+  pleaseConfirmationResults: 'Please select the compliance status based on the engineering confirmation result',
   pleaseReviewTask: 'Please add engineering confirmation to this review task.',
-  pleaseWillBeReturned: 'Please double confirm the engineering result and owner review result. Submit if it is in accordance with the requirements and reject if it\'s not.',
+  pleaseWillBeReturned: 'Please double confirm the engineering result and the owner review result. Submit if it\'s compliant and reject if it\'s not.',
-  pleaseSubmitStatus: 'Please confirm all engineer data before submission.',
+  pleaseSubmitStatus: 'Please change the status of engineering data to Confirmed before submission',
   modelName: 'Model Name',
   modelYear: 'Model Year',
   NoteConfirmTheChange: 'Note: After resetting, the selected item data will change to a list pending release status, and the historical data will disappear. Please confirm whether to perform a process reset',
-  onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed',
+  onlyDataChanged: 'Only data with task confirmation status of Accepted can be changed',
   inquiry: 'Inquiry',
-  ConfirmationDeadline: 'Confirmation Deadline',
+  ConfirmationDeadline: 'Confirm Deadline',
-  regulatoryCertificationTaskConfirmation: 'Regulatory certification task confirmation',
+  regulatoryCertificationTaskConfirmation: 'Homo Task Confirmation',
-  confirmationEngineeringInterfacePerson: 'Confirmation of engineering interface person',
+  confirmationEngineeringInterfacePerson: 'Eng. Interface Confirmation',
-  engineerReply: 'Engineer reply',
+  engineerReply: 'Engineer\'s Reply',
   catalogFile: 'Catalogue File',
   testScheme: 'Test Scheme',
-  testReportLocation: 'Find Report',
+  testReportLocation: 'Find Test Report',
-  explain: 'Illustration',
+  explain: 'Description',
   dataCannotEmpty: 'Data Cannot Empty',
   documentDynamics: 'Document Updates',
   theNumberAgain: 'The number already exists and cannot be added again',
@@ -994,12 +994,12 @@ module.exports = {
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'And',
-  judge: 'Judge',
+  judge: 'Determine',
   pleaseWaitWhileRunning: 'Please wait while running',
   roleSwitching: 'Role Switching',
   setCreator: 'Set Creator',
   documentLibraryDetails: 'Document Library Details',
-  question: 'Question',
+  question: 'Reminder',
   ConfirmQuestion: 'Confirm Question',
   disableInput: 'Disable Input',
   taskConfirmationDeadline: 'Task Confirmation Deadline',
@@ -1042,9 +1042,9 @@ module.exports = {
   dateOfInitiation: 'Date Of Initiation',
   closingDate: 'Due Date',
   viewProcess: 'View Process',
-  evaluationResults: 'Evaluation Results',
+  evaluationResults: 'Evaluation Result',
   Assessor: 'Assessor',
-  collectionOfRegulatoryOpinions: 'Opinion Collection of Regulation',
+  collectionOfRegulatoryOpinions: 'Opinion Collection on Regulation',
   collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
   feedbackInformation: 'Feedback',
   relevantSections: 'Chapter',
@@ -1057,7 +1057,7 @@ module.exports = {
   standardNameCn: 'Standard Title Cn',
   standardNameEn: 'Standard Title En',
   deadlineForComments: 'Deadline for Comments',
-  standardNo: 'Standard No',
+  standardNo: 'Standard No.',
   implemenDate: 'Effective Date',
 //  上报库
   Enable: 'Enable',
@@ -1074,7 +1074,7 @@ module.exports = {
   FNumber: 'Number',
   NNNiONumber: 'Number',
   NNiONumber: 'NIO Number',
-  ParameterNo: 'Number',
+  ParameterNo: 'No.',
   NRequired: 'Required',
   NParameterName: 'Para Name',
   NtechnicalField: 'Tech Field',
@@ -1113,10 +1113,10 @@ module.exports = {
   newNiONumber: 'Number',
   English: 'English',
   requiredParametersEmpty: 'Required parameters cannot be empty',
-  PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected',
+  PleaseTaskConfirmationRejected: 'Please select data with List Confirmation Status labeled Accepted and Task Confirmation Status labeled Not Initiated or Rejected',
-  theProjectContactEmpty: 'The project contact person of cannot be empty',
+  theProjectContactEmpty: 'The Eng. Interface cannot be empty',
   pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
-  TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
+  TheEngineerAndCertification: 'The Homo Engineer cannot be empty',
   pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
   theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
   bringInTheProjectInterface: 'Assign to Owner',
@@ -1191,7 +1191,7 @@ module.exports = {
   viewTheComparisonResults: 'View Results',
   addFullTextComment: 'Full Text Comment',
   turnOffAutomaticMatching: 'Turn Off Auto Match',
-  Deriveconformanceresults: 'Export Results',
+  Deriveconformanceresults: 'Export Compliance Results',
   Regulatorycompliancekanban: 'Regulatory Compliance Kanban',
   exportComparisonReport: 'Export Comparison Report',
   comparisonDifferenceComment: 'Comparison Difference Comment',
@@ -1224,11 +1224,11 @@ module.exports = {
   Fileuploaded: 'File uploading, please wait',
   doNotHavePermissionDeleteData: 'Do not have permission to delete this data',
   Parametercollection: 'Parameter Collection',
-  Collectlist: 'Colle Ctlist',
+  Collectlist: 'Collection List',
-  Statisticalmodels: 'Statisti Calmodels',
+  Statisticalmodels: 'Statistical Model',
-  Inthecollection: 'During collection',
+  Inthecollection: 'Collecting',
   Notatthe: 'Not started',
-  Thepercentage: 'The Percentage',
+  Thepercentage: 'Percentage',
   problemKnowledgeBase: 'Knowledge Sharing',
   recentHotSpots: 'Recent Hot Spots',
   disseminationMaterials: 'Dissemination Materials',
@@ -1272,7 +1272,7 @@ module.exports = {
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
   punctuationmark:'You can only enter English punctuation marks except the # sign and commas',
-  created: 'Created',
+  created: 'Creation Time',
   updated:'Updated',
   OpenOne:'Open',
   Privacy:'Privacy',
@@ -1309,8 +1309,8 @@ module.exports = {
   rejectedBy:'Rejected By',
   rejectionTime:'Rejection Time',
   rejectReason:'Reject Reason',
-  collectionLegislativeComments:'Opinion Collection of Regulation',
+  collectionLegislativeComments:'Opinion Collection on Regulation',
-  regulatoryAndTechnicalAssessment:'Regulation Technical Assessment',
+  regulatoryAndTechnicalAssessment:'Regulatory Technical Assessment',
   listConfirmationRejectionReason:'List confirmation rejection reason',
   taskConfirmationRejectionReason:'Task confirmation rejection reason',
   onlyCompletedDataCanBeDeleted:'Only completed data can be deleted',
@@ -1349,10 +1349,10 @@ module.exports = {
   secondaryDirectory:'Secondary Directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
   projectVersion:'Project Version',
-  softwareVersion:'Authentication Software version',
+  softwareVersion:'Homo Software Version',
   versionStatistics:'Version statistics',
-  addSubproject:'Add Subproject',
+  addSubproject:'Add Subitem',
-  Topping:'Topping',
+  Topping:'Top',
   cancelTopping:'Cancel Topping',
   relatedProjectVersion:'Related project version',
   taskType:'Task Type',
@@ -1362,25 +1362,25 @@ module.exports = {
   filledBy:'Filled by',
   parameterToBeInitiated:'Parameter to be initiated',
   listTaskConfirmation:'List task confirmation',
-  completednum: 'Quantity to be filled',
+  completednum: 'To Be Filled',
   filledBynum:'Filled by',
   parameterToBeInitiatednum:'Parameter to be initiated',
-  listToConfirm:'List to confirm',
+  listToConfirm:'To Be Confirmed',
-  toSubmit:'To submit',
+  toSubmit:'To Be Submitted',
-  toAudit:'To audit',
+  toAudit:'To Be Audited',
   secondaryDirectory:'Secondary Directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
   projectVersion:'Project Version',
-  softwareVersion:'Authentication Software version',
+  softwareVersion:'Homo Software Version',
   versionStatistics:'Version statistics',
-  addSubproject:'Add Subproject',
+  addSubproject:'Add Subitem',
-  Topping:'Topping',
+  Topping:'Top',
   cancelTopping:'Cancel Topping',
   relatedProjectVersion:'Related project version',
   Importfailure:'Import failure',
   CuiBan:'CuiBan',
   brand:'Brand',
-  allsubitemsitem:'Whether to delete all subitems under this item',
+  allsubitemsitem:'Delete all subitems under this item?',
   contactTheFounder:'Contact author',
   certificationCategoryNumber: 'certification Category Number',
   historicalrecord:'Historical Record',
@@ -1397,62 +1397,62 @@ module.exports = {
   inRecentMonthsin6:'Within 6 months (implemented)',
   batchUpdateDeadline:'Batch update deadline',
   timeInterval:'Time Interval',
-  certificationList:'Certification List',
+  certificationList:'Homologation List',
-  inspectionItems:'Inspection Items',
+  inspectionItems:'Test Item',
   processReset:'Process Reset',
   configurationItem:'Configuration Item',
-  DeliverablesResult:'Deliverables Result',
+  DeliverablesResult:'Delivery Result',
-  reportNo:'Report No',
+  reportNo:'Report No.',
   productModel:'Product Model',
   nameOfManufacturer:'Name Of Manufacturer',
-  regulationNo:'Regulation No',
+  regulationNo:'Regulation No.',
   itemInformation:'Item Information',
   modifyHistory:'Historical Record',
   returnToStudio:'Return to Studio',
   Approved:'Approved',
-  returnedForApproval:'Returned For Approval',
+  returnedForApproval:'Returned',
-  changeSetting:'Change Setting',
+  changeSetting:'Change Configuration',
-  referenceDeliverables:'Reference Deliverables',
+  referenceDeliverables:'Reference Deliverable',
-  missionAccepted:'Mission Accepted',
+  missionAccepted:'Task Accepted',
-  missionRejection:'Mission Rejection',
+  missionRejection:'Task Rejected',
-  turnToDo:'Turn To Do',
+  turnToDo:'Turn To',
   initiateTask:'Initiate a Task',
   compliancereport:'Generate compliance report',
   todocenter:'To-do center',
-  areYouReturnToStudio:'Are you sure to return to studio?',
+  areYouReturnToStudio:'Confirm to return to studio?',
-  confirmLaunchTask:'Confirm launch task ?',
+  confirmLaunchTask:'Confirm to initiate a task ?',
   conditionsNotMet:'Conditions not met',
-  onlyProcessStatusReturned:'Only the data whose process status is list to be checked and rejected by the responsible person can be returned',
+  onlyProcessStatusReturned:'Only data with process status of List to Be Checked and Rejected by Owner can be returned',
   onlyProcessReturned:'Only data with a process status of list to be verified and rejected by the responsible person can be initiated, and the delivery type, engineering interface person, responsible person, and deadline cannot be empty',
   confirmToAcceptTheTask:'Confirm to accept the task?',
-  confirmRejectTask:'Confirm Reject Task ?',
+  confirmRejectTask:'Confirm to reject the task ?',
   onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected',
   onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected',
-  operationWithoutPermission:'Operation without permission',
+  operationWithoutPermission:'No access',
   data:"'s data",
   confirmApproval:'Confirm pass review?',
   confirmReturnForApproval:'Confirm Return for review ?',
   onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
-  confirmResetProcess:'Confirm reset process?',
+  confirmResetProcess:'Confirm to reset the process?',
-  confirmUrging:'Confirm urging ?',
+  confirmUrging:'Confirm to remind?',
-  confirmWithdrawal:'Confirm withdrawal ?',
+  confirmWithdrawal:'Confirm to withdraw?',
-  onlyListCheckedCanRecalled:'Only the data whose process status is list to be checked can be recalled',
+  onlyListCheckedCanRecalled:'Only data with process status of List to Be Checked can be withdrawed',
-  statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed',
+  statusthetasistobeconfirmed:'Withdrawal can only be performed when the list status is To Be Checked or the task status is To Be Confirmed',
-  confirmreturn:'Confirm return ?',
+  confirmreturn:'Confirm to return ?',
-  onlyDataSelected:'Only data with process status of task to be confirmed, result to be submitted and review to be returned can be selected',
+  onlyDataSelected:'Only data with process status of Task to Be Confirmed, Result to Be Submitted and Returned after Review can be selected',
-  youCannotStatusListToBeReleasedAndApproved:'You cannot select data whose process status is list to be released and approved',
+  youCannotStatusListToBeReleasedAndApproved:'Data with process status of List to Be Released and Approved cannot be selected',
-  batchmodify:'Whether to batch modify',
+  batchmodify:'Modify in batch?',
-  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with the process status of list to be released and certification return can be selected And the deadline cannot be empty',
+  onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with process status of List to Be Released and Returned in Homo can be selected and the deadline cannot be empty',
   type:'type',
   select:'select',
   onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted',
-  complianceCertificationProgram:'Compliance Certification Program',
+  complianceCertificationProgram:'Compliance & Homologation Program',
-  listPublishing:'List Publishing',
+  listPublishing:'List Release',
-  responsibilityConfirmation:'Responsibility Confirmation',
+  responsibilityConfirmation:'Responsibility Confirm',
-  designVerification:'Design Verification',
+  designVerification:'Design Check',
-  getStarted:'Get Started',
+  getStarted:'Pre-Homo Starts',
-  certificationStartOne:'Certification Start',
+  certificationStartOne:'Homo Starts',
-  verificationAndVerification:'Verification And Verification',
+  verificationAndVerification:'Validation Check',
   projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting',
   projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting',
   registrationnumber:'Product registration number',
@@ -1524,7 +1524,7 @@ module.exports = {
   VINcodelist:'VIN code list',
   VINcodeupload:'VIN code upload',
   Tasknode:'Task Node',
-  Taskresponsibilityrecognition:'Task responsibility recognition',
+  Taskresponsibilityrecognition:'Responsibility Confirm',
   uploadattachment:'Upload',
   Processhistory:'Process history',
   resultofhandling:'Result of handling',
@@ -1666,16 +1666,16 @@ module.exports = {
   Listoftreatableregulations:'List of treatable regulations',
   Listofuntractableregulations:'List of untractable regulations',
   project:'Project',
-  Categoryofdeliverables:'Category of deliverables',
+  Categoryofdeliverables:'Type of deliverables',
   Taskconfirmationresult:'Task confirmation result',
   Compliancetaskhandling:'Compliance task handling',
-  theDataYouSelectedContainsSkip:'The data you selected contains data with a blank deliverable type;Please confirm whether to skip',
+  theDataYouSelectedContainsSkip:'The data selected contains empty deliverable; please confirm whether to skip',
   designComplianceProcessFor:'Design compliance process for',
   validationComplianceProcessFor:'Validation compliance process for',
-  thePersonResponsibleForVerifyingEmpty:'The person responsible for verifying the compliance process cannot be empty',
+  thePersonResponsibleForVerifyingEmpty:'The owner for validation compliance process cannot be empty',
-  theDeadlineComplianceProcessCannotEmpty:'The deadline for the validation compliance process cannot be empty',
+  theDeadlineComplianceProcessCannotEmpty:'The deadline for validation compliance process cannot be empty',
-  theDeadlineForTheDesignCannotBeEmpty:'The deadline for the design compliance process cannot be empty',
+  theDeadlineForTheDesignCannotBeEmpty:'The deadline for design compliance process cannot be empty',
-  thePersonResponsibleForDesignCannotBeBlank:'The person responsible for designing the compliance process cannot be empty',
+  thePersonResponsibleForDesignCannotBeBlank:'The owner for design compliance process cannot be empty',
   recordmaintenance:'Record maintenance',
   module:'module',
   selectTheVehicleTemplate:'Select the vehicle template',
@@ -1698,14 +1698,14 @@ module.exports = {
   designComplianceProcess:'Design Compliance Process',
   validationComplianceProcess:'Verify Compliance Process',
   onlyDataInTheReminderProcessBanBeProcessed:'Only data in the reminder process can be processed',
-  expeditionProcess:'Expedition Process',
+  expeditionProcess:'Reminder Process',
   addfunction:'Add function',
   controllername:'Controller name',
   hardwaremanufacturer:'Hardware manufacturer',
   softwareversion:'Software version',
   returntofill:'Return to fill',
-  thereAreCurrentlyNoRegulationsToHandle:'There are currently no regulations to handle',
+  thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now',
-  certificationSubmission:'Certification Submission',
+  certificationSubmission:'Application Submitted',
   upgradecompletion:'Upgrade completion',
   implementedupgrade:'Whether the implemented upgrade is consistent with the record',
   numberofvehicles:'Number of vehicles that have completed upgrades',
@@ -1715,7 +1715,7 @@ module.exports = {
   onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted',
   implementationDateTwo:'Implementation Date',
   reasonForReturn:'Reason For Return',
-  pleaseFillInTheInformationTaskProcess:'Please fill in the information of the project interface person and responsible person before initiating the task process',
+  pleaseFillInTheInformationTaskProcess:'Please fill in the information of the Eng. Interface and the owner before initiating the task process',
   complianceReporting:'Compliance Reporting',
   youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit',
   note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification',
@@ -1735,10 +1735,10 @@ module.exports = {
   gnxtwh:'Functional system maintenance',
   gnxt:'Functional system',
   dykzq:'Corresponding controller',
-  releaseRegulatoryList:'Release of regulatory list',
+  releaseRegulatoryList:'Regulation List Release',
-  preHomoFlow:'Pre-Homo flow',
+  preHomoFlow:'Pre-Homo Process',
-  verifyConformanceConfirmation:'Verify conformance confirmation',
+  verifyConformanceConfirmation:'Validation Compliance Confirmation',
-  designConformanceVerification:'Design conformance verification',
+  designConformanceVerification:'Design Compliance Confirmation',
   nomorethan:'No more than 10',
   marketCertificationList:'Market Certification List',
   uploadedfilelarger:'The uploaded file is larger than',
@@ -1752,8 +1752,8 @@ module.exports = {
   taskToBeConfirmed:'Task to be confirmed',
   resultsToBeSubmitted:'Results to be submitted',
   resultsToBeReviewed:'Results to be reviewed',
-  compliance:'Compliance',
+  compliance:'Compliant',
-  nonCompliance:'Non-Compliance',
+  nonCompliance:'Non-Compliant',
   toBeTracked:'To be tracked',
   NA:'NA',
   electroniccontrollerparameter:'Electronic controller parameter',
@@ -1801,4 +1801,5 @@ module.exports = {
   verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
   designaconformancedeliverabletype:'Design a conformance deliverable type',
   reasonForReturnOfCompliance:'Reason for compliance return',
+  have:'Yes',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1634,7 +1634,7 @@ module.exports = {
   Listoftreatableregulations: '可处理法规列表',
   Listofuntractableregulations: '不可处理法规列表',
   project: '项目',
-  Categoryofdeliverables: "交付物类别",
+  Categoryofdeliverables: "交付物类型",
   Taskconfirmationresult: '任务确认结果',
   Compliancetaskhandling: '符合性任务办理',
   resultofhandling: '处理结果',

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

@@ -191,6 +191,13 @@
         getAction(this.url.seachList, params).then((res) => {
           if (res.success) {
             this.searchList = res.result
+            this.searchList.push({
+              db_field_name: 'corresponding_standard',
+              db_field_txt: '对应标准',
+              dict_field: '',
+              field_show_type: '10',
+              tree: []
+            })
           }
         })
       },

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -43,6 +43,15 @@
               </a-select>
             </div>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standardNo')">
+                <span>{{ $t('standardNo') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standardNo')"
+                       v-model="queryParam.serialNumber"></j-input>
+            </div>
+          </a-col>
           <template v-if="toggleSearchStatus">
 
           </template>
@@ -583,18 +592,18 @@
             value: 'serialNumber',
             text: this.$t('standardNo')
           },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'sdt',
+          //   value: 'sdt',
-            valueName: 'sdtName',
+          //   valueName: 'sdtName',
-            text: this.$t('engineeringInterfacePerson')
+          //   text: this.$t('engineeringInterfacePerson')
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'dutyPerson',
+          //   value: 'dutyPerson',
-            valueName: 'dutyPersonName',
+          //   valueName: 'dutyPersonName',
-            text: this.$t('personLiable')
+          //   text: this.$t('personLiable')
-          },
+          // },
           {
             type: 'date',
             value: 'endTime',
@@ -820,6 +829,7 @@
       this.userInfoQuery = this.userInfo()
       this.getProcessStatus()
       this.getDeliverableTree()
+      this.querydreId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -869,6 +879,47 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      querydreId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'sdt',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            let personLiable = {
+              value: 'dutyPerson',
+              text: this.$t('personLiable'),
+              options: []
+            }
+            if (res.result.interfaceList && res.result.interfaceList.length > 0) {
+              res.result.interfaceList.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            if (res.result.dutyList && res.result.dutyList.length > 0) {
+              res.result.dutyList.forEach(val => {
+                personLiable.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+            this.fieldList.push(personLiable)
+          } else {
+
+          }
+        })
+      },
       getDeliverableTree() {
         getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
           if (res.success) {

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1249,28 +1249,28 @@
             text: this.$t('certificationLevel'),
             dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
-          {
+          // {
-            type: 'deliverables',
+          //   type: 'deliverables',
-            value: 'designDeliverableType',
+          //   value: 'designDeliverableType',
-            text: this.$t('designaconformancedeliverabletype'),
+          //   text: this.$t('designaconformancedeliverabletype'),
-          },
+          // },
-          {
+          // {
-            type: 'deliverables',
+          //   type: 'deliverables',
-            value: 'verifyDeliverableType',
+          //   value: 'verifyDeliverableType',
-            text: this.$t('verifytheconformancedeliverabletype'),
+          //   text: this.$t('verifytheconformancedeliverabletype'),
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'designDutyId',
+          //   value: 'designDutyId',
-            valueName: 'designDutyIdName',
+          //   valueName: 'designDutyIdName',
-            text: this.$t('responsiblepersonfordesigncompliance')
+          //   text: this.$t('responsiblepersonfordesigncompliance')
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'verifyDutyId',
+          //   value: 'verifyDutyId',
-            valueName: 'verifyDutyIdName',
+          //   valueName: 'verifyDutyIdName',
-            text: this.$t('responsiblepersonforverifyingcompliance')
+          //   text: this.$t('responsiblepersonforverifyingcompliance')
-          },
+          // },
           // {
           //   type: '',
           //   value: 'dutyTerritory',
@@ -1435,6 +1435,8 @@
       this.getHeader()
       this.queryLawEngineerByProjectId()
       this.queryengineeringInterfacePersonId()
+      this.querydesignDutyId()
+      this.queryverifyDutyId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1577,6 +1579,59 @@
           }
         })
       },
+      querydesignDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let designDuty = {
+              value: 'designDutyId',
+              text: this.$t('responsiblepersonfordesigncompliance'),
+              options: []
+            }
+            console.log(res)
+            if (res.result.designDutyList && res.result.designDutyList.length > 0) {
+              res.result.designDutyList.forEach(val => {
+                designDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(designDuty)
+          } else {
+
+          }
+        })
+      },
+      queryverifyDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let verifyDuty = {
+              value: 'verifyDutyId',
+              text: this.$t('responsiblepersonforverifyingcompliance'),
+              options: []
+            }
+            if (res.result.verifyDutyList && res.result.verifyDutyList.length > 0) {
+              res.result.verifyDutyList.forEach(val => {
+                verifyDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(verifyDuty)
+          } else {
+
+          }
+        })
+      },
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}