From 95ac730f3e6faebd4caee7171f8bf53439dbdb7a Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Thu, 4 Dec 2025 16:21:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A8=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xdap/self_development/pojo/Permission.java | 2 +- src/main/java/com/xdap/self_development/pojo/Role.java | 2 +- .../self_development/service/impl/PermissionServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xdap/self_development/pojo/Permission.java b/src/main/java/com/xdap/self_development/pojo/Permission.java index 0f2b270..2c002fc 100644 --- a/src/main/java/com/xdap/self_development/pojo/Permission.java +++ b/src/main/java/com/xdap/self_development/pojo/Permission.java @@ -15,5 +15,5 @@ public class Permission extends MpaasBasePojo { private String id; private String permissionName; private String permPath; - private String description; + private String perDescription; } diff --git a/src/main/java/com/xdap/self_development/pojo/Role.java b/src/main/java/com/xdap/self_development/pojo/Role.java index 2d7f79c..0a65aa4 100644 --- a/src/main/java/com/xdap/self_development/pojo/Role.java +++ b/src/main/java/com/xdap/self_development/pojo/Role.java @@ -14,5 +14,5 @@ public class Role extends MpaasBasePojo { @RowID(value = "roles_s", type = RowIDType.UUID) private String id; private String roleName; - private String description; + private String roleDescription; } diff --git a/src/main/java/com/xdap/self_development/service/impl/PermissionServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/PermissionServiceImpl.java index 1b9dd2c..319a3d8 100644 --- a/src/main/java/com/xdap/self_development/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/PermissionServiceImpl.java @@ -52,7 +52,7 @@ public class PermissionServiceImpl implements PermissionService { // 新增角色 Role role = new Role(); role.setRoleName(form.getRoleName()); - role.setDescription("无"); + role.setRoleDescription("无"); bd.getBusinessDatabase().doInsert(role); // 新增角色和用户、角色和权限的关联 From 65195929c6e8b5567d2d8ba3f43dca4053296d53 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Fri, 5 Dec 2025 10:54:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/AnalysisCommonParametersPojo.java | 35 +++++++++++++++++++ .../pojo/EngineReviewListPojo.java | 2 +- .../AnalysisCommonParametersService.java | 14 ++++++++ .../impl/ActivitiProcessServiceImpl.java | 2 +- src/main/resources/sql.sql | 9 +++++ 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java create mode 100644 src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java create mode 100644 src/main/resources/sql.sql diff --git a/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java b/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java new file mode 100644 index 0000000..ec22977 --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java @@ -0,0 +1,35 @@ +package com.xdap.self_development.pojo; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = false) +@Table("analysis_common_parameters") +public class AnalysisCommonParametersPojo implements Serializable { + + /** + * ID + */ + @RowID(sequence = "analysis_common_parameters_s", type = RowIDType.UUID) + private String id; + + /** + * 参数ID + */ + private String parameterId; + + /** + * 用户ID + */ + private String userId; + + +} diff --git a/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java b/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java index 2c8c346..9259ee6 100644 --- a/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java +++ b/src/main/java/com/xdap/self_development/pojo/EngineReviewListPojo.java @@ -67,7 +67,7 @@ public class EngineReviewListPojo implements Serializable { /** * 当前状态 */ - private String statusDesc; + private String statusDescription; /** * 当前审批人 diff --git a/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java new file mode 100644 index 0000000..2f5fc3b --- /dev/null +++ b/src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java @@ -0,0 +1,14 @@ +package com.xdap.self_development.service; + + +import com.xdap.self_development.controller.request.ApprovalNodeRequest; +import com.xdap.self_development.pojo.dto.ActivitiDataAndRecordDTO; +import com.xdap.self_development.pojo.dto.ActivitiDataDTO; +import com.xdap.self_development.pojo.dto.HandleApprovalDTO; +import com.xdap.self_development.pojo.dto.ShowActivitiDTO; + +import java.util.List; + +public interface AnalysisCommonParametersService { + //查询常用参数返回机型数据 +} diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java index 709568e..95c796c 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java @@ -159,7 +159,7 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService { engineReviewListPojo.setSubsystemName(subSystem); engineReviewListPojo.setStatusCode(ParamValueVersionEnum.UNDER.getCode()); engineReviewListPojo.setApplicant(userId); - engineReviewListPojo.setStatusDesc(ParamValueVersionEnum.UNDER.getDesc()); + engineReviewListPojo.setStatusDescription(ParamValueVersionEnum.UNDER.getDesc()); engineReviewListPojo.setNodeName(firstNode.getNodeName()); engineReviewListPojo.setApproverPersons(String.join(",", firstNode.getAssignees())); engineReviewListPojo.setReviewComment(approvalNodeRequest.getComment()); diff --git a/src/main/resources/sql.sql b/src/main/resources/sql.sql new file mode 100644 index 0000000..c5012bd --- /dev/null +++ b/src/main/resources/sql.sql @@ -0,0 +1,9 @@ +-- 新增分析常用参数表 +CREATE TABLE `analysis_common_parameters` ( + `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', + `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='查询分析常用参数表'; + +