From e14f4530f5bc2111727a6a4bd5169d7111837c7d Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 18:03:14 +0800 Subject: [PATCH 1/2] feat: There is no way the, #56326 #56321 --- .../mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 65f300b3..008bd080 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 @@ -217,7 +217,7 @@ sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, sar_bussioness_stand.stand_number as standNum, - (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, + (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,use_level) ) as useLevelName, From 2ff17e8b2797955d3dbdc3cc5e9574fef21e90b7 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 6 Jul 2022 15:59:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=BA=9F=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/UpdateStateStandSyncFz.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 74d8cf18..4ab1d670 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -123,19 +123,24 @@ public class UpdateStateStandSyncFz implements Runnable { int queryGbCount = queryGBList.size(); //被代替标准号中所有有效标准的状态都是现行有效状态 - List yxList = queryGBList.stream().filter(info1 -> - "vsaga7nwub".equals(info1.getTextStatus())).collect(Collectors.toList()); - - //被代替标准号中所有有效标准的状态都是被代替状态 - List bdtStateList = queryGBList.stream().filter(info1 -> - "qke0ckro2p".equals(info1.getTextStatus())).collect(Collectors.toList()); - - //被代替标准号中所有有效标准的状态都是废止状态 List fzList = queryGBList.stream().filter(info1 -> - "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + "vsaga7nwub".equals(info1.getTextStatus()) || "qke0ckro2p".equals(info1.getTextStatus()) + || "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + + List fzList2 = queryGBList.stream().filter(info1 -> + !"vsaga7nwub".equals(info1.getTextStatus()) && !"qke0ckro2p".equals(info1.getTextStatus()) + && !"chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); + +// //被代替标准号中所有有效标准的状态都是被代替状态 +// List bdtStateList = queryGBList.stream().filter(info1 -> +// "qke0ckro2p".equals(info1.getTextStatus())).collect(Collectors.toList()); +// +// //被代替标准号中所有有效标准的状态都是废止状态 +// List fzList = queryGBList.stream().filter(info1 -> +// "chblaarg77".equals(info1.getTextStatus())).collect(Collectors.toList()); // 满足其上存入更新废止逻辑 如果只有一个被代替标准 优先更新废止状态 - if(yxList.size() == queryGbCount || bdtStateList.size() == queryGbCount || fzList.size() == queryGbCount){ + if(!fzList.isEmpty() && fzList2.isEmpty()){ invalidStandToGBList.add(info); }else { // 被代替标准号中的有效标准的标准状态中有一个是发布、即将实施、现行有效、被代替状态的