From 9bf615a9d81b506138645ff6626d1b0571a783ab Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 11 Sep 2024 14:46:33 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E5=A2=9E=E5=8A=A0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=85=B3=E8=81=94=E8=AF=B7=E6=AC=BE=E8=AF=B4=E6=98=8E?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pm/api/projectdeclared/manage/PurchaseManage.java | 17 +++++++++++++++++ .../model/req/SubmitPurchaseNoticeReq.java | 3 +++ .../api/projectlib/controller/ProjectLibController.java | 6 ++++++ .../projectlib/entity/ProjectGovSystemReplaceInfos.java | 3 +++ .../hz/pm/api/projectlib/manage/ProjectLibManage.java | 4 ++++ .../service/IProjectGovSystemReplaceInfosService.java | 9 +++++++++ .../hz/pm/api/sys/controller/SysProcDefController.java | 16 +++++----------- 7 files changed, 47 insertions(+), 11 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java index d870bb2..179b0b8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java +++ b/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 = new ArrayList<>(); + for (int i = 0; i < req.getTenders().size(); i++) { + List 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); // 发布采购公告 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java index f24dabb..02140b8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitPurchaseNoticeReq.java +++ b/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 systemReplaceInfoIds; + } } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectLibController.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectLibController.java index f480b0a..a22c0b1 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/controller/ProjectLibController.java +++ b/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 getSystemReplaceInfosOption(@PathVariable String projectCode) { + return projectLibManage.getSystemReplaceInfosOption(projectCode); + } + @GetMapping("/processSchedule/{projectId}") @ApiOperation("项目库申报项目当前进度详情") public List processScheduleDetail(@PathVariable("projectId") Long projectId) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java index e123d06..0941c16 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/entity/ProjectGovSystemReplaceInfos.java +++ b/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; + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java index fbc8cb0..fc7e571 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java +++ b/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 getSystemReplaceInfosOption(String projectCode) { + return projectGovSystemReplaceInfosService.listByProjectCode(projectCode); + } + public List processScheduleDetail(Long projectId) { Project project = projectService.getById(projectId); return processExecuteHandle.handle(project); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java index b93b580..ec8ea11 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java +++ b/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; /** *

@@ -17,6 +19,13 @@ import java.util.Collection; */ public interface IProjectGovSystemReplaceInfosService extends IService { + + default List listByProjectCode(String projectCode) { + Wrapper wrapper = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class) + .eq(ProjectGovSystemReplaceInfos::getProjectCode, projectCode); + return list(wrapper); + } + default void removeByProjectIds(Collection projectIds) { LambdaQueryWrapper query = Wrappers .lambdaQuery(ProjectGovSystemReplaceInfos.class) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/sys/controller/SysProcDefController.java b/hz-pm-api/src/main/java/com/hz/pm/api/sys/controller/SysProcDefController.java index 5781dc8..9023398 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/sys/controller/SysProcDefController.java +++ b/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)); } }