From 686bd303ddc68db338fe352c38392194217168a5 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 11 三月 2025 15:27:59 +0800
Subject: [PATCH] 修改业务逻辑增加项目编码
---
expert-system/src/main/java/com/gkhy/system/domain/ProjectExpert.java | 222 +++++++++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 97 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 4d4364c..6fb0e71 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
@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.sis.common.annotation.Excel;
-import com.rchuing.sis.common.core.domain.BaseEntity;
+import com.gkhy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
/**
* 项目专家关联对象 project_expert
@@ -14,114 +19,137 @@
* @author expert
* @date 2024-11-14
*/
- @TableName(resultMap = "com.gkhy.system.mapper.ProjectExpertMapper.ProjectExpertResult")
- public class ProjectExpert extends BaseEntity
- {
- private static final long serialVersionUID = 1L;
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName(resultMap = "com.gkhy.system.mapper.ProjectExpertMapper.ProjectExpertResult")
+@ApiModel(value = "项目专家关联对象", description = "项目专家关联对象表")
+public class ProjectExpert extends BaseEntity {
+ private static final long serialVersionUID = 1L;
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ /**
+ * $column.columnComment
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
- /** 项目id */
- @Excel(name = "项目id")
- private Long projectId;
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目名称",required = true)
+ @NotNull(message = "项目不能为空")
+ private Long projectId;
- /** 专家id */
- @Excel(name = "专家id")
- private Long expertId;
+ /**
+ * 专家id
+ */
+ @ApiModelProperty(value = "专家id",required = true)
+ @NotNull(message = "选择专家")
+ private Long expertId;
- /** 总分 */
- @Excel(name = "总分")
- private Long score;
+ /**
+ * 总分
+ */
+ @ApiModelProperty(value = "总分")
+ private Long score;
- /** 评估状态0未评估1已评估 */
- @Excel(name = "评估状态0未评估1已评估")
- private Long envaluationState;
+ /**
+ * 评估状态0未评估1已评估
+ */
+ @ApiModelProperty(value = "评估状态0未评估1已评估")
+ private Long evaluationState;
- /** 选取方式1固定2随机 */
- @Excel(name = "选取方式1固定2随机")
- private Long selectionMode;
+ /**
+ * 选取方式1固定2随机
+ */
+ @ApiModelProperty(value = "选取方式1固定2随机",required = true)
+ @NotNull(message = "选取方式不能为空")
+ private Long selectionMode;
- /** 是否组长0否1是 */
- @Excel(name = "是否组长0否1是")
- private Long teamLeader;
+ /**
+ * 是否组长0否1是
+ */
+ @ApiModelProperty(value = "是否组长0否1是",required = true)
+ @NotNull(message = "是否组长不能为空")
+ private Long teamLeader;
- /** 删除标志(0代表存在，1代表删除，默认0) */
- private Long delFlag;
+ /**
+ * 删除标志(0代表存在，1代表删除，默认0)
+ */
+ private Long delFlag;
- public void setId(Long id) {
- this.id = id;
- }
- public Long getId() {
- return id;
- }
- public void setProjectId(Long projectId) {
- this.projectId = projectId;
- }
+ @ApiModelProperty(value = "职业道德1优秀2合格3基本合格4不合格")
+ private Long professionalEthics;
- public Long getProjectId() {
- return projectId;
- }
- public void setExpertId(Long expertId) {
- this.expertId = expertId;
- }
+ /** 公正廉洁1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "公正廉洁1优秀2合格3基本合格4不合格")
+ private Long impartialHonest;
- public Long getExpertId() {
- return expertId;
- }
- public void setScore(Long score) {
- this.score = score;
- }
+ /** 综合协调1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "综合协调1优秀2合格3基本合格4不合格")
+ private Long comprehensiveCoordination;
- public Long getScore() {
- return score;
- }
- public void setEnvaluationState(Long envaluationState) {
- this.envaluationState = envaluationState;
- }
+ /** 专业能力1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "专业能力1优秀2合格3基本合格4不合格")
+ private Long professionalAbility;
- public Long getEnvaluationState() {
- return envaluationState;
- }
- public void setSelectionMode(Long selectionMode) {
- this.selectionMode = selectionMode;
- }
+ /** 意见表达1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "意见表达1优秀2合格3基本合格4不合格")
+ private Long expressingOpinions;
- public Long getSelectionMode() {
- return selectionMode;
- }
- public void setTeamLeader(Long teamLeader) {
- this.teamLeader = teamLeader;
- }
+ /** 其他意见 */
+ @ApiModelProperty(value = "其他意见")
+ private String others;
- public Long getTeamLeader() {
- return teamLeader;
- }
- public void setDelFlag(Long delFlag) {
- this.delFlag = delFlag;
- }
+ /** 综合评价1优秀2合格3基本合格4不合格 */
+ @ApiModelProperty(value = "综合评价1优秀2合格3基本合格4不合格")
+ private Long comprehensiveEvaluation;
- public Long getDelFlag() {
- return delFlag;
- }
+ /** 重大隐患 */
+ @ApiModelProperty(value = "重大隐患")
+ private Long majorDangers;
- @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("envaluationState", getEnvaluationState())
- .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
+ /** 一般隐患 */
+ @ApiModelProperty(value = "一般隐患")
+ private Long generalHazards;
+
+ /** 内容描述 */
+ @ApiModelProperty(value = "内容描述")
+ private String content;
+
+ /** 计费标准 */
+ @ApiModelProperty(value = "计费标准")
+ private String freightBasis;
+
+ @ApiModelProperty(value = "计费标准说明")
+ private String billingInstructions;
+
+ /** 计费时长 */
+ @ApiModelProperty(value = "计费时长")
+ private BigDecimal billingDuration;
+
+ /** 税后金额 */
+ @ApiModelProperty(value = "税后金额")
+ private BigDecimal afterTaxAmount;
+
+ /** 开户行 */
+ @ApiModelProperty(value = "开户行")
+ private String openBank;
+
+ /** 卡号 */
+ @ApiModelProperty(value = "卡号")
+ private String bankCard;
+
+ @ApiModelProperty(value = "应纳税所得额")
+ private BigDecimal taxableIncome;
+
+ @ApiModelProperty(value = "应缴个税")
+ private BigDecimal incomeTaxPayable;
+
+ @ApiModelProperty(value = "专家费(税前)")
+ private BigDecimal taxExpertFee;
+
+
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.2