jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ys.git 2025-12-05 15:47:15 +08:00
commit ce42064543
4 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xdap/self_development/pojo/view/TodoAndTemplateView.java
View File

@ -13,7 +13,7 @@ import java.util.List;
@SQL(view = "getApprovalByUserIdAndIds", @SQL(view = "getApprovalByUserIdAndIds",
sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id WHERE t.template_name like CONCAT('%',#templateName, '%') and t.status like CONCAT('%',#status, '%') and af.flow_type = 1 and af.id NOT IN (#ids) AND af.create_by = #createBy"), sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id WHERE t.template_name like CONCAT('%',#templateName, '%') and t.status like CONCAT('%',#status, '%') and af.flow_type = 1 and af.id NOT IN (#ids) AND af.create_by = #createBy"),
@SQL(view = "getTodoAndTemplate", @SQL(view = "getTodoAndTemplate",
sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\" , xu.username AS \"username\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id LEFT JOIN xdap_users xu ON xu.id = af.create_by WHERE t.template_name LIKE CONCAT('%', #templateName, '%') AND t.status LIKE CONCAT('%', #status, '%') AND DATE(af.created_time) = #createdTime AND xu.username LIKE CONCAT('%', #username, '%') AND af.flow_type = 1 AND (af.id IN (#ids) OR af.create_by = #createBy)") sql = "SELECT af.id AS \"flowId\", t.id AS \"templateId\", t.template_name AS \"templateName\", t.version AS \"version\", t.status AS \"status\" , af.create_by AS \"createBy\" , xu.username AS \"username\", af.created_time AS \"createdTime\" , CASE WHEN current_node = 'PROOFREAD' THEN proofread_users WHEN current_node = 'REVIEW' THEN review_users WHEN current_node = 'COUNTERSIGN' THEN countersign_users WHEN current_node = 'APPROVE' THEN approve_users END AS current_users FROM yfsjglpt_model_approval_flow af JOIN yfsjglpt_model_template t ON af.template_id = t.id LEFT JOIN xdap_users xu ON xu.id = af.create_by WHERE t.template_name LIKE CONCAT('%', #templateName, '%') AND t.status LIKE CONCAT('%', #status, '%') AND t.created_time LIKE CONCAT('%', #createdTime, '%') AND xu.username LIKE CONCAT('%', #username, '%') AND af.flow_type = 1 AND (af.id IN (#ids) OR af.create_by = #createBy) ORDER BY CASE af.status WHEN 'COMPLETE' THEN 1 WHEN 'APPROVING' THEN 2 WHEN 'DRAFT' THEN 3 WHEN 'RETURNED' THEN 4 WHEN 'REJECTED' THEN 5 ELSE 6 END ASC")
}) })
@Data @Data
public class TodoAndTemplateView { public class TodoAndTemplateView {

4
src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java
View File

@ -192,6 +192,7 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
.eq("id", request.getFlowId()) .eq("id", request.getFlowId())
.eq("flow_type", 2) .eq("flow_type", 2)
.doQueryFirst(ApprovalFlow.class); .doQueryFirst(ApprovalFlow.class);
if (flow == null || !"APPROVING".equals(flow.getFlowStatus())) { if (flow == null || !"APPROVING".equals(flow.getFlowStatus())) {
throw new CommonException("流程不存在或已结束"); throw new CommonException("流程不存在或已结束");
} }
@ -303,9 +304,6 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService
if ("REJECT".equals(request.getResult())) { if ("REJECT".equals(request.getResult())) {
cancelProcess(flow, "REJECTED"); cancelProcess(flow, "REJECTED");
return; return;
} else if ("RETURN".equals(request.getResult())) {
cancelProcess(flow, "RETURNED");
return;
} }
// 处理通过逻辑，流转到下一节点 // 处理通过逻辑，流转到下一节点
processNextNode(flow, currentNode); processNextNode(flow, currentNode);

2
src/main/java/com/xdap/self_development/service/impl/TemplateApprovalServiceImpl.java
View File

@ -122,7 +122,7 @@ public class TemplateApprovalServiceImpl implements TemplateApprovalService {
.setVar("createBy", form.getUserId()) .setVar("createBy", form.getUserId())
.setVar("templateName", form.getTemplateName()) .setVar("templateName", form.getTemplateName())
.setVar("status", form.getStatus()) .setVar("status", form.getStatus())
.setVar("createdTime", form.getCreateDate()) .setVar("createdTime", form.getCreateDate() == null ? "" : form.getCreateDate())
.setVar("username",form.getUsername()) .setVar("username",form.getUsername())
.doQuery(TodoAndTemplateView.class); .doQuery(TodoAndTemplateView.class);
setCurrentApprovers(approvalList, todoList); setCurrentApprovers(approvalList, todoList);

126
src/main/resources/sql.sql
View File

@ -1,78 +1,90 @@
-- 新增机型参数常用参数表
CREATE TABLE yfsjglpt_model_common_parameter (
`id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
`subsystem` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '子系统',
`parameter_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数ID',
`user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='机型参数常用参数表';
-- 新增分析常用参数表 -- 新增分析常用参数表
CREATE TABLE `analysis_common_parameters` ( CREATE TABLE yfsjglpt_analysis_common_parameter (
`id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID',
`parameter_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '参数ID', `model_name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '产品型号',
`user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID', `plate` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '板块',
PRIMARY KEY (`id`) `platform` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台',
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='查询分析常用参数表'; `series` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '系列',
`project_name` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT '项目名称',
`project_number` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '项目编号',
`emission` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '排放',
`displacement_min` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '排放下限',
`displacement_max` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '排放上限',
`combustion_type` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '燃烧类型',
`user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='统计分析常用参数表';
-- 角色表
--删除1版权限
drop table yfsjglpt_model_role_permissions
drop table yfsjglpt_model_roles
drop table yfsjglpt_model_user_roles
drop table yfsjglpt_model_permissions
--角色表
DROP TABLE IF EXISTS yfsjglpt_model_roles; DROP TABLE IF EXISTS yfsjglpt_model_roles;
CREATE TABLE yfsjglpt_model_roles( CREATE TABLE yfsjglpt_model_roles(
`id` VARCHAR(64) NOT NULL COMMENT 'ID', `id` VARCHAR(64) NOT NULL COMMENT 'ID',
`role_name` VARCHAR(128) NOT NULL COMMENT '角色名称', `role_name` VARCHAR(128) NOT NULL COMMENT '角色名称',
`role_code` VARCHAR(128) COMMENT '角色代号', `role_code` VARCHAR(128) COMMENT '角色代号',
`role_description` VARCHAR(128) COMMENT '角色描述', `role_description` VARCHAR(128) COMMENT '角色描述',
`is_enabled` INT(128) DEFAULT 1 COMMENT '是否启用', `is_enabled` INT(128) DEFAULT 1 COMMENT '是否启用',
`created_by` VARCHAR(64) COMMENT '创建人', `created_by` VARCHAR(64) COMMENT '创建人',
`creation_date` DATETIME COMMENT '创建时间', `creation_date` DATETIME COMMENT '创建时间',
`last_updated_by` VARCHAR(64) COMMENT '最后更新人', `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
`last_update_date` DATETIME COMMENT '最后更新时间', `last_update_date` DATETIME COMMENT '最后更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) COMMENT '角色表'; ) COMMENT '角色表';
---菜单权限 -- 菜单权限
DROP TABLE IF EXISTS yfsjglpt_model_menu_permission; DROP TABLE IF EXISTS yfsjglpt_model_menu_permission;
CREATE TABLE yfsjglpt_model_menu_permission( CREATE TABLE yfsjglpt_model_menu_permission(
`id` VARCHAR(64) NOT NULL COMMENT 'ID', `id` VARCHAR(64) NOT NULL COMMENT 'ID',
`parent_id` VARCHAR(64) COMMENT '上级ID', `parent_id` VARCHAR(64) COMMENT '上级ID',
`menu_name` VARCHAR(64) COMMENT '菜单名称', `menu_name` VARCHAR(64) COMMENT '菜单名称',
`menu_code` VARCHAR(64) COMMENT '菜单代码', `menu_code` VARCHAR(64) COMMENT '菜单代码',
`menu_desc` VARCHAR(128) COMMENT '菜单描述', `menu_desc` VARCHAR(128) COMMENT '菜单描述',
`is_enable` INT DEFAULT 1 COMMENT '是否可用', `is_enable` INT DEFAULT 1 COMMENT '是否可用',
`created_by` VARCHAR(64) COMMENT '创建人', `created_by` VARCHAR(64) COMMENT '创建人',
`creation_date` DATETIME COMMENT '创建时间', `creation_date` DATETIME COMMENT '创建时间',
`last_updated_by` VARCHAR(64) COMMENT '最后更新人', `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
`last_update_date` DATETIME COMMENT '最后更新时间', `last_update_date` DATETIME COMMENT '最后更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) COMMENT '菜单权限'; ) COMMENT '菜单权限';
--菜单参数关联表 -- 菜单参数关联表
DROP TABLE IF EXISTS yfsjglpt_model_menu_parameter; DROP TABLE IF EXISTS yfsjglpt_model_menu_parameter;
CREATE TABLE yfsjglpt_model_menu_parameter( CREATE TABLE yfsjglpt_model_menu_parameter(
`id` VARCHAR(64) NOT NULL COMMENT 'ID', `id` VARCHAR(64) NOT NULL COMMENT 'ID',
`menu_id` VARCHAR(128) COMMENT '菜单ID', `menu_id` VARCHAR(128) COMMENT '菜单ID',
`subsystem` VARCHAR(64) COMMENT '子系统', `subsystem` VARCHAR(64) COMMENT '子系统',
`parameter_id` VARCHAR(64) COMMENT '参数ID', `parameter_id` VARCHAR(64) COMMENT '参数ID',
`parameter_per` INT COMMENT '参数权限;1：查看；2：编辑', `parameter_per` INT COMMENT '参数权限;1：查看；2：编辑',
`created_by` VARCHAR(64) COMMENT '创建人', `created_by` VARCHAR(64) COMMENT '创建人',
`creation_date` DATETIME COMMENT '创建时间', `creation_date` DATETIME COMMENT '创建时间',
`last_updated_by` VARCHAR(64) COMMENT '最后更新人', `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
`last_update_date` DATETIME COMMENT '最后更新时间', `last_update_date` DATETIME COMMENT '最后更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) COMMENT '菜单参数关联表'; ) COMMENT '菜单参数关联表';
--部门或用户关联角色表 -- 部门或用户关联角色表
DROP TABLE IF EXISTS yfsjglpt_model_dep_user_role; DROP TABLE IF EXISTS yfsjglpt_model_dep_user_role;
CREATE TABLE yfsjglpt_model_dep_user_role( CREATE TABLE yfsjglpt_model_dep_user_role(
`id` VARCHAR(64) NOT NULL COMMENT 'ID', `id` VARCHAR(64) NOT NULL COMMENT 'ID',
`user_or_dep` VARCHAR(64) COMMENT '用户或部门ID', `user_or_dep` VARCHAR(64) COMMENT '用户或部门ID',
`role_id` VARCHAR(64) COMMENT '角色ID', `role_id` VARCHAR(64) COMMENT '角色ID',
`is_dep` INT COMMENT '是否是部门;0：个人；1：部门', `is_dep` INT COMMENT '是否是部门;0：个人；1：部门',
`created_by` VARCHAR(64) COMMENT '创建人', `created_by` VARCHAR(64) COMMENT '创建人',
`creation_date` DATETIME COMMENT '创建时间', `creation_date` DATETIME COMMENT '创建时间',
`last_updated_by` VARCHAR(64) COMMENT '最后更新人', `last_updated_by` VARCHAR(64) COMMENT '最后更新人',
`last_update_date` DATETIME COMMENT '最后更新时间', `last_update_date` DATETIME COMMENT '最后更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) COMMENT '部门或用户关联角色表'; ) COMMENT '部门或用户关联角色表';