Merge remote-tracking branch 'origin/master'

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;
+
+
+}

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;
 
     /**
      * 当前审批人

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;
 }

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;
 }

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 {
+   //查询常用参数返回机型数据
+}

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());

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);
 
         // 新增角色和用户、角色和权限的关联

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='查询分析常用参数表';
+
+