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

字段冲突修改

Browse Source
This commit is contained in:
ys.git 2025-12-05 10:54:42 +08:00
parent 95ac730f3e
commit 65195929c6
5 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/xdap/self_development/pojo/AnalysisCommonParametersPojo.java Normal file
View File

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

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

@ -67,7 +67,7 @@ public class EngineReviewListPojo implements Serializable {
/**
* 当前状态
*/
private String statusDesc;
private String statusDescription;
/**
* 当前审批人

14
src/main/java/com/xdap/self_development/service/AnalysisCommonParametersService.java Normal file
View File

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

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

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

9
src/main/resources/sql.sql Normal file
View File

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