From 5bef80ce763060d026b5eb906a5c8ae8a5addfc6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 18 Mar 2024 14:04:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9B=B4=E6=94=B9=E7=BA=A7=E5=88=AB=E4=BB=A3?= =?UTF-8?q?=E5=8F=B7=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 14 +++++++++++++- .../process/esChange/entity/ProcessEsChange.java | 1 + .../listener/ProcessESChangeEndListener.java | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 23d5a4c1..2749dd6c 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -25,4 +25,16 @@ VALUES ('1769564500350857218', 'laws_domestic_standard', 'interpret_document', ' ALTER TABLE `laws_domestic_standard` ADD COLUMN `other_files` varchar(1) NULL DEFAULT NULL COMMENT '其他文件' AFTER `is_asms_import`, ADD COLUMN `interpret_document` varchar(1) NULL DEFAULT NULL COMMENT '解读文件' AFTER `other_files`, - ADD COLUMN `test_procedures` varchar(1) NULL DEFAULT NULL COMMENT '测试规程' AFTER `interpret_document`; \ No newline at end of file + ADD COLUMN `test_procedures` varchar(1) NULL DEFAULT NULL COMMENT '测试规程' AFTER `interpret_document`; + +# 更改级别代号 数据字典 +INSERT INTO sys_dict (id, dict_name, dict_code, description, del_flag, create_by, create_time, is_tag_dict, + is_read_only) +VALUES ('1769604615294271489', '更改级别代号', 'change_level_code', '', 0, 'admin', '2024-03-18 13:59:52', 0, 0); + +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, `status`, create_by, create_time, is_tag_dict, is_read_only, del_flag) VALUES ('1769604926780063746', '1769604615294271489', 'A', '1', '', 1, 1, 'admin', '2024-03-18 14:01:06', 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, `status`, create_by, create_time, is_tag_dict, is_read_only, del_flag) VALUES ('1769605012008321025', '1769604615294271489', 'B', '2', '', 2, 1, 'admin', '2024-03-18 14:01:27', 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, `status`, create_by, create_time, is_tag_dict, is_read_only, del_flag) VALUES ('1769605036586942466', '1769604615294271489', 'C', '3', '', 3, 1, 'admin', '2024-03-18 14:01:33', 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, `status`, create_by, create_time, is_tag_dict, is_read_only, del_flag) VALUES ('1769605071110258690', '1769604615294271489', 'D', '4', '', 4, 1, 'admin', '2024-03-18 14:01:41', 0, 0, 0); +INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, `status`, create_by, create_time, is_tag_dict, is_read_only, del_flag) VALUES ('1769605104899571714', '1769604615294271489', 'E', '5', '', 5, 1, 'admin', '2024-03-18 14:01:49', 0, 0, 0); + diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java index 312f81a1..99b860e5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java @@ -212,6 +212,7 @@ public class ProcessEsChange implements Serializable { * 授权部门 */ @ApiModelProperty(value = "更改级别代号") + @Dict(dicCode = "change_level_code") private String levelCode; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 9b3c90ee..4ded80a1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -374,6 +374,9 @@ public class ProcessESChangeEndListener implements ExecutionListener { private void setContent(List rows, int rowNum, int cellNum, String content, boolean newLine, boolean alignCenter, boolean verCenter) { + if (StrUtil.isBlank(content)) { + return; + } XWPFTableRow row = rows.get(rowNum); List cells = row.getTableCells(); if (!cells.isEmpty()) {