项目安装告知短信回显

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeMsgPageDto.java

@@ -40,10 +40,11 @@ public class InstallNoticeMsgPageDto extends BaseDto {
 
     @ApiModelProperty(value = "短信通知单位")
     private Long targetUnitId;
+    private String targetUnitIdName;
 
     @ApiModelProperty(value = "短信接收人")
     private Long targetPersonId;
-
+    private String targetPersonIdName;
     @ApiModelProperty(value = "短信通知内容")
     private String content;
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/InstallNoticeMsgServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeMsgPageDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
@@ -15,10 +16,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 项目安装告知短信记录表服务实现类
@@ -36,6 +34,8 @@ public class InstallNoticeMsgServiceImpl extends BaseService<InstallNoticeMsgDto
     @Autowired
     InstallNoticeMapper installNoticeMapper;
     @Autowired
+    OrgServiceImpl orgService;
+    @Autowired
     InstallNoticeServiceImpl installNoticeService;
     /**
      * 分页查询
@@ -55,21 +55,36 @@ public class InstallNoticeMsgServiceImpl extends BaseService<InstallNoticeMsgDto
      * 项目安装告知短信通知记录分页查询
      */
     @Override
-    public  Page<InstallNoticeMsgPageDto> installNoticeMsgList(Page<InstallNoticeMsgPageDto> page, String name, String installationUnit){
+    public Page<InstallNoticeMsgPageDto> installNoticeMsgList(Page<InstallNoticeMsgPageDto> page, String name, String installationUnit) {
         List<Project> projectList = projectResourceService.getProjectList();
         List<InstallNotice> installNoticeList = new ArrayList<>();
-        for(Project project: projectList){
+        List<InstallNoticeMsgPageDto> pageDtoList = new ArrayList<>();
+        for (Project project : projectList) {
             LambdaQueryWrapper<InstallNotice> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(InstallNotice::getProjectId,project.getSequenceNbr());
+            wrapper.eq(InstallNotice::getProjectId, project.getSequenceNbr());
             List<InstallNotice> installNotice = installNoticeService.list(wrapper);
             installNoticeList.addAll(installNotice);
         }
         Set<String> seqs = new HashSet<>();
-        for(InstallNotice installNotice : installNoticeList){
+        for (InstallNotice installNotice : installNoticeList) {
             String seq = String.valueOf(installNotice.getSequenceNbr());
             seqs.add(seq);
         }
-        return installNoticeMsgMapper.InstallNoticeMsgPage(page, name, installationUnit,seqs);
+        Page<InstallNoticeMsgPageDto> installNoticeMsgPageDtoPage = installNoticeMsgMapper.InstallNoticeMsgPage(page, name, installationUnit, seqs);
+
+        for (InstallNoticeMsgPageDto i : installNoticeMsgPageDtoPage.getRecords()) {
+            OrgUsr orgUsrById = orgService.getOrgId(String.valueOf(i.getTargetUnitId()));
+            //回显
+            i.setTargetUnitIdName(String.valueOf(orgUsrById.getBizOrgName()));
+            //接收人
+            OrgUsr orgUsrById1 = orgService.getOrgUsrById(String.valueOf(i.getTargetPersonId()));
+            i.setTargetPersonIdName(String.valueOf(orgUsrById1.getBizOrgName()));
+
+            pageDtoList.add(i);
+
+        }
+        installNoticeMsgPageDtoPage.setRecords(pageDtoList);
+        return installNoticeMsgPageDtoPage;
     }
 
     @Override

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -393,6 +393,19 @@ public class OrgServiceImpl {
     }
 
     /**
+     * 根据id获取getOrgId表的详细信息
+     */
+    public OrgUsr getOrgId(String sequenceNbr){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getAmosOrgId,sequenceNbr);
+        OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper);
+        if(ValidationUtil.isEmpty(orgUsr)){
+            return  null;
+        }
+        return orgUsr;
+    }
+
+    /**
      * 根据parentId获取OrgUsr表的详细信息列表
      */
     public List<OrgUsr> getOrgUsrByParentId(String sequenceNbr){