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

update.

Browse Source
This commit is contained in:
wangzhijiang
2022-04-20 09:01:04 +08:00
parent 4d9e34ce8b
commit 6445aabe89
1 changed files with 16 additions and 2 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/ProjectLawsInventoryEOServiceImpl.java
+16 -2
View File
@@ -20,10 +20,12 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.entity.ProjectRelatedPersonnel;
import com.jero.modules.project.enums.*; import com.jero.modules.project.enums.*;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService; import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysAnnouncement;
@@ -84,6 +86,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Autowired @Autowired
private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper; private ProjectRelatedPersonnelMapper projectRelatedPersonnelMapper;
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
/** /**
* 保存 * 保存
* *
@@ -282,7 +287,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//任务确认状态 //任务确认状态
String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus(); String taskAffirmStatus = projectLawsInventoryEO.getTaskAffirmStatus();
if(StringUtils.isNotEmpty(taskAffirmStatus)){ if(StringUtils.isNotEmpty(taskAffirmStatus)){
projectLawsInventoryEO.setTaskAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(taskAffirmStatus)); if(StringUtils.equals(cut, CutEnum.CN.getValue())){
projectLawsInventoryEO.setTaskAffirmStatusName(InventoryAffirmStatusEnum.getTextByValue(taskAffirmStatus));
}else {
projectLawsInventoryEO.setTaskAffirmStatusName(taskAffirmStatus);
}
} }
String roleCode = ""; String roleCode = "";
@@ -479,10 +488,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(userIdList)){ if(CollectionUtils.isNotEmpty(userIdList)){
userIdList = userIdList.stream().distinct().collect(Collectors.toList()); userIdList = userIdList.stream().distinct().collect(Collectors.toList());
QueryWrapper<ProjectNameInfoEO> projectNameInfoEOQueryWrapper = new QueryWrapper<>();
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectName());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
//消息内容 //消息内容
//String msgContentCN = currentUser.getUsername() + "发起了 " + projectLibraryBase.getProjectName() //String msgContentCN = currentUser.getUsername() + "发起了 " + projectLibraryBase.getProjectName()
//+ " （项目名称）法规的清单确认，截止时间为：" +inventoryAffirmDueDate+ "， 请及时查看处理。"; //+ " （项目名称）法规的清单确认，截止时间为：" +inventoryAffirmDueDate+ "， 请及时查看处理。";
String msgContentEN = currentUser.getUsername() + "initiated the regulation list confirmation of " + projectLibraryBase.getProjectName() String msgContentEN = currentUser.getUsername() + "initiated the regulation list confirmation of " + projectNameInfoEO.getProjectName()
+ " (project name).The due date is：" +inventoryAffirmDueDate+ ". Please check and deal with it in time."; + " (project name).The due date is：" +inventoryAffirmDueDate+ ". Please check and deal with it in time.";
//XXX XXX XXXXXX //XXX XXX XXXXXX