From b63d82a43e2b8e94a5c18570279ef3c5071136de Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 29 Dec 2021 10:30:45 +0800 Subject: [PATCH 1/3] feat: There is no way the, buss plan add bussSort --- .../slrs/esRevisePlan/entity/EsRevisePlan.java | 4 ++++ .../mapper/esRevisePlan/EsRevisePlanMapper.xml | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 1717e0fc..743fe88f 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 @@ -111,5 +111,9 @@ public class EsRevisePlan extends BasePage { @TableField("technologic") private String technologic; + @ApiModelProperty(value = "企标类别") + @TableField("buss_sort") + private String bussSort; + } 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 3758f7f8..ac1f59f7 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 @@ -73,7 +73,8 @@ - + + @@ -137,6 +138,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -204,6 +206,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -271,6 +274,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, @@ -342,6 +346,9 @@ technologic=#{technologic}, + + buss_sort=#{bussSort}, + where id = #{id} @@ -403,6 +410,9 @@ technologic, + + buss_sort, + values @@ -460,6 +470,9 @@ #{technologic}, + + #{bussSort}, + @@ -494,6 +507,7 @@ es_revise_plan.is_relate, es_revise_plan.use_level, es_revise_plan.technologic, + es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, From 9ed5f88d1c2e763e31dde4e772bd6628f7cb2fde Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:44:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E6=B6=88=E5=A4=B1=20bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/sarStandItems/dao/SarStandItemsDao.java | 2 ++ .../service/impl/SarStandItemsServiceImpl.java | 6 +++++- .../mapper/SarStandItems/SarStandItemsMapper.xml | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 155b7cc1..1e19f4bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -49,6 +49,8 @@ public interface SarStandItemsDao extends BaseMapper { int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType); + int deleteByStandIdAndFileTypes(@Param("standId") String standId, @Param("fileType") String fileType,@Param("items")List strings); + Set selectClaimTypesByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList); Set selectSvppsByStandId(@Param("standId") String standId, @Param("fileType") String fileType, @Param("idList") String[] idList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 5f0fadbb..c3672b64 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -169,7 +169,11 @@ public class SarStandItemsServiceImpl extends ServiceImpl sarStandItems) { if (null!=sarStandItems && sarStandItems.size()>0) { - sarStandItemsDao.deleteByStandIdAndFileType(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType()); + List strings=new ArrayList<>(); + sarStandItems.forEach(sarStandItems1 -> { + strings.add(sarStandItems1.getItemsNum()); + }); + sarStandItemsDao.deleteByStandIdAndFileTypes(sarStandItems.get(0).getStandId(), sarStandItems.get(0).getFileType(),strings); } boolean flag=this.saveBatch(sarStandItems); if (flag){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index e5dd9af8..34d1a0e1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -655,6 +655,20 @@ + + delete from SAR_STAND_ITEMS + where stand_id = #{standId} + + and file_type = #{fileType} + + + and items_num in + + #{itemNum} + + + + delete from SAR_STAND_ITEMS where id in From 36ff1dd51034e2714f52b5ad9a68573fb8964480 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:46:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 1 + 1 file changed, 1 insertion(+) 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..74725ac4 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 @@ -51,6 +51,7 @@ +