Browse Source

modify:

1. 标段增加系统替代情况;
tags/24091301
WendyYang 1 month ago
parent
commit
9bc65318da
3 changed files with 13 additions and 1 deletions
  1. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseFullInfoVO.java
  2. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
  3. +7
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java

+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseFullInfoVO.java View File

@@ -1,6 +1,7 @@
package com.hz.pm.api.projectdeclared.model.vo; package com.hz.pm.api.projectdeclared.model.vo;


import com.hz.pm.api.projectdeclared.model.req.XcfhxApplyReq; import com.hz.pm.api.projectdeclared.model.req.XcfhxApplyReq;
import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;


@@ -20,6 +21,8 @@ public class PurchaseFullInfoVO {
@ApiModelProperty("招标登记") @ApiModelProperty("招标登记")
private PurchaseVO purchase; private PurchaseVO purchase;


private List<ProjectGovSystemReplaceInfos> systemReplaceInfos;

@ApiModelProperty("初验人员") @ApiModelProperty("初验人员")
private List<PreInsAcceptancePersonVO> firstInspectedPersons; private List<PreInsAcceptancePersonVO> firstInspectedPersons;




+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java View File

@@ -739,6 +739,8 @@ public class ProjectLibManage {


//查询初验信息 //查询初验信息
Map<Long, List<PreInsAcceptancePerson>> acceptPersonsMap = acceptancePersonService.listByBidIds(purchaseMap.keySet()); Map<Long, List<PreInsAcceptancePerson>> acceptPersonsMap = acceptancePersonService.listByBidIds(purchaseMap.keySet());
List<ProjectGovSystemReplaceInfos> systemReplaceInfos = projectGovSystemReplaceInfosService.listByBidIds(purchaseMap.keySet());
Map<Long, List<ProjectGovSystemReplaceInfos>> replaceInfosMap = CollUtils.group(systemReplaceInfos, ProjectGovSystemReplaceInfos::getBidId);
purchaseMap.forEach((k, v) -> { purchaseMap.forEach((k, v) -> {
PurchaseFullInfoVO purchaseFullInfo = new PurchaseFullInfoVO(); PurchaseFullInfoVO purchaseFullInfo = new PurchaseFullInfoVO();
purchaseFullInfo.setPurchase(v); purchaseFullInfo.setPurchase(v);
@@ -748,6 +750,7 @@ public class ProjectLibManage {
if (tmpPersons != null) { if (tmpPersons != null) {
purchaseFullInfo.setFirstInspectedPersons(convertPersons(tmpPersons)); purchaseFullInfo.setFirstInspectedPersons(convertPersons(tmpPersons));
} }
purchaseFullInfo.setSystemReplaceInfos(replaceInfosMap.get(k));
retProjectDetail.getPurchaseDetails().add(purchaseFullInfo); retProjectDetail.getPurchaseDetails().add(purchaseFullInfo);
}); });
// 建设方案 // 建设方案


+ 7
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/service/IProjectGovSystemReplaceInfosService.java View File

@@ -3,8 +3,8 @@ package com.hz.pm.api.projectlib.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;


import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -26,6 +26,12 @@ public interface IProjectGovSystemReplaceInfosService extends IService<ProjectGo
return list(wrapper); return list(wrapper);
} }


default List<ProjectGovSystemReplaceInfos> listByBidIds(Collection<Long> bidIds) {
Wrapper<ProjectGovSystemReplaceInfos> wrapper = Wrappers.lambdaQuery(ProjectGovSystemReplaceInfos.class)
.in(ProjectGovSystemReplaceInfos::getBidId, bidIds);
return list(wrapper);
}

default void removeByProjectIds(Collection<Long> projectIds) { default void removeByProjectIds(Collection<Long> projectIds) {
LambdaQueryWrapper<ProjectGovSystemReplaceInfos> query = Wrappers LambdaQueryWrapper<ProjectGovSystemReplaceInfos> query = Wrappers
.lambdaQuery(ProjectGovSystemReplaceInfos.class) .lambdaQuery(ProjectGovSystemReplaceInfos.class)


Loading…
Cancel
Save