From dc4f8829472baf47345e3a01384d7b5eaf7ee727 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Tue, 20 May 2025 14:49:10 +0800
Subject: [PATCH] 增加专家导出字段
---
expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java | 247 ++++++------------------------------------------
1 files changed, 34 insertions(+), 213 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java
index 6c60811..7cfeddf 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertManagementInfoRes.java
@@ -1,19 +1,13 @@
-package com.gkhy.system.domain;
+package com.gkhy.system.domain.vo.response;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gkhy.common.annotation.Excel;
-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 javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
@@ -22,252 +16,79 @@
* @author expert
* @date 2024-11-14
*/
-@TableName(resultMap = "com.gkhy.system.mapper.ProjectManagementMapper.ProjectManagementResult")
-@ApiModel(value = "项目管理对象", description = "项目管理对象表")
-public class ProjectManagement extends BaseEntity {
+@ApiModel(value = "项目管理专家详情" , description = "项目管理专家详情")
+@Data
+public class ProjectExpertManagementInfoRes implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "项目id")
private Long id;
/**
* 项目名称
*/
- @ApiModelProperty(name = "项目名称",required = true)
- @NotBlank(message = "项目名称不能为空")
+ @ApiModelProperty(name = "项目名称")
private String projectName;
- /**
- * 处室
- */
- @ApiModelProperty(name = "处室",required = true)
- @NotNull(message = "处室不能为空")
- private Long deptId;
+ @ApiModelProperty(name = "项目编码")
+ private String projectCode;
+
/**
* 部门名称
*/
- @ApiModelProperty(name = "处室名称",required = true)
- @NotBlank(message = "处室不能为空")
+ @ApiModelProperty(name = "处室名称")
private String deptName;
/**
* 被检单位
*/
- @ApiModelProperty(name = "被检单位")
- private String companyName;
+ @ApiModelProperty(name = "工作类别")
+ private String jobCategory;
/**
* 项目地址
*/
- @ApiModelProperty(name = "项目地址",required = true)
- @NotBlank(message = "项目地址不能为空")
+ @ApiModelProperty(value = "项目地址")
private String projectAddress;
- /**
- * 部门带队人员
- */
- @ApiModelProperty(name = "部门带队人员",required = true)
- @NotBlank(message = "处室带队人员不能为空")
- private String deptUserName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "项目审批时间")
+ private Date projectCheckTime;
+
+ @ApiModelProperty(value = "审批状态(0暂存，1选取专家，2生成审批单，3审批通过，4完结)")
+ private String state;
+
+ @ApiModelProperty(value = "步骤1暂存2专家选取3审批4完结")
+ private Long step;
/**
- * 乐观锁
+ * 专家人数
*/
- @ApiModelProperty(name = "乐观锁")
- private Long version;
-
- /**
- * 审批状态(0暂存，1生成审批单，2审批通过，3审批驳回，4完结)
- */
- @Excel(name = "审批状态(0暂存，1生成审批单，2审批通过，3审批驳回，4完结)")
- private Long state;
+ @ApiModelProperty(value = "专家人数")
+ private Long expertNum;
/**
* 项目预计开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(name = "项目预计开始日期",required = true)
- @NotNull(message = "项目预计开始日期不能为空")
+ @ApiModelProperty(name = "项目预计开始日期")
private Date projectDateStart;
/**
* 项目预计结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(name = "项目预计结束日期", required = true)
- @NotNull(message = "项目预计结束日期不能为空")
+ @ApiModelProperty(name = "项目预计结束日期")
private Date projectDateEnd;
- /**
- * 专家证书
- */
- @ApiModelProperty(name = "专家证书")
- private String expertCertificate;
+ @ApiModelProperty(name = "项目概况")
+ private String remark;
- /**
- * 评估状态0未评估1已评估
- */
- @ApiModelProperty(name = "评估状态0未评估1已评估")
- private Long envaluationState;
+ @ApiModelProperty(name = "专家数据")
+ private List<ProjectExpertCheckResp> projectExpertCheckResp;
- /**
- * 专家人数
- */
- @ApiModelProperty(name = "专家人数")
- private Long expertNum;
-
- /**
- * 删除标志(0代表存在，1代表删除，默认0)
- */
- private Long delFlag;
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- public String getDeptName() {
- return deptName;
- }
-
- public void setCompanyName(String companyName) {
- this.companyName = companyName;
- }
-
- public String getCompanyName() {
- return companyName;
- }
-
- public void setProjectAddress(String projectAddress) {
- this.projectAddress = projectAddress;
- }
-
- public String getProjectAddress() {
- return projectAddress;
- }
-
- public void setDeptUserName(String deptUserName) {
- this.deptUserName = deptUserName;
- }
-
- public String getDeptUserName() {
- return deptUserName;
- }
-
- public void setVersion(Long version) {
- this.version = version;
- }
-
- public Long getVersion() {
- return version;
- }
-
- public void setState(Long state) {
- this.state = state;
- }
-
- public Long getState() {
- return state;
- }
-
- public void setProjectDateStart(Date projectDateStart) {
- this.projectDateStart = projectDateStart;
- }
-
- public Date getProjectDateStart() {
- return projectDateStart;
- }
-
- public void setProjectDateEnd(Date projectDateEnd) {
- this.projectDateEnd = projectDateEnd;
- }
-
- public Date getProjectDateEnd() {
- return projectDateEnd;
- }
-
- public void setExpertCertificate(String expertCertificate) {
- this.expertCertificate = expertCertificate;
- }
-
- public String getExpertCertificate() {
- return expertCertificate;
- }
-
- public void setEnvaluationState(Long envaluationState) {
- this.envaluationState = envaluationState;
- }
-
- public Long getEnvaluationState() {
- return envaluationState;
- }
-
- public void setExpertNum(Long expertNum) {
- this.expertNum = expertNum;
- }
-
- public Long getExpertNum() {
- return expertNum;
- }
-
- public void setDelFlag(Long delFlag) {
- this.delFlag = delFlag;
- }
-
- public Long getDelFlag() {
- return delFlag;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("projectName", getProjectName())
- .append("deptId", getDeptId())
- .append("deptName", getDeptName())
- .append("companyName", getCompanyName())
- .append("projectAddress", getProjectAddress())
- .append("deptUserName", getDeptUserName())
- .append("version", getVersion())
- .append("state", getState())
- .append("remark", getRemark())
- .append("projectDateStart", getProjectDateStart())
- .append("projectDateEnd", getProjectDateEnd())
- .append("expertCertificate", getExpertCertificate())
- .append("envaluationState", getEnvaluationState())
- .append("expertNum", getExpertNum())
- .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