From f33cfe86447c16df8ca665e2e1a5f3333ff57792 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 27 八月 2025 17:02:27 +0800
Subject: [PATCH] 版本改造
---
expert-system/src/main/java/com/gkhy/system/domain/ProjectManagement.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 24 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 473232d..3a2581c 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,10 +1,13 @@
package com.gkhy.system.domain;
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;
@@ -13,6 +16,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
+import java.util.List;
/**
@@ -21,7 +25,7 @@
* @author expert
* @date 2024-11-14
*/
-@TableName(resultMap = "com.gkhy.system.mapper.ProjectManagementMapper.ProjectManagementResult")
+@TableName(autoResultMap = true)
@ApiModel(value = "项目管理对象", description = "项目管理对象表")
public class ProjectManagement extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -46,6 +50,11 @@
@NotNull(message = "处室不能为空")
private Long deptId;
+
+ @ApiModelProperty(value = "处室id筛选条件")
+ @TableField(exist = false)
+ private List<Long> deptIds;
+
/**
* 部门名称
*/
@@ -56,8 +65,8 @@
/**
* 被检单位
*/
- @ApiModelProperty(value = "被检单位")
- private String companyName;
+ @ApiModelProperty(value = "工作类别")
+ private String jobCategory;
/**
* 项目地址
@@ -66,12 +75,16 @@
@NotBlank(message = "项目地址不能为空")
private String projectAddress;
- /**
- * 部门带队人员
- */
- @ApiModelProperty(value = "部门带队人员",required = true)
- @NotBlank(message = "处室带队人员不能为空")
- private String deptUserName;
+// /**
+// * 部门带队人员
+// */
+// @ApiModelProperty(value = "处室人员",required = false,hidden = true)
+// private String deptUserName;
+
+ @ApiModelProperty(value = "处室人员及职务职务",required = true)
+ @NotNull(message = "处室人员及职务职务不能为空")
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private ProjectDeptPostDTO deptPostName;
/**
* 乐观锁
@@ -120,6 +133,9 @@
@ApiModelProperty(value = "评估状态0未评估1已评估")
private Long evaluationState;
+ @ApiModelProperty(value = "项目编码")
+ private String projectCode;
+
/**
* 专家人数
*/
@@ -131,6 +147,9 @@
@ApiModelProperty(value = "专家名称组长")
private String expertName;
+
+ @ApiModelProperty(value = "1、内部专家2、外部专家")
+ private Long expertType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "项目结束日期")
@@ -176,13 +195,7 @@
return deptName;
}
- public void setCompanyName(String companyName) {
- this.companyName = companyName;
- }
- public String getCompanyName() {
- return companyName;
- }
public void setProjectAddress(String projectAddress) {
this.projectAddress = projectAddress;
@@ -192,13 +205,13 @@
return projectAddress;
}
- public void setDeptUserName(String deptUserName) {
- this.deptUserName = deptUserName;
- }
-
- public String getDeptUserName() {
- return deptUserName;
- }
+// public void setDeptUserName(String deptUserName) {
+// this.deptUserName = deptUserName;
+// }
+//
+// public String getDeptUserName() {
+// return deptUserName;
+// }
public void setVersion(Long version) {
this.version = version;
@@ -263,9 +276,7 @@
.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())
@@ -338,4 +349,44 @@
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;
+ }
+
+ public List<Long> getDeptIds() {
+ return deptIds;
+ }
+
+ public void setDeptIds(List<Long> deptIds) {
+ this.deptIds = deptIds;
+ }
+
+ public Long getExpertType() {
+ return expertType;
+ }
+
+ public void setExpertType(Long expertType) {
+ this.expertType = expertType;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2