微信通知

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -96,7 +96,7 @@ public class SendMessageUtil {
                 }});
                 // 事项名称
                 data.put("thing2", new JSONObject() {{
-                    put("value", String.format("《%s》发起了《%s》,待审批!", param.getStartUserName(), param.getSchemaName()));
+                    put("value", name);
                 }});
                 // 申请人
                 data.put("thing6", new JSONObject() {{

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

@@ -302,6 +302,19 @@ public class TaskDelegate implements TaskListener {
         Long recordId = addProcessRecord(delegateTask, schemaId, "【" + approveName + "】" + "准备审批");
         //设置用户传阅人
         initCirculatedUser(delegateTask, variableMaps, workflowSchemaConfig, userTaskConfig, recordId);
+        //通知推送
+        NoticePolicyParam param = new NoticePolicyParam();
+        param.setNoticeUserIds(approveUserIds);
+        param.setTaskId(delegateTask.getId());
+        param.setTaskName(delegateTask.getName());
+        param.setProcessId(delegateTask.getProcessInstanceId());
+        param.setTaskName(delegateTask.getName());
+        param.setSchemaId(MapUtil.get(variableMaps, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));
+        param.setSchemaName(MapUtil.get(variableMaps, WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, String.class));
+        param.setStartUserName(MapUtil.get(variableMaps, WorkflowConstant.PROCESS_START_USER_NAME_KEY, String.class));
+
+        param.setNoticePolicyConfigs(userTaskConfig.getNoticePolicyConfigs());
+        WorkFlowUtil.sendApproveNoticePolicy(param, String.format("《%s》发起了《%s》,待审批!", param.getStartUserName(), param.getSchemaName()));
         //默认所有任务不需要指定审批人  如果需要指定审批人 会在 launch  和 approve 接口 处理。
 
     }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -4416,23 +4416,23 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 }
 
                 //记录一下需要发送消息(不需要指定审批人的)的任务id
-                if (variableInstanceOptional.isPresent()) {
-
-                    List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstanceOptional.get().getValue()).split(StringPool.COMMA));
-
-                    NoticePolicyParam param = new NoticePolicyParam();
-                    param.setNoticeUserIds(Convert.toList(Long.class, approveIds));
-                    param.setTaskId(task.getId());
-                    param.setTaskName(task.getName());
-                    param.setProcessId(task.getProcessInstanceId());
-                    param.setTaskName(task.getName());
-                    param.setSchemaId(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));
-                    param.setSchemaName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, String.class));
-                    param.setStartUserName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_START_USER_NAME_KEY, String.class));
-
-                    param.setNoticePolicyConfigs(userTaskConfig.getNoticePolicyConfigs());
-                    WorkFlowUtil.sendApproveNoticePolicy(param, task.getName());
-                }
+//                if (variableInstanceOptional.isPresent()) {
+//
+//                    List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstanceOptional.get().getValue()).split(StringPool.COMMA));
+//
+//                    NoticePolicyParam param = new NoticePolicyParam();
+//                    param.setNoticeUserIds(Convert.toList(Long.class, approveIds));
+//                    param.setTaskId(task.getId());
+//                    param.setTaskName(task.getName());
+//                    param.setProcessId(task.getProcessInstanceId());
+//                    param.setTaskName(task.getName());
+//                    param.setSchemaId(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));
+//                    param.setSchemaName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, String.class));
+//                    param.setStartUserName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_START_USER_NAME_KEY, String.class));
+//
+//                    param.setNoticePolicyConfigs(userTaskConfig.getNoticePolicyConfigs());
+//                    WorkFlowUtil.sendApproveNoticePolicy(param, task.getName());
+//                }
 
             }
 
@@ -4528,22 +4528,22 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
             }
             //如果审批人变量不为空  并且不需要指定审批人 就发送消息
-            if (variableInstance != null) {
-                List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstance.getValue()).split(StringPool.COMMA));
-
-                NoticePolicyParam param = new NoticePolicyParam();
-                param.setNoticeUserIds(Convert.toList(Long.class, approveIds));
-                param.setTaskId(task.getId());
-                param.setTaskName(task.getName());
-                param.setProcessId(task.getProcessInstanceId());
-                param.setTaskName(task.getName());
-                param.setSchemaId(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));
-                param.setSchemaName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, String.class));
-                param.setStartUserName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_START_USER_NAME_KEY, String.class));
-                param.setNoticePolicyConfigs(userTaskConfig.getNoticePolicyConfigs());
-                WorkFlowUtil.sendApproveNoticePolicy(param, task.getName());
-
-            }
+//            if (variableInstance != null) {
+//                List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstance.getValue()).split(StringPool.COMMA));
+//
+//                NoticePolicyParam param = new NoticePolicyParam();
+//                param.setNoticeUserIds(Convert.toList(Long.class, approveIds));
+//                param.setTaskId(task.getId());
+//                param.setTaskName(task.getName());
+//                param.setProcessId(task.getProcessInstanceId());
+//                param.setTaskName(task.getName());
+//                param.setSchemaId(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_ID_KEY, Long.class));
+//                param.setSchemaName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_SCHEMA_NAME_KEY, String.class));
+//                param.setStartUserName(MapUtil.get(variableMap, WorkflowConstant.PROCESS_START_USER_NAME_KEY, String.class));
+//                param.setNoticePolicyConfigs(userTaskConfig.getNoticePolicyConfigs());
+//                WorkFlowUtil.sendApproveNoticePolicy(param, task.getName());
+//
+//            }
 
 
             return voList;

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

@@ -59,8 +59,9 @@ CREATE TABLE base_student_scholarship_applicant
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `base_student_scholarship_category_id` bigint NULL DEFAULT NULL COMMENT '奖学金类别ID(base_student_scholarship_category)',
     `applicant_user_id` BIGINT NULL DEFAULT NULL COMMENT '申请人',
-    `semester_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '学期名称',
-    `grade_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '入学名称',
+    `base_semester_id` bigint NULL DEFAULT NULL COMMENT '学期ID(base_semester)',
+    `scholarship_level` int NOT NULL DEFAULT 0 COMMENT '奖学金等级 0=无等级',
+    `grade_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '年级名称',
     `class_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '班级名称',
     `name` VARCHAR(200) NULL DEFAULT NULL COMMENT '姓名',
     `student_id` VARCHAR(200) NULL DEFAULT NULL COMMENT '学号',
@@ -81,6 +82,77 @@ CREATE TABLE base_student_scholarship_applicant
 ALTER TABLE xjr_user ADD COLUMN `is_change_password` INT NOT NULL default 0 DEFAULT 1 COMMENT '是否需要修改密码（1:需要 0:不需要）' AFTER credential_type;
 -- ------------------------------------------------------------------用户--------------------------------------------------------------------
 
+-- ------------------------------------------------------------------助学金管理--------------------------------------------------------------------
+-- ----------------------------
+-- 助学金项目
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_bursaries_project;
+CREATE TABLE base_student_bursaries_project
+(
+    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 '序号',
+    `name` VARCHAR(200) NOT NULL COMMENT '名称',
+    `bursaries_type` varchar(20) NOT NULL DEFAULT 0 COMMENT '助学金类型(xjr_dictionary_item[bursaries_type])',
+    `base_semester_id` bigint NULL DEFAULT NULL COMMENT '学期ID(base_semester)',
+    `total_amount` double NOT NULL DEFAULT 0 COMMENT '总金额',
+    `start_time` date NULL DEFAULT NULL COMMENT '开始时间',
+    `end_time` date NULL DEFAULT NULL COMMENT '结束时间',
+    `remark` VARCHAR(1000) NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '助学金项目';
+
+-- ----------------------------
+-- 助学金申请
+-- ----------------------------
+DROP TABLE IF EXISTS base_student_bursaries_applicant;
+CREATE TABLE base_student_bursaries_applicant
+(
+    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 '序号',
+    `base_student_bursaries_project_id` bigint NULL DEFAULT NULL COMMENT '助学金项目ID(base_student_bursaries_project)',
+    `applicant_user_id` bigint NULL DEFAULT NULL COMMENT '申请人',
+    `base_semester_id` bigint NULL DEFAULT NULL COMMENT '学期ID(base_semester)',
+    `class_id` bigint NULL DEFAULT NULL COMMENT '班级编号',
+    `file_id` bigint NULL DEFAULT NULL COMMENT '文件ID(xjr_file)',
+    `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 base_student_bursaries_student;
+CREATE TABLE base_student_bursaries_student
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `base_student_bursaries_applicant_id` bigint NULL DEFAULT NULL COMMENT '助学金申请ID(base_student_bursaries_applicant)',
+    `user_id`  BIGINT NULL DEFAULT NULL COMMENT'学生id',
+    `grade_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '年级名称',
+    `class_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '班级名称',
+    `name` VARCHAR(200) NULL DEFAULT NULL COMMENT '姓名',
+    `student_id` VARCHAR(200) NULL DEFAULT NULL COMMENT '学号',
+    `gender_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '性别',
+    `enroll_type_cn` VARCHAR(200) NULL DEFAULT NULL COMMENT '招生类型名称',
+    `major_name` VARCHAR(200) NULL DEFAULT NULL COMMENT '在读专业',
+    `bank_type` VARCHAR(20) NULL DEFAULT NULL COMMENT '收款银行(xjr_dictionary_item[bank_type])',
+    `bank_no` VARCHAR(200) NULL DEFAULT NULL COMMENT '银行卡号',
+    `applicant_amount` double NOT NULL DEFAULT 0 COMMENT '申请金额',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '助学金申请学生信息';
+-- ------------------------------------------------------------------助学金管理--------------------------------------------------------------------
+