diff --git a/db/第二阶段.sql b/db/第二阶段.sql index 59484914..ffe95a29 100644 --- a/db/第二阶段.sql +++ b/db/第二阶段.sql @@ -254,4 +254,7 @@ INSERT INTO sys_dict_item (id, dict_id, item_text, item_value, description, sort VALUES ('1836301637493006338', '1836301517254893569', '延期', '2', '', 2, 1, 'cheryrsm', '2024-09-18 15:10:01', 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 ('1836301659982864385', '1836301517254893569', '取消', '3', '', 3, 1, 'cheryrsm', '2024-09-18 15:10:07', 0, 0, 0); \ No newline at end of file +VALUES ('1836301659982864385', '1836301517254893569', '取消', '3', '', 3, 1, 'cheryrsm', '2024-09-18 15:10:07', 0, 0, 0); + +-- 企标状态增加 征求意见 -- +INSERT INTO `sys_dict_item` (`id`, `dict_id`, `parent_id`, `item_text`, `en_name`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `stat_node`, `en_base`) VALUES ('1696811980113661954', '1696811542077329409', NULL, '征求意见', 'Seek For Opinions', '2', '征求意见', 2, 1, 'admin', '2023-08-30 17:07:56', NULL, NULL, 1, 1, NULL, '0', NULL, NULL); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java index b7df1a85..32d99635 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/StandardStateEnum.java @@ -8,7 +8,7 @@ import lombok.Getter; */ @Getter public enum StandardStateEnum { - + SEEK_FOR_OPINIONS("征求意见","2"), CURRENTLY_EFFECTIVE("现行有效","8"), ABOLISH("废止","9"), ; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java index 790cd086..936d3696 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/listener/ProcessESRevisionEndListener.java @@ -71,7 +71,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener { String mainDraftUser = (String) variables.get(MAIN_DRAFT_USER); variables.put(FieldCommon.MAIN_DRAFTING_USER, mainDraftUser); // 标准状态 - variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.CURRENTLY_EFFECTIVE.getStateValue()); + variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.SEEK_FOR_OPINIONS.getStateValue()); String standardId = IdWorker.getIdStr(); variables.put(FieldCommon.ID, standardId); String onEditFile = data.getOnEditFile();