notify

Makefile

@@ -5,7 +5,7 @@ create-tag:
 	git checkout master;git tag v1.1.8;git push origin --tags;git checkout dev;
 
 remove-tag:
-	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;
+	git tag -d v1.1.8;git push origin :refs/tags/v1.1.8;
 
 gen-rsaprivatekey:
 	openssl genrsa -out rsaprivatekey.pem 1024

src/main/java/com/xjrsoft/module/workflow/listener/ExecutionDelegate.java

@@ -88,7 +88,7 @@ public class ExecutionDelegate implements ExecutionListener {
         String endEventKey = WorkflowConstant.END_EVENT_CACHE_PRE +  ((ExecutionEntity) execution).getProcessDefinition().getDeploymentId() + StringPool.COLON + eventSource.getId() + StringPool.COLON + WorkflowEventType.END.getValue();
 
         //如果有当前节点有缓存开始事件数据
-        if (redisUtil.containsKey(startEventKey)) {
+        if (redisUtil.containsKey(startEventKey) && execution.getEventName().equals(EVENTNAME_START)) {
 
             List<NodeEventConfig> startEventConfigs = redisUtil.get(startEventKey, new TypeReference<List<NodeEventConfig>>() {
             });
@@ -107,7 +107,7 @@ public class ExecutionDelegate implements ExecutionListener {
 //            }
         }
         //如果有当前节点有缓存开始事件数据
-        if (redisUtil.containsKey(endEventKey)) {
+        if (redisUtil.containsKey(endEventKey) && execution.getEventName().equals(EVENTNAME_END)) {
 
             List<NodeEventConfig> endEventConfigs = redisUtil.get(endEventKey, new TypeReference<List<NodeEventConfig>>() {
             });

src/main/resources/sqlScript/20231129_sql.sql

@@ -55,6 +55,7 @@ CREATE TABLE school_roll_student
     `enabled_mark` INT NOT NULL COMMENT '有效标志',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `scholarship_source` varchar(20) NOT NULL DEFAULT 0 COMMENT '学籍异动类型(xjr_dictionary_item[school_change_type])',
     `school_roll_category_id` bigint NULL DEFAULT NULL COMMENT '学籍异动类别ID(school_roll_category)',
     `school_roll_reason_id` bigint NULL DEFAULT NULL COMMENT '学籍异动原因ID(school_roll_reason)',
     `reason` varchar(2000) NULL DEFAULT NULL COMMENT '原因',
@@ -156,6 +157,38 @@ CREATE TABLE school_roll_transfer_student
     `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '插班生管理';
+
+-- ----------------------------
+-- 升学管理
+-- ----------------------------
+DROP TABLE IF EXISTS school_roll_further_education;
+CREATE TABLE school_roll_further_education
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `reason` varchar(2000) NULL DEFAULT NULL COMMENT '原因',
+
+    `before_department_id` bigint NULL DEFAULT NULL COMMENT '异动前所属机构(xjr_department)',
+    `before_grade_id` bigint NULL DEFAULT NULL COMMENT '异动前入学年级(base_grade)',
+    `before_class_id` bigint NULL DEFAULT NULL COMMENT '异动前班级(base_class)',
+    `before_major_set_id` bigint NULL DEFAULT NULL COMMENT '异动前专业方向(base_major_set)',
+
+    `back_department_id` bigint NULL DEFAULT NULL COMMENT '异动后所属机构(xjr_department)',
+    `back_grade_id` bigint NULL DEFAULT NULL COMMENT '异动后入学年级(base_grade)',
+    `back_class_id` bigint NULL DEFAULT NULL COMMENT '异动后班级(base_class)',
+    `back_major_set_id` bigint NULL DEFAULT NULL COMMENT '异动后专业方向(base_major_set)',
+
+    `remark` varchar(1000) COMMENT '备注',
+    `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '升学管理';
 -- ------------------------------------------------------------------学籍异动管理--------------------------------------------------------------------
 
 
@@ -165,3 +198,6 @@ CREATE TABLE school_roll_transfer_student
 
 
 
+
+
+