modify:

1. 增加系统关联请款说明;

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java

@@ -40,6 +40,7 @@ import com.hz.pm.api.projectdeclared.model.req.*;
 import com.hz.pm.api.projectdeclared.model.req.SubmitPurchaseNoticeReq.PurchaseNoticeTenderDTO;
 import com.hz.pm.api.projectdeclared.model.vo.*;
 import com.hz.pm.api.projectdeclared.service.*;
+import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
 import com.hz.pm.api.projectlib.entity.PurchaseStatusChange;
 import com.hz.pm.api.projectlib.helper.ProjectManageUtil;
 import com.hz.pm.api.projectlib.model.entity.Project;
@@ -49,6 +50,7 @@ import com.hz.pm.api.projectlib.model.enumeration.status.*;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.model.vo.TenderListInfoVO;
+import com.hz.pm.api.projectlib.service.IProjectGovSystemReplaceInfosService;
 import com.hz.pm.api.projectlib.service.IProjectInstService;
 import com.hz.pm.api.projectlib.service.IProjectService;
 import com.hz.pm.api.projectlib.service.IPurchaseStatusChangeService;
@@ -127,6 +129,7 @@ public class PurchaseManage {
     private final MhXchxFileHelper mhXchxFileHelper;
     private final IPurchaseStatusChangeService purchaseStatusChangeService;
     private final MhUnitQueryAuthHelper mhUnitQueryAuthHelper;
+    private final IProjectGovSystemReplaceInfosService projectGovSystemReplaceInfosService;
 
     public PurchaseProgressStatVO purchaseProgressStatistics(ProjectListReq req) {
         UserInfoDetails user = LoginUserUtil.loginUserDetail();
@@ -439,6 +442,20 @@ public class PurchaseManage {
             return purchase;
         }).collect(Collectors.toList());
         purchaseService.saveOrUpdateBatch(purchases);
+        List<ProjectGovSystemReplaceInfos> projectGovSystemReplaceInfos = new ArrayList<>();
+        for (int i = 0; i < req.getTenders().size(); i++) {
+            List<Long> systemReplaceInfoIds = req.getTenders().get(i).getSystemReplaceInfoIds();
+            if (CollUtil.isNotEmpty(systemReplaceInfoIds)) {
+                Long bidId = purchases.get(i).getId();
+                for (Long systemReplaceInfoId : systemReplaceInfoIds) {
+                    ProjectGovSystemReplaceInfos replaceInfos = new ProjectGovSystemReplaceInfos();
+                    replaceInfos.setId(systemReplaceInfoId);
+                    replaceInfos.setBidId(bidId);
+                    projectGovSystemReplaceInfos.add(replaceInfos);
+                }
+            }
+        }
+        projectGovSystemReplaceInfosService.updateBatchById(projectGovSystemReplaceInfos);
         projectStateMachineUtil.pass(project);
         projectService.updateById(project);
         // 发布采购公告

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java

@@ -99,6 +99,9 @@ public class SubmitPurchaseNoticeReq {
         @ApiModelProperty("采购说明")
         private String purchaseRemark;
 
+        @ApiModelProperty("系统改造情况ID")
+        private List<Long> systemReplaceInfoIds;
+
     }
 
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectLibController.java

@@ -2,6 +2,7 @@ package com.hz.pm.api.projectlib.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hz.pm.api.common.helper.UserInfoHelper;
+import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
 import com.hz.pm.api.projectlib.manage.ProjectLibManage;
 import com.hz.pm.api.projectlib.model.req.ProjectApplicationListReq;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
@@ -96,6 +97,11 @@ public class ProjectLibController {
         return projectLibManage.detailProjectCode(projectCode);
     }
 
+    @GetMapping("/systemReplaceInfos/option/{projectCode}")
+    public List<ProjectGovSystemReplaceInfos> getSystemReplaceInfosOption(@PathVariable String projectCode) {
+        return projectLibManage.getSystemReplaceInfosOption(projectCode);
+    }
+
     @GetMapping("/processSchedule/{projectId}")
     @ApiOperation("项目库申报项目当前进度详情")
     public List<ProcessDetailVO> processScheduleDetail(@PathVariable("projectId") Long projectId) {

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java

@@ -54,4 +54,7 @@ public class ProjectGovSystemReplaceInfos implements Serializable {
 
     private String sourceSystemId;
 
+    @ApiModelProperty("标段ID")
+    private Long bidId;
+
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -1163,6 +1163,10 @@ public class ProjectLibManage {
         return vo;
     }
 
+    public List<ProjectGovSystemReplaceInfos> getSystemReplaceInfosOption(String projectCode) {
+        return projectGovSystemReplaceInfosService.listByProjectCode(projectCode);
+    }
+
     public List<ProcessDetailVO> processScheduleDetail(Long projectId) {
         Project project = projectService.getById(projectId);
         return processExecuteHandle.handle(project);

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java

@@ -1,11 +1,13 @@
 package com.hz.pm.api.projectlib.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * <p>
@@ -17,6 +19,13 @@ import java.util.Collection;
  */
 public interface IProjectGovSystemReplaceInfosService extends IService<ProjectGovSystemReplaceInfos> {
 
+
+    default List<ProjectGovSystemReplaceInfos> listByProjectCode(String projectCode) {
+        Wrapper<ProjectGovSystemReplaceInfos> wrapper = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class)
+                .eq(ProjectGovSystemReplaceInfos::getProjectCode, projectCode);
+        return list(wrapper);
+    }
+
     default void removeByProjectIds(Collection<Long> projectIds) {
         LambdaQueryWrapper<ProjectGovSystemReplaceInfos> query = Wrappers
                 .lambdaQuery(ProjectGovSystemReplaceInfos.class)

hz-pm-api/src/main/java/com/hz/pm/api/sys/controller/SysProcDefController.java

@@ -1,9 +1,10 @@
 package com.hz.pm.api.sys.controller;
 
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.hz.pm.api.sys.manage.InitProcessManage;
+import com.hz.pm.api.user.model.entity.MhUnit;
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.log.annotation.WebLog;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.vo.WflowModelVo;
@@ -18,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @Classname SysProcdefController
@@ -81,10 +81,7 @@ public class SysProcDefController {
     }
 
     public static void main(String[] args) {
-        String s = "{\n" +
-                "    \"code\": 200,\n" +
-                "    \"data\": [\n" +
-                "        {\n" +
+        String s = "[{\n" +
                 "            \"id\": 32,\n" +
                 "            \"name\": \"上城区信创办\",\n" +
                 "            \"parentId\": 1084,\n" +
@@ -293,11 +290,8 @@ public class SysProcDefController {
                 "            \"sort\": 1,\n" +
                 "            \"type\": \"SASAC\"\n" +
                 "        }\n" +
-                "    ],\n" +
-                "    \"message\": \"正常\"\n" +
-                "}";
-
-        System.out.println(JSONUtil.parseObj(s).getBeanList("data", JSONObject.class).stream().map(w -> w.getStr("id")).collect(Collectors.joining(",")));
+                "    ]";
+        System.out.println(CollUtils.joinByComma(JSONUtil.toList(s, MhUnit.class), MhUnit::getId));
     }
 
 }