WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug62162

Browse Source
This commit is contained in:
CD
2022-11-04 09:11:20 +08:00
parent 413b0b32e2
commit 66ed688f79
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+13 -13
View File
@@ -477,13 +477,13 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
//feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber()); //feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket()); //feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
String initiator = ""; //String initiator = "";
if (StringUtils.isNotEmpty(initiatorId)) { //if (StringUtils.isNotEmpty(initiatorId)) {
QueryWrapper<SysUser> queryOneWrapper = new QueryWrapper<>(); // QueryWrapper<SysUser> queryOneWrapper = new QueryWrapper<>();
queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); // queryOneWrapper.lambda().eq(SysUser::getId,initiatorId);
SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); // SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper);
initiator = sysUser.getUsername(); // initiator = sysUser.getUsername();
} //}
//feishuMsgVo.setInitiator(initiator); //feishuMsgVo.setInitiator(initiator);
//MessageTypeEnum messageTypeEnum = null; //MessageTypeEnum messageTypeEnum = null;
@@ -518,12 +518,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION; //messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn(); msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理"; cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
cnContentLower = "项目: " + projectName + cnContentLower = "项目: " + projectName +
"\n法规: " + LAW_CN + "\n法规: " + LAW_CN +
"\n发起人: " + currentUser.getUsername() + "\n发起人: " + currentUser.getUsername() +
"\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate()); "\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner"; enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
enContentLower = "Project: " + projectName + enContentLower = "Project: " + projectName +
"\nRegulation No: " + LAW_EN + "\nRegulation No: " + LAW_EN +
"\nInitiator: " + currentUser.getUsername() + "\nInitiator: " + currentUser.getUsername() +
@@ -542,12 +542,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION; //messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn(); msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理"; cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
cnContentLower = "项目: " + projectName + cnContentLower = "项目: " + projectName +
"\n法规: " + LAW_CN + "\n法规: " + LAW_CN +
"\n发起人: " + currentUser.getUsername() + "\n发起人: " + currentUser.getUsername() +
"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate()); "\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner"; enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
enContentLower = "Project: " + projectName + enContentLower = "Project: " + projectName +
"\nRegulation No: " + LAW_EN + "\nRegulation No: " + LAW_EN +
"\nInitiator: " + currentUser.getUsername() + "\nInitiator: " + currentUser.getUsername() +
@@ -566,12 +566,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION; //messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn(); msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理"; cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
cnContentLower = "项目: " + projectName + cnContentLower = "项目: " + projectName +
"\n法规: " + LAW_CN + "\n法规: " + LAW_CN +
"\n发起人: " + currentUser.getUsername() + "\n发起人: " + currentUser.getUsername() +
"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate()); "\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner"; enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
enContentLower = "Project: " + projectName + enContentLower = "Project: " + projectName +
"\nRegulation No: " + LAW_EN + "\nRegulation No: " + LAW_EN +
"\nInitiator: " + currentUser.getUsername() + "\nInitiator: " + currentUser.getUsername() +