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/ProjectManagement.java | 457 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 304 insertions(+), 153 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/ProjectManagement.java b/expert-system/src/main/java/com/gkhy/system/domain/ProjectManagement.java
index a1c68c9..3ce2309 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/ProjectManagement.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/ProjectManagement.java
@@ -1,14 +1,22 @@
package com.gkhy.system.domain;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gkhy.common.core.domain.BaseEntity;
+import com.gkhy.system.domain.vo.ProjectDeptPostDTO;
+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 com.rchuing.sis.common.annotation.Excel;
-import com.rchuing.sis.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
/**
* 项目管理对象 project_management
@@ -16,201 +24,344 @@
* @author expert
* @date 2024-11-14
*/
- @TableName(resultMap = "com.gkhy.system.mapper.ProjectManagementMapper.ProjectManagementResult")
- public class ProjectManagement extends BaseEntity
- {
- private static final long serialVersionUID = 1L;
+@TableName(autoResultMap = true)
+@ApiModel(value = "项目管理对象", description = "项目管理对象表")
+public class ProjectManagement extends BaseEntity {
+ private static final long serialVersionUID = 1L;
- /** 主键 */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
- /** 项目名称 */
- @Excel(name = "项目名称")
- private String projectName;
+ /**
+ * 项目名称
+ */
+ @ApiModelProperty(value = "项目名称",required = true)
+ @NotBlank(message = "项目名称不能为空")
+ private String projectName;
- /** 处室 */
- @Excel(name = "处室")
- private Long deptId;
+ /**
+ * 处室
+ */
+ @ApiModelProperty(value = "处室",required = true)
+ @NotNull(message = "处室不能为空")
+ private Long deptId;
- /** 部门名称 */
- @Excel(name = "部门名称")
- private String deptName;
+ /**
+ * 部门名称
+ */
+ @ApiModelProperty(value = "处室名称",required = true)
+ @NotBlank(message = "处室不能为空")
+ private String deptName;
- /** 被检单位 */
- @Excel(name = "被检单位")
- private String companyName;
+ /**
+ * 被检单位
+ */
+ @ApiModelProperty(value = "工作类别")
+ private String jobCategory;
- /** 项目地址 */
- @Excel(name = "项目地址")
- private String projectAddress;
+ /**
+ * 项目地址
+ */
+ @ApiModelProperty(value = "项目地址",required = true)
+ @NotBlank(message = "项目地址不能为空")
+ private String projectAddress;
- /** 部门带队人员 */
- @Excel(name = "部门带队人员")
- private String deptUserName;
+// /**
+// * 部门带队人员
+// */
+// @ApiModelProperty(value = "处室人员",required = false,hidden = true)
+// private String deptUserName;
- /** 乐观锁 */
- @Excel(name = "乐观锁")
- private Long version;
+ @ApiModelProperty(value = "处室人员及职务职务",required = true)
+ @NotNull(message = "处室人员及职务职务不能为空")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private ProjectDeptPostDTO deptPostName;
- /** 审批状态(0暂存，1生成审批单，2审批通过，3审批驳回，4完结) */
- @Excel(name = "审批状态(0暂存，1生成审批单，2审批通过，3审批驳回，4完结)")
- private Long state;
+ /**
+ * 乐观锁
+ */
+ @ApiModelProperty(value = "乐观锁")
+ private Long version;
- /** 项目预计开始日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "项目预计开始日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date projectDateStart;
+ /**
+ * 审批状态(0暂存，1生成审批单，2审批通过，3审批驳回，4完结)
+ */
+ @ApiModelProperty(value = "审批状态(0暂存，1选取专家，2生成审批单，3审批通过，4完结)")
+ private Long state;
- /** 项目预计结束日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "项目预计结束日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date projectDateEnd;
+ @ApiModelProperty(value = "步骤1暂存2专家选取3审批4完结")
+ private Long step;
- /** 专家证书 */
- @Excel(name = "专家证书")
- private String expertCertificate;
+ /**
+ * 项目预计开始日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "项目预计开始日期",required = true)
+ @NotNull(message = "项目预计开始日期不能为空")
+ private Date projectDateStart;
- /** 评估状态0未评估1已评估 */
- @Excel(name = "评估状态0未评估1已评估")
- private Long envaluationState;
+ /**
+ * 项目预计结束日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "项目预计结束日期", required = true)
+ @NotNull(message = "项目预计结束日期不能为空")
+ private Date projectDateEnd;
- /** 专家人数 */
- @Excel(name = "专家人数")
- private Long expertNum;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "项目审批时间")
+ private Date projectCheckTime;
- /** 删除标志(0代表存在，1代表删除，默认0) */
- private Long delFlag;
+ /**
+ * 专家证书
+ */
+ @ApiModelProperty(value = "专家证书")
+ private String expertCertificate;
- public void setId(Long id) {
- this.id = id;
- }
+ /**
+ * 评估状态0未评估1已评估
+ */
+ @ApiModelProperty(value = "评估状态0未评估1已评估")
+ private Long evaluationState;
- public Long getId() {
- return id;
- }
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
+ @ApiModelProperty(value = "项目编码")
+ private String projectCode;
- public String getProjectName() {
- return projectName;
- }
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
+ /**
+ * 专家人数
+ */
+ @ApiModelProperty(value = "专家人数")
+ private Long expertNum;
- public Long getDeptId() {
- return deptId;
- }
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
+ @ApiModelProperty(value = "专家id")
+ private Long expertId;
- public String getDeptName() {
- return deptName;
- }
- public void setCompanyName(String companyName) {
- this.companyName = companyName;
- }
+ @ApiModelProperty(value = "专家名称组长")
+ private String expertName;
- public String getCompanyName() {
- return companyName;
- }
- public void setProjectAddress(String projectAddress) {
- this.projectAddress = projectAddress;
- }
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "项目结束日期")
+ private Date projectEndTime;
- public String getProjectAddress() {
- return projectAddress;
- }
- public void setDeptUserName(String deptUserName) {
- this.deptUserName = deptUserName;
- }
+ @ApiModelProperty(value = "项目总结")
+ private String desc;
- public String getDeptUserName() {
- return deptUserName;
- }
- public void setVersion(Long version) {
- this.version = version;
- }
+ /**
+ * 删除标志(0代表存在，1代表删除，默认0)
+ */
+ private Long delFlag;
- public Long getVersion() {
- return version;
- }
- public void setState(Long state) {
- this.state = state;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
- public Long getState() {
- return state;
- }
- public void setProjectDateStart(Date projectDateStart) {
- this.projectDateStart = projectDateStart;
- }
+ public Long getId() {
+ return id;
+ }
- public Date getProjectDateStart() {
- return projectDateStart;
- }
- public void setProjectDateEnd(Date projectDateEnd) {
- this.projectDateEnd = projectDateEnd;
- }
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
- public Date getProjectDateEnd() {
- return projectDateEnd;
- }
- public void setExpertCertificate(String expertCertificate) {
- this.expertCertificate = expertCertificate;
- }
+ public String getProjectName() {
+ return projectName;
+ }
- public String getExpertCertificate() {
- return expertCertificate;
- }
- public void setEnvaluationState(Long envaluationState) {
- this.envaluationState = envaluationState;
- }
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
- public Long getEnvaluationState() {
- return envaluationState;
- }
- public void setExpertNum(Long expertNum) {
- this.expertNum = expertNum;
- }
+ public Long getDeptId() {
+ return deptId;
+ }
- public Long getExpertNum() {
- return expertNum;
- }
- public void setDelFlag(Long delFlag) {
- this.delFlag = delFlag;
- }
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
- public Long getDelFlag() {
- return delFlag;
- }
+ public String getDeptName() {
+ return deptName;
+ }
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+
+
+ 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 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("evaluationState", getEvaluationState())
.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
+ .toString();
+ }
+
+ public Date getProjectCheckTime() {
+ return projectCheckTime;
+ }
+
+ public void setProjectCheckTime(Date projectCheckTime) {
+ this.projectCheckTime = projectCheckTime;
+ }
+
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public Long getExpertId() {
+ return expertId;
+ }
+
+ public void setExpertId(Long expertId) {
+ this.expertId = expertId;
+ }
+
+ public String getExpertName() {
+ return expertName;
+ }
+
+ public void setExpertName(String expertName) {
+ this.expertName = expertName;
+ }
+
+ public Date getProjectEndTime() {
+ return projectEndTime;
+ }
+
+ public void setProjectEndTime(Date projectEndTime) {
+ this.projectEndTime = projectEndTime;
+ }
+
+ public Long getStep() {
+ return step;
+ }
+
+ public void setStep(Long step) {
+ this.step = step;
+ }
+
+ public Long getEvaluationState() {
+ return evaluationState;
+ }
+
+ public void setEvaluationState(Long evaluationState) {
+ this.evaluationState = evaluationState;
+ }
+
+ public String getJobCategory() {
+ return jobCategory;
+ }
+
+ public void setJobCategory(String jobCategory) {
+ this.jobCategory = jobCategory;
+ }
+
+ public ProjectDeptPostDTO getDeptPostName() {
+ return deptPostName;
+ }
+
+ public void setDeptPostName(ProjectDeptPostDTO deptPostName) {
+ this.deptPostName = deptPostName;
+ }
+
+ public String getProjectCode() {
+ return projectCode;
+ }
+
+ public void setProjectCode(String projectCode) {
+ this.projectCode = projectCode;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.2