From 585b7d6b7517035c3f71bd11944d970b4db2c7d2 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Mon, 10 Oct 2022 16:37:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E6=95=B0=E6=8D=AE=E6=8C=82=E9=9D=A0=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 44 +++++++++++++++++++ .../service/impl/SarModelTreeServiceImpl.java | 4 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 88ee51e1..e59a3a23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -620,6 +620,50 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + if(sarStandAttrMap.containsKey("TXLBBUSS") && StringUtils.isNotBlank(sarStandAttrMap.get("TXLBBUSS"))){ + QueryWrapper menuQueryWrapper = new QueryWrapper<>(); + menuQueryWrapper.eq("BUSS_STAND_ID",sarBussionessStandEO.getId()); +// menuQueryWrapper.eq("MENU_ID",sarStandAttrMap.get("TXLBBUSS")); + menuQueryWrapper.eq("VALID_FLAG",0); + menuQueryWrapper.eq("TREE_TYPE","sarMs"); + List sarBussStandMenus = sarBussStandMenuEODao.selectList(menuQueryWrapper); + if(sarBussStandMenus !=null && !sarBussStandMenus.isEmpty()){ + boolean upFlag = true; + List delIds = new ArrayList<>(); + for(SarBussStandMenu m: sarBussStandMenus){ + if(StringUtils.equals(m.getMenuId(),sarStandAttrMap.get("TXLBBUSS"))){ + upFlag= false; + }else{ + delIds.add(m.getId()); + } + } + if(upFlag){ + SarBussStandMenu jsMenu = new SarBussStandMenu(); + jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS")); + jsMenu.setValidFlag(0); + jsMenu.setTreeType("sarMs"); + jsMenu.setBussStandId(sarBussionessStandEO.getId()); + jsMenu.setId(UUIDUtils.randomUUID(32)); + sarBussStandMenuEODao.insert(jsMenu); + } + if(!delIds.isEmpty()){ + sarBussStandMenuEODao.deleteBatchIds(delIds); + } + }else{ + SarBussStandMenu jsMenu = new SarBussStandMenu(); + jsMenu.setMenuId(sarStandAttrMap.get("TXLBBUSS")); + jsMenu.setValidFlag(0); + jsMenu.setTreeType("sarMs"); + jsMenu.setBussStandId(sarBussionessStandEO.getId()); + jsMenu.setId(UUIDUtils.randomUUID(32)); + sarBussStandMenuEODao.insert(jsMenu); + } + } + } //修改收藏分享编号名称 updateCollectAndShare(sarBussionessStandEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index accf3622..3abf14e8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -113,7 +113,9 @@ public class SarModelTreeServiceImpl extends ServiceImpl Date: Mon, 10 Oct 2022 17:15:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=8F=90=E4=BA=A4=E6=9C=AA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=88=B0=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=BE=97?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/20221010-补充表结构.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/sql/20221010-补充表结构.sql diff --git a/doc/sql/20221010-补充表结构.sql b/doc/sql/20221010-补充表结构.sql new file mode 100644 index 00000000..aceecb54 --- /dev/null +++ b/doc/sql/20221010-补充表结构.sql @@ -0,0 +1,15 @@ +CREATE TABLE `sar_buss_stand_sn` ( + `ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `REVISE_STATUS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '计划库制定状态 0 默认 buss1_1 技术标准 制定 buss2_1 产品标准 制定 ', + `STAND_SN` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企标顺序号', + `STAND_SORT` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企标类别', + `USE_STATUS` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'yes' COMMENT '企标编号使用状态 yes 已使用 no 未使用', + `VALID_FLAG` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否有效', + `MODIFY_TIME` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + `CREATION_TIME` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `TASK_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`ID`) USING BTREE, + INDEX `ID_index`(`ID`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '企业标准信息表-顺序号表' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file