From fade5b945d7f94559f2811d358b7174de44f6d6c Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Jul 2024 14:46:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20UAT=20=E4=BC=81=E6=A0=87=E4=B8=BB?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E5=8F=AF=E9=80=89=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 9 +++++++++ .../jero/common/system/vo/SysDepartTreeModel.java | 12 ++++++++++-- .../com/jero/modules/system/entity/SysDepart.java | 5 +++++ .../system/util/FindsDepartsChildrenUtil.java | 1 + 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 1de086e3..261d37a7 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -169,3 +169,12 @@ ALTER TABLE `process_es_change` ADD COLUMN `standard_split_status` varchar(50) N -- 2024-07-10 增加更改单位代号字段 ALTER TABLE `process_es_change` ADD COLUMN `change_dept_code` varchar(50) NULL DEFAULT NULL COMMENT '更改单位代号' AFTER `standard_promoter`; + +-- 2024-07-10 部门表增加是否可选字段 +ALTER TABLE `sys_depart` + ADD COLUMN `es_select_flag` varchar(50) NULL DEFAULT 0 COMMENT '企标相关主起草单位是否可选判断（0不可选 1可选）' AFTER `deputy_leader`; +# 总公司 +update sys_depart set es_select_flag = 1 where parent_id = '1000000000'; +# 汽车研究总院 +update sys_depart set es_select_flag = 1 where parent_id = '1005000000'; + diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java index b3a36063..364454ec 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/system/vo/SysDepartTreeModel.java @@ -1,7 +1,5 @@ package com.jero.common.system.vo; -import org.jeecgframework.poi.excel.annotation.Excel; - import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -81,6 +79,16 @@ public class SysDepartTreeModel implements Serializable{ private String deputyLeader; + private String esSelectFlag; + + public String getEsSelectFlag() { + return esSelectFlag; + } + + public void setEsSelectFlag(String esSelectFlag) { + this.esSelectFlag = esSelectFlag; + } + private List children = new ArrayList<>(); diff --git a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java index 4a9ae3f7..82ea097b 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/entity/SysDepart.java @@ -111,6 +111,11 @@ public class SysDepart implements Serializable { @Excel(name="副职领导",width=15) private String deputyLeader; + /** + * 企标相关主起草单位是否可选判断（0不可选 1可选） + */ + private String esSelectFlag; + /** * 重写equals方法 */ diff --git a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java index 0a83200d..ead5ff45 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java @@ -160,5 +160,6 @@ public class FindsDepartsChildrenUtil { sysDepartTreeModel.setHeadOfDepartment(sysDepart.getHeadOfDepartment()); sysDepartTreeModel.setLeadersInCharge(sysDepart.getLeadersInCharge()); sysDepartTreeModel.setDeputyLeader(sysDepart.getDeputyLeader()); + sysDepartTreeModel.setEsSelectFlag(sysDepart.getEsSelectFlag()); } }