env

docker-compose.yml

@@ -8,8 +8,8 @@ services:
     image: registry.yingcaibx.com/tl/api:latest
     restart: always
     container_name: tl_api
-#    environment:
-#      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    environment:
+      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://mysql:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
 #      - MQTT-SERVER=tcp://172.28.175.70:1883
     ports:
       - 8001:8080

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

@@ -187,17 +187,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.ssssssss.magicapi.core.service.MagicAPIService;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -1303,20 +1293,38 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         try {
 
             //表单提交完毕后 发起流程
+            System.out.println("开始发起流程");
+            long startTime = System.currentTimeMillis();
             ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), variableMap);
+            long endTime = System.currentTimeMillis();
+            System.out.printf("发起流程:%d \n",(endTime - startTime));
+            startTime = System.currentTimeMillis();
 
             List<Task> list = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
 
+            endTime = System.currentTimeMillis();
+            System.out.printf("发起流程2:%d \n",(endTime - startTime));
+            startTime = System.currentTimeMillis();
 //            List<LaunchAndApproveVo> result = isPrevChooseApprove(workflowSchemaConfig, list, variableMap);
 
             //如果不需要指定审批人 默认走自动同意规则
+
+
             invokeAutoAgree(processInstance.getId(), workflowSchema.getId(), workflowSchemaConfig, list);
 
+            endTime = System.currentTimeMillis();
+            System.out.printf("发起流程3:%d \n",(endTime - startTime));
+            startTime = System.currentTimeMillis();
+
             //重新获取任务节点，判断是否需要指定下一审批人
             list = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
 
             List<LaunchAndApproveVo> result = isPrevChooseApprove(workflowSchemaConfig, list, variableMap);
 
+            endTime = System.currentTimeMillis();
+            System.out.printf("发起流程4:%d \n",(endTime - startTime));
+            startTime = System.currentTimeMillis();
+
             updateFileInfo(dto.getFileFolderIds(), processInstance.getId());
 
             //保存 流程 表单 关联 数据
@@ -1330,6 +1338,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 session.getConnection().setAutoCommit(Boolean.FALSE);
                 session.commit();
             }
+
+            endTime = System.currentTimeMillis();
+            System.out.printf("发起流程5:%d \n",(endTime - startTime));
+
             return result;
         } catch (Exception e) {
             for (Session session : sessionList) {

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

@@ -502,6 +502,8 @@ CREATE TABLE textbook_warehouse_record
     `enabled_mark` INT NOT NULL COMMENT '有效标志',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `textbook_id` bigint NULL DEFAULT NULL COMMENT '教材管理编号',
+    `data_id` bigint DEFAULT NULL COMMENT '数据编号（根据入库方式，编号来自不同数据表）',
+    `data_item_id` bigint DEFAULT NULL COMMENT '数据项项编号（根据入库方式，编号来自不同数据表）',
     `warehouse_number` int NULL DEFAULT NULL COMMENT '入库数量',
     `source` varchar(200) NULL DEFAULT NULL COMMENT '来源',
     `price` decimal(10,2) NULL DEFAULT NULL COMMENT '定价(元)',
@@ -519,20 +521,23 @@ CREATE TABLE textbook_warehouse_record
 DROP TABLE IF EXISTS textbook_issue_record;
 CREATE TABLE textbook_issue_record
 (
-    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 '序号',
-    `wf_textbook_claim_id` bigint NULL DEFAULT NULL COMMENT '教材申领编号',
-    `wf_textbook_claim_item_id` bigint NULL DEFAULT NULL COMMENT '教材申领项编号',
-    `issue_number` int NULL DEFAULT NULL COMMENT '出库数量',
-    `remaining_number` int NULL DEFAULT NULL COMMENT '剩余数量',
-    `receive_user_id` bigint NULL DEFAULT NULL COMMENT '领取用户编号',
-    `issue_user_id` bigint NULL DEFAULT NULL COMMENT '出库用户编号',
+    `id` bigint NOT NULL COMMENT '主键编号',
+    `create_user_id` bigint DEFAULT NULL COMMENT '创建人',
+    `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` bigint DEFAULT NULL COMMENT '修改人',
+    `modify_date` datetime DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` int NOT NULL COMMENT '删除标记',
+    `enabled_mark` int NOT NULL COMMENT '有效标志',
+    `sort_code` int DEFAULT NULL COMMENT '序号',
+    `textbook_id` bigint NULL DEFAULT NULL COMMENT '教材管理编号',
+    `data_id` bigint DEFAULT NULL COMMENT '数据编号（根据出库方式，编号来自不同数据表）',
+    `data_item_id` bigint DEFAULT NULL COMMENT '数据项项编号（根据出库方式，编号来自不同数据表）',
+    `issue_number` int DEFAULT NULL COMMENT '出库数量',
+    `remaining_number` int DEFAULT NULL COMMENT '剩余数量',
+    `receive_user_id` bigint DEFAULT NULL COMMENT '领取用户编号',
+    `issue_user_id` bigint DEFAULT NULL COMMENT '出库用户编号',
+    `issue_mode` varchar(20) DEFAULT NULL COMMENT '出库方式(xjr_dictionary_item[issue_mode])',
+    `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教材出库记录';
 
@@ -580,7 +585,7 @@ CREATE TABLE wf_textbook_recede
     `recede_address` varchar(1000) NULL DEFAULT NULL COMMENT '退还地点',
     `status` int not null default 0 COMMENT '状态（1:结束 0:未结束）',
     PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '推书申请';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '退书申请';
 
 -- ----------------------------
 -- 退书申请项
@@ -600,7 +605,7 @@ CREATE TABLE wf_textbook_recede_item
     `textbook_id` bigint NULL DEFAULT NULL COMMENT '教材管理编号',
     `number` int NULL DEFAULT NULL COMMENT '数量',
     PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '推书申请项';
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '退书申请项';
 -- ------------------------------------------------------------------教材管理--------------------------------------------------------------------
 
 -- ------------------------------------------------------------------寝室管理--------------------------------------------------------------------
@@ -869,7 +874,7 @@ CREATE TABLE room_bed_check_record
     `user_id` bigint NULL DEFAULT NULL COMMENT '填写人',
     `class_id` bigint NULL DEFAULT NULL COMMENT '班级编号',
     `check_record_time` DATETIME NULL DEFAULT NULL COMMENT '查寝时间',
-    `condition` varchar(1000) NULL DEFAULT NULL COMMENT '情况',
+    `record` varchar(1000) NULL DEFAULT NULL COMMENT '情况记录',
     `remark` varchar(1000) NULL DEFAULT NULL COMMENT '备注',
     `file_id` BIGINT NULL DEFAULT NULL COMMENT '附件文件id',
     PRIMARY KEY (`id`)
@@ -965,6 +970,51 @@ CREATE TABLE weekly_duty_schedule
 
 ALTER TABLE base_office_build ADD COLUMN `build_number` INT NULL DEFAULT NULL COMMENT '楼栋号' AFTER build_type;
 
+-- ----------------------------
+-- 公文收文
+-- ----------------------------
+DROP TABLE IF EXISTS official_document_received;
+CREATE TABLE official_document_received
+(
+    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 '序号',
+    `received_title` varchar(200) NULL DEFAULT NULL COMMENT '收文标题',
+    `received_number` varchar(200) NULL DEFAULT NULL COMMENT '收文文号',
+    `received_date` date NULL DEFAULT NULL COMMENT '收文时间',
+    `communication_org` varchar(200) NULL DEFAULT NULL COMMENT '来文机构',
+    `communication_number` varchar(200) NULL DEFAULT NULL COMMENT '来文文号',
+    `checkout_time` date NULL DEFAULT NULL COMMENT '办结时间',
+    `document_level`varchar(20) NULL DEFAULT NULL COMMENT '文件密级(xjr_dictionary_item[document_level])',
+    `emergency_level`varchar(20) NULL DEFAULT NULL COMMENT '紧急程度(xjr_dictionary_item[emergency_level])',
+    `received_type`varchar(20) NULL DEFAULT NULL COMMENT '收文类型(xjr_dictionary_item[received_type])',
+    `file_id` BIGINT NULL DEFAULT NULL COMMENT '附件文件id',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '公文收文';
+
+DROP TABLE IF EXISTS `wf_teacherleave`;
+CREATE TABLE `wf_teacherleave` (
+    `id` bigint NOT NULL,
+    `user_id` longtext COMMENT '申请人',
+    `department` varchar(500) DEFAULT NULL COMMENT '所在部门',
+    `leave_start_time` datetime DEFAULT NULL COMMENT '请假开始时间',
+    `leave_end_time` datetime DEFAULT NULL COMMENT '请假结束时间',
+    `leave_days` double DEFAULT NULL COMMENT '请假天数',
+    `leave_type` varchar(500) DEFAULT NULL COMMENT '请假类型',
+    `is_it_a_homeroom_teacher` varchar(500) DEFAULT NULL COMMENT '是否班主任',
+    `middle_level_or_not` varchar(500) DEFAULT NULL COMMENT '是否中层',
+    `relief_homeroo_teacher` varchar(500) DEFAULT NULL COMMENT '替班班主任',
+    `relief_teacher` varchar(500) DEFAULT NULL COMMENT '替班教师',
+    `reason_for_leave` longtext COMMENT '请假事由',
+    `annex` longtext COMMENT '附件',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='教职工请假流程';
+