20220928

项目登记

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/controller/ProjectListController.java

@@ -1,10 +1,8 @@
 package com.jeeplus.test.program.configuration.projectList.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.utils.ResponseUtil;
-import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.test.program.configuration.projectList.domain.ProgramProjectListInfo;
 import com.jeeplus.test.program.configuration.projectList.service.ProjectListService;
 import com.jeeplus.test.program.configuration.projectList.service.dto.ContractDto;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/domain/ProgramProjectListLink.java

@@ -8,6 +8,8 @@ import lombok.Data;
 @TableName(value = "program_project_list_link")
 public class ProgramProjectListLink extends BaseEntity {
 
+    private String type;
+
     private String infoId;
 
     private String contacts;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -75,10 +75,25 @@ public class ProjectListService {
         info.setUpdateDate(new Date());
         info.setDelFlag(0);
         projectListMapper.insert(info);
-        // 保存项目管理列表联系人信息
+        // 保存项目直接对接人信息
         if (CollectionUtils.isNotEmpty(dto.getLinks())) {
             for (ProgramProjectListLink link : dto.getLinks()) {
                 link.setId(UUID.randomUUID().toString().replace("-", ""));
+                link.setType("1");
+                link.setInfoId(id);
+                link.setCreateBy(userDTO.getId());
+                link.setCreateDate(new Date());
+                link.setUpdateBy(userDTO.getId());
+                link.setUpdateDate(new Date());
+                link.setDelFlag(0);
+                projectLinkMapper.insert(link);
+            }
+        }
+        // 保存项目直接对接人信息
+        if (CollectionUtils.isNotEmpty(dto.getLinkInfos())) {
+            for (ProgramProjectListLink link : dto.getLinkInfos()) {
+                link.setId(UUID.randomUUID().toString().replace("-", ""));
+                link.setType("2");
                 link.setInfoId(id);
                 link.setCreateBy(userDTO.getId());
                 link.setCreateDate(new Date());
@@ -118,11 +133,26 @@ public class ProjectListService {
         info.setUpdateDate(new Date());
         info.setDelFlag(0);
         projectListMapper.updateById(info);
-        // 修改项目管理列表联系人信息(先删除原有数据，再保存)
+        // 修改项目直接对接人信息(先删除原有数据，再保存)
+        projectLinkMapper.deleteByInfoId(dto.getId());
         if (CollectionUtils.isNotEmpty(dto.getLinks())) {
-            projectLinkMapper.deleteByInfoId(dto.getId());
             for (ProgramProjectListLink link : dto.getLinks()) {
                 link.setId(UUID.randomUUID().toString().replace("-", ""));
+                link.setType("1");
+                link.setInfoId(dto.getId());
+                link.setCreateBy(userDTO.getId());
+                link.setCreateDate(new Date());
+                link.setUpdateBy(userDTO.getId());
+                link.setUpdateDate(new Date());
+                link.setDelFlag(0);
+                projectLinkMapper.insert(link);
+            }
+        }
+        // 修改项目直接对接人信息
+        if (CollectionUtils.isNotEmpty(dto.getLinkInfos())) {
+            for (ProgramProjectListLink link : dto.getLinkInfos()) {
+                link.setId(UUID.randomUUID().toString().replace("-", ""));
+                link.setType("2");
                 link.setInfoId(dto.getId());
                 link.setCreateBy(userDTO.getId());
                 link.setCreateDate(new Date());
@@ -158,14 +188,24 @@ public class ProjectListService {
         // 查询主表信息
         ProgramProjectListInfo info = projectListMapper.selectById(id);
         BeanUtils.copyProperties(info, dto);
-        // 查询联系人列表
+        // 查询项目直接对接人列表
         LambdaQueryWrapper<ProgramProjectListLink> linkWrapper = new LambdaQueryWrapper<>();
         linkWrapper.eq(ProgramProjectListLink::getInfoId, id);
+        linkWrapper.eq(ProgramProjectListLink::getType, "1");
         linkWrapper.eq(ProgramProjectListLink::getDelFlag, 0);
         List<ProgramProjectListLink> links = projectLinkMapper.selectList(linkWrapper);
         if (CollectionUtils.isNotEmpty(links)) {
             dto.setLinks(links);
         }
+        // 查询项目直接对接人列表
+        LambdaQueryWrapper<ProgramProjectListLink> linkInfoWrapper = new LambdaQueryWrapper<>();
+        linkInfoWrapper.eq(ProgramProjectListLink::getInfoId, id);
+        linkInfoWrapper.eq(ProgramProjectListLink::getType, "2");
+        linkInfoWrapper.eq(ProgramProjectListLink::getDelFlag, 0);
+        List<ProgramProjectListLink> linkInfos = projectLinkMapper.selectList(linkInfoWrapper);
+        if (CollectionUtils.isNotEmpty(linkInfos)) {
+            dto.setLinkInfos(linkInfos);
+        }
         // 查询成员列表
         LambdaQueryWrapper<ProgramProjectListMember> memberWrapper = new LambdaQueryWrapper<>();
         memberWrapper.eq(ProgramProjectListMember::getInfoId, id);
@@ -175,7 +215,6 @@ public class ProjectListService {
             dto.setMembers(members);
         }
         // 查询附件信息
-        // 查询附件信息
         List<WorkAttachmentDto> files = workContractInfoMapper.findDtos(id);
         if (CollectionUtils.isNotEmpty(files)) {
             for (WorkAttachmentDto i : files) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/dto/ProjectListDto.java

@@ -114,8 +114,16 @@ public class ProjectListDto extends BaseEntity {
 
     private String status;
 
+    /**
+     * 项目直接对接人
+     */
     private List<ProgramProjectListLink> links;
 
+    /**
+     * 产权持有人联系人
+     */
+    private List<ProgramProjectListLink> linkInfos;
+
     private List<ProgramProjectListMember> members;
 
     private List<WorkAttachmentDto> files;