From 05600d089901d44e8d5036046025b6a90ceb896a Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期二, 03 十二月 2024 16:57:20 +0800
Subject: [PATCH] 修改及增加功能
---
expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java | 129 ++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 73 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java b/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
index 5fcb183..f986dd8 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java
@@ -6,10 +6,11 @@
import com.gkhy.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
/**
@@ -18,6 +19,8 @@
* @author expert
* @date 2024-11-14
*/
+@EqualsAndHashCode(callSuper = true)
+@Data
@TableName(resultMap = "com.gkhy.system.mapper.ProjectExpertMapper.ProjectExpertResult")
@ApiModel(value = "项目专家关联对象", description = "项目专家关联对象表")
public class ProjectExpert extends BaseEntity {
@@ -32,40 +35,40 @@
/**
* 项目id
*/
- @ApiModelProperty(name = "项目名称",required = true)
+ @ApiModelProperty(value = "项目名称",required = true)
@NotNull(message = "项目不能为空")
private Long projectId;
/**
* 专家id
*/
- @ApiModelProperty(name = "专家id",required = true)
+ @ApiModelProperty(value = "专家id",required = true)
@NotNull(message = "选择专家")
private Long expertId;
/**
* 总分
*/
- @ApiModelProperty(name = "总分")
+ @ApiModelProperty(value = "总分")
private Long score;
/**
* 评估状态0未评估1已评估
*/
- @ApiModelProperty(name = "评估状态0未评估1已评估")
+ @ApiModelProperty(value = "评估状态0未评估1已评估")
private Long evaluationState;
/**
* 选取方式1固定2随机
*/
- @ApiModelProperty(name = "选取方式1固定2随机",required = true)
+ @ApiModelProperty(value = "选取方式1固定2随机",required = true)
@NotNull(message = "选取方式不能为空")
private Long selectionMode;
/**
* 是否组长0否1是
*/
- @ApiModelProperty(name = "是否组长0否1是",required = true)
+ @ApiModelProperty(value = "是否组长0否1是",required = true)
@NotNull(message = "是否组长不能为空")
private Long teamLeader;
@@ -74,85 +77,65 @@
*/
private Long delFlag;
- public void setId(Long id) {
- this.id = id;
- }
- public Long getId() {
- return id;
- }
+ @ApiModelProperty(value = "职业道德1优秀2合格3基本合格4不合格")
+ private Long professionalEthics;
- public void setProjectId(Long projectId) {
- this.projectId = projectId;
- }
+ /** 公正廉洁1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "公正廉洁1优秀2合格3基本合格4不合格")
+ private Long impartialHonest;
- public Long getProjectId() {
- return projectId;
- }
+ /** 综合协调1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "综合协调1优秀2合格3基本合格4不合格")
+ private Long comprehensiveCoordination;
- public void setExpertId(Long expertId) {
- this.expertId = expertId;
- }
+ /** 专业能力1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "专业能力1优秀2合格3基本合格4不合格")
+ private Long professionalAbility;
- public Long getExpertId() {
- return expertId;
- }
+ /** 意见表达1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "意见表达1优秀2合格3基本合格4不合格")
+ private Long expressingOpinions;
- public void setScore(Long score) {
- this.score = score;
- }
+ /** 其他意见 */
+ @ApiModelProperty(value = "其他意见")
+ private String others;
- public Long getScore() {
- return score;
- }
+ /** 综合评价1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "综合评价1优秀2合格3基本合格4不合格")
+ private Long comprehensiveEvaluation;
- public void setevaluationState(Long evaluationState) {
- this.evaluationState = evaluationState;
- }
+ /** 重大隐患 */
+ @ApiModelProperty(value = "重大隐患")
+ private Long majorDangers;
- public Long getevaluationState() {
- return evaluationState;
- }
+ /** 一般隐患 */
+ @ApiModelProperty(value = "一般隐患")
+ private Long generalHazards;
- public void setSelectionMode(Long selectionMode) {
- this.selectionMode = selectionMode;
- }
+ /** 内容描述 */
+ @ApiModelProperty(value = "内容描述")
+ private String content;
- public Long getSelectionMode() {
- return selectionMode;
- }
+ /** 计费标准 */
+ @ApiModelProperty(value = "计费标准")
+ private String freightBasis;
- public void setTeamLeader(Long teamLeader) {
- this.teamLeader = teamLeader;
- }
+ /** 计费时长 */
+ @ApiModelProperty(value = "计费时长")
+ private BigDecimal billingDuration;
- public Long getTeamLeader() {
- return teamLeader;
- }
+ /** 税后金额 */
+ @ApiModelProperty(value = "税后金额")
+ private BigDecimal afterTaxAmount;
- public void setDelFlag(Long delFlag) {
- this.delFlag = delFlag;
- }
+ /** 开户行 */
+ @ApiModelProperty(value = "开户行")
+ private String openBank;
- public Long getDelFlag() {
- return delFlag;
- }
+ /** 卡号 */
+ @ApiModelProperty(value = "卡号")
+ private String bankCard;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("projectId", getProjectId())
- .append("expertId", getExpertId())
- .append("score", getScore())
- .append("evaluationState", getevaluationState())
- .append("selectionMode", getSelectionMode())
- .append("teamLeader", getTeamLeader())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
+
}
\ No newline at end of file
--
Gitblit v1.9.2