From f068dacc7f49e60f16df5d26874bb0cc86d096d4 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 29 Dec 2021 17:36:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:pcms=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E6=94=B6=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E3=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandProjectLibrary.java | 9 +++++++++ .../service/impl/SarStandProjectLibraryServiceImpl.java | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index e48e20e0..80663883 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -80,6 +80,15 @@ public class SarStandProjectLibrary extends BaseEntity { @TableField("detailed_list_version") private String detailedListVersion; + @ApiModelProperty(value = "管理主体名称") + private String managementHostName; + + @ApiModelProperty(value = "开发主体名称") + private String developmentHostName; + + @ApiModelProperty(value = "项目细分类名称") + private String categoryName; + //标准编号 @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index bed9d1ee..535219fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -86,7 +86,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl Date: Wed, 29 Dec 2021 17:54:07 +0800 Subject: [PATCH 2/3] feat: There is no way the, buss plan planStatusList --- .../com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java | 3 +++ .../service/impl/EsRevisePlanServiceImpl.java | 8 ++++++++ .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 7 +++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 743fe88f..9fb2b8e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -115,5 +115,8 @@ public class EsRevisePlan extends BasePage { @TableField("buss_sort") private String bussSort; + @TableField(exist = false) + private List planStatusList; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 2ed4273a..20c70db4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -10,10 +10,14 @@ import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -47,6 +51,10 @@ public class EsRevisePlanServiceImpl extends ServiceImpl queryAllPlans(EsRevisePlan esRevisePlan) { Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan); esRevisePlan.getPager().setRowCount(count); + if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){ + List list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList()); + esRevisePlan.setPlanStatusList(list); + } List esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); return esRevisePlans; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index ac1f59f7..49d60d62 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -225,8 +225,11 @@ and area = #{area} - - and plan_status = #{planStatus} + + and plan_status in + + #{item} + and revise_status = #{reviseStatus} From d7cd2d9fae130e6dedbe0bcee12954eed43aa6be Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 29 Dec 2021 21:39:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:pcms=E8=BD=A6=E5=9E=8B=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=8E=A5=E6=94=B6=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E3=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 38 +++++++++++++++++++ .../entity/QuerySelectRspDTO.java | 17 +++++++++ .../SarStandProjectLibraryServiceImpl.java | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 387b07a1..02888d99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; +import com.adc.da.util.utils.StringUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -305,4 +306,41 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.list(qw); + List managementHostList = new ArrayList<>(); + List developmentHostList = new ArrayList<>(); + List categoryList = new ArrayList<>(); + for(SarStandProjectLibrary sarStandProjectLibrary1 : list){ + if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){ + managementHostList.add(sarStandProjectLibrary1.getManagementHostName()); + } + if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){ + developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName()); + } + if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){ + categoryList.add(sarStandProjectLibrary1.getCategoryName()); + } + } + QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder() + .managementHostList(managementHostList) + .developmentHostList(developmentHostList) + .categoryList(categoryList) + .build(); + return Result.success(querySelectRspDTO); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java new file mode 100644 index 00000000..4c9a1e1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Builder; +import lombok.Data; + +import java.util.List; + +@Data +@Builder +public class QuerySelectRspDTO { + + private List managementHostList; + + private List developmentHostList; + + private List categoryList; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 535219fa..293ed9fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -82,7 +82,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl