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

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

@@ -135,6 +135,7 @@ public class InventoryAffirmJob implements Job {
                         Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+                        params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }
@@ -163,6 +164,7 @@ public class InventoryAffirmJob implements Job {
                         Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+                        params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }
@@ -191,6 +193,7 @@ public class InventoryAffirmJob implements Job {
                         Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+                        params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
                     }

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

@@ -146,6 +146,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 当天结束的
@@ -178,6 +183,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 逾期的
@@ -210,6 +220,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                     }
                 }
@@ -257,6 +272,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 当天结束的
@@ -289,6 +309,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
                     }
                     // 逾期的
@@ -321,6 +346,11 @@ public class TaskAffirmJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
                     }
                 }

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

@@ -135,6 +135,11 @@ public class VerifyComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -166,6 +171,11 @@ public class VerifyComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -197,6 +207,11 @@ public class VerifyComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
                     // 逾期的
@@ -227,6 +242,11 @@ public class VerifyComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params);
                     }
                 }

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

@@ -135,6 +135,11 @@ public class designComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -166,6 +171,11 @@ public class designComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
 
@@ -197,6 +207,11 @@ public class designComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
                     }
                     // 逾期的
@@ -227,6 +242,11 @@ public class designComplianceJob implements Job {
                         params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
                         params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+                        String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
+                        List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+                        String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+                        params.put("Initiator",regulationOwnerUserName);
+
                         this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params);
                     }
                 }

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

@@ -683,14 +683,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				params.put("Initiator",regulationOwnerUserName);
+
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
 		}
 		if((projectLawsInventoryOld.getDesignDueDate() != null && projectLawsInventoryEO.getDesignDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getDesignDueDate().equals(projectLawsInventoryEO.getDesignDueDate())){
 				String endTime = "";
-				if(projectLawsInventoryOld.getInventoryAffirmDueDate() != null){
+				if(projectLawsInventoryEO.getDesignDueDate() != null){
-					endTime = DateUtils.formatDate(projectLawsInventoryOld.getInventoryAffirmDueDate());
+					endTime = DateUtils.formatDate(projectLawsInventoryEO.getDesignDueDate());
 				}
 
 				String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
@@ -712,6 +716,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				params.put("Initiator",regulationOwnerUserName);
 
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
@@ -719,8 +726,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if((projectLawsInventoryOld.getVerifyDueDate() != null && projectLawsInventoryEO.getVerifyDueDate() != null) && toBeCheckedFlag){
 			if(!projectLawsInventoryOld.getVerifyDueDate().equals(projectLawsInventoryEO.getVerifyDueDate())){
 				String endTime = "";
-				if(projectLawsInventoryOld.getInventoryAffirmDueDate() != null){
+				if(projectLawsInventoryEO.getVerifyDueDate() != null){
-					endTime = DateUtils.formatDate(projectLawsInventoryOld.getInventoryAffirmDueDate());
+					endTime = DateUtils.formatDate(projectLawsInventoryEO.getVerifyDueDate());
 				}
 
 				String regulationOwnerId = projectLawsInventoryOld.getRegulationOwnerId();
@@ -742,6 +749,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				params.put("Initiator",regulationOwnerUserName);
 
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
@@ -779,6 +789,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				params.put("Initiator",regulationOwnerUserName);
 
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
@@ -815,6 +828,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 				params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 				params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+				List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+				String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+				params.put("Initiator",regulationOwnerUserName);
 
 				this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(),params);
 			}
@@ -856,6 +872,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator",regulationOwnerUserName);
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 
@@ -888,6 +908,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator",regulationOwnerUserName);
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -3158,6 +3183,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			Map<String, Object> hrefFeishuMap = this.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
 			prarams.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 			prarams.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+
+			String projectLawsInventoryId = (String) prarams.get("id");
+			ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectById(projectLawsInventoryId);
+			String regulationOwnerId = projectLawsInventoryEO.getRegulationOwnerId();
+			List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+			String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+			prarams.put("Initiator",regulationOwnerUserName);
+
 			this.sendMessageByTemplateId(templateId,prarams);
 		}
 
@@ -6257,6 +6290,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 			paramsMsg.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 			paramsMsg.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+			paramsMsg.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 
 			this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),paramsMsg);
@@ -6286,6 +6320,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				html += s + "</br>";
 			}
 			FileUnZip.deleteDir(saveDirectory);
+			if(StringUtils.isNotBlank(html)){
+				html = html.substring(0,html.length()-7);
+			}
 			throw new JeroBootException(html);
 		} else {
 			if (dataList.size() != 0) {
@@ -9634,6 +9671,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
 				}
@@ -9685,6 +9723,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
@@ -9736,6 +9775,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator",regulationOwnerUserName);
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -9783,6 +9827,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+					params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 					this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
 				}
@@ -9833,6 +9878,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 					params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
 
+					String regulationOwnerId = lawsInventoryEOList.get(0).getRegulationOwnerId();
+					List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
+					String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
+					params.put("Initiator",regulationOwnerUserName);
+
 					this.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
 				}
 			}
@@ -10682,6 +10732,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE1.getValue(),params);
 
@@ -10760,6 +10811,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE2.getValue(),params);
 
@@ -10825,6 +10877,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		Map<String, Object> hrefFeishuMap = this.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN);
 		params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
 		params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
+		params.put("Initiator",projectLibraryBase.getStudioEngineerName());
 
 		this.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE3.getValue(),params);
 		return Result.OK("退回成功！");
@@ -10907,7 +10960,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						templateVariableMap.put("contentEn",contentEn);
 						templateVariableMap.put("projectNameCn",PRN_CN);
 						templateVariableMap.put("projectNameEn",PRN_EN);
-						templateVariableMap.put("Initiator",ObjectUtils.isNotEmpty(currentUser) ? currentUser.getUsername() : projectLibraryBase.getStudioEngineerName());
+						templateVariableMap.put("Initiator",Initiator);
 						templateVariableMap.put("studioEngineerName",projectLibraryBase.getStudioEngineerName());
 						templateVariableMap.put("endTime",endTime);
 						templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);

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

@@ -2013,6 +2013,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Override
 	public ProjectLibraryBase selectById(String projectLibraryId) {
 		List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
+		List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
+		List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
 		disposeData(records,"",false);
 
 		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
@@ -2049,6 +2051,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 						+ "-" + targetMarketCn
 						+ "-" + projectVersion);
 			}
+
+			if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
+				if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){
+					String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> {
+						boolean flag = false;
+						if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) {
+							flag = true;
+						}
+						return flag;
+					}).map(SysUser::getUsername).collect(Collectors.joining(","));
+
+					projectLibraryBase.setStudioEngineerName(studioEngineerUserName);
+				}
+			}
 		}
 		return records.get(0);
 	}

jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue

@@ -300,7 +300,14 @@ export default {
     },
     handleaddCancel() {
       this.visibleadd = false
-      this.formInline = {}
+      this.formInline = {
+        dataList:[
+          {
+            dykzq:'',
+          }
+        ],
+        gnxt:''
+      }
     },
     onChangehistory(page, pageSize) {
       this.pageNohistory = page

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { getAction, postAction, deleteAction } from '@/api/manage'
+import { getAction, postAction, deleteAction ,downloadFile} from '@/api/manage'
 import maintenance from './components/maintenance'
 import gnxtwh from './components/gnxtwh'
 import upgradecompletion from './components/upgradecompletion'
@@ -201,7 +201,8 @@ export default {
       //url传参严格按照当前命名
       url: {
         list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/page',
-        deleteBatch: '/ota/otaBaSjList/delete'
+        deleteBatch: '/ota/otaBaSjList/delete',
+        importZipUrl: '/ota/otaBaSjList/importData',//导入
 
       },
       visible: false,
@@ -435,22 +436,12 @@ export default {
     },
     // 导出
     handleExport(row) {
-      let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+      let text = '升级活动备案' + row.ggpc
-      let text = ''
       let flag
-      if (this.activeTab == this.$t('ImplementationDate')) {
-        flag = 0
-        text = this.$t('ImplementationDate')
-      } else {
-        text = this.$t('vehicleInProductionDate')
-        flag = 1
-      }
       let query = {
-        id: selectedRowKeys.join(','),
+        otaId: row.id
-        ...this.searchParmes,
-        flag: flag
       }
-      downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
+      downloadFile('/ota/otaBaSjList/exportData', text + '.zip', query, this.Deselect)
     },
     // 结束升级
     endUpgrade(record,flag){
@@ -486,7 +477,7 @@ export default {
     },
     // 模板下载
     handleModule(){
-      downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
+      downloadFile('ota/otaBaSjList/exportTemplate', '升级活动备案' + '.zip', {})
     },
     addModelList(record){
       record.sjzt=1

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -87,9 +87,9 @@ export default {
     return {
       dataSource: [
         {
-          sjqbgcs:'不涉及',
+          // sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及',
+          // sjhbgcs:'不涉及',
-          sjsjkzq:'ADC ADAS主控制器'
+          // sjsjkzq:'ADC ADAS主控制器'
         }
       ],
       fileList:'',
@@ -222,9 +222,9 @@ export default {
         }
         getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           this.dataSource =res.result.list == null ?  [ {
-          sjqbgcs:'不涉及',
+          // sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及',
+          // sjhbgcs:'不涉及',
-          sjsjkzq:'ADC ADAS主控制器'
+          // sjsjkzq:'ADC ADAS主控制器'
         }] : res.result.list
           this.fileList = res.result.fj
         })
@@ -283,9 +283,9 @@ export default {
     },
     addlineAtBot(){
       let obj= {
-          sjqbgcs:'不涉及',
+          // sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及',
+          // sjhbgcs:'不涉及',
-          sjsjkzq:'ADC ADAS主控制器'
+          // sjsjkzq:'ADC ADAS主控制器'
         }
         this.dataSource.push(obj)
       },

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -89,10 +89,10 @@ export default {
   data() {
     return {
       dataSource: [
-        {
+        // {
-          sjqbgcs:'不涉及',
+        //   sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及'
+        //   sjhbgcs:'不涉及'
-        }
+        // }
       ],
       loading: false,
       disable:false,
@@ -288,8 +288,8 @@ export default {
         }
         getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           this.dataSource =res.result.list == null ?  [ {
-          sjqbgcs:'不涉及',
+          // sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及'
+          // sjhbgcs:'不涉及'
         }] : res.result.list
         })
     },
@@ -323,8 +323,8 @@ export default {
     },
     addlineAtBot(){
       let obj= {
-          sjqbgcs:'不涉及',
+          // sjqbgcs:'不涉及',
-          sjhbgcs:'不涉及'
+          // sjhbgcs:'不涉及'
         }
         this.dataSource.push(obj)
       },

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -320,14 +320,6 @@ export default {
       ],
       form:{
         sjmd:'',
-        fhgd:1,
-        zdjsxg:2,
-        sfyxaq:2,
-        yhqr:1,
-        aqkkx:1,
-        zxsj:2,
-        aqjz:'2',
-        sjbcs:'3,4'
       }
     }
   },
@@ -385,14 +377,14 @@ this.$forceUpdate()
            if(res.code==200){
             this.form=res.result==null ? {
         sjmd:'',
-        fhgd:1,
+        // fhgd:1,
-        zdjsxg:2,
+        // zdjsxg:2,
-        sfyxaq:2,
+        // sfyxaq:2,
-        yhqr:1,
+        // yhqr:1,
-        aqkkx:1,
+        // aqkkx:1,
-        zxsj:2,
+        // zxsj:2,
-        aqjz:'2',
+        // aqjz:'2',
-        sjbcs:'3,4'
+        // sjbcs:'3,4'
       } : res.result
            }
         })

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -168,7 +168,7 @@ import ImportFile from '@/components/ImportFileData/index'
         confirmLoading: false,
         disabled: false,
         form:{
-          qymc:'安徽江淮汽车集团股份有限公司'
+          qymc:''
         },
         url: {
           exportData: '/ota/otaBaSjSjmbcx/exportData',
@@ -215,7 +215,8 @@ import ImportFile from '@/components/ImportFileData/index'
             this.form.bapc=undefined
             this.form.dllx1=undefined
             this.form.dllx2=undefined
-            this.form.qymc='安徽江淮汽车集团股份有限公司'
+            // this.form.qymc='安徽江淮汽车集团股份有限公司'
+            this.form.qymc=''
           }else{
             this.form=res.result
             if(res.result.dllx1==null){

jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue

@@ -20,12 +20,20 @@
                 <span class="title-text-text" :title="$t('pgradepurpose')">{{$t('pgradepurpose')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="sjmd">
-                <a-input class="box-input"
+<!--                <a-input class="box-input"-->
-                         :disabled="disabled"
+<!--                         :disabled="disabled"-->
-                         :max-length="500"
+<!--                         :max-length="500"-->
-                         :title='formInline.sjmd'
+<!--                         :title='formInline.sjmd'-->
-                         v-model='formInline.sjmd'
+<!--                         v-model='formInline.sjmd'-->
-                         :placeholder="$t('pleaseEnter')"></a-input>
+<!--                         :placeholder="$t('pleaseEnter')"></a-input>-->
+                <j-multi-select-tag class="box-input"
+                                    v-model="formInline.sjmd"
+                                    @change="update"
+                                    :disabled="disabled"
+                                    :placeholder="$t('PleaseSelect')"
+                                    :type="'select'"
+                                    :dictCode="'uipgrade_purpose'"
+                                    :triggerChange="false"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -162,7 +170,7 @@
           <a-col :span="24">
             <div class="plus">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('allupdatestotheusermanualareinformed')">{{$t('allupdatestotheusermanualareinformed')}}</span>
+                <span class="title-text-text" :title="$t('userinformstherelevantfile')">{{$t('userinformstherelevantfile')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="gzscnr">
                 <a-button type="primary" @click="clickButtonToUpload('xgwj')" v-model="formInline.xgwj">
@@ -204,8 +212,8 @@ export default {
       confirmLoading: false,
       disabled: false,
       formInline:{
-        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        // sjky:'车辆解闭锁功能可用，但不可驾驶',
-        sjbkygn:'除解闭锁均不可用'
+        // sjbkygn:'除解闭锁均不可用'
       },
       url: {
         exportData: '/ota/otaBaSjGgnrfs/exportData',
@@ -259,8 +267,8 @@ export default {
           if(res.code == 200){
 
             this.formInline= res.result ==null ? {
-        sjky:'车辆解闭锁功能可用，但不可驾驶',
+        // sjky:'车辆解闭锁功能可用，但不可驾驶',
-        sjbkygn:'除解闭锁均不可用'
+        // sjbkygn:'除解闭锁均不可用'
       } :res.result
             this.formInline.id=res.result.id
             this.$forceUpdate()
@@ -292,6 +300,9 @@ export default {
     dateChange(item) {
       this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
     },
+    update(){
+      this.$forceUpdate()
+    },
   }
 }
 </script>