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/vo/request/ProjectManageSaveReq.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectManageSaveReq.java b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectManageSaveReq.java
index bc0121d..7479a6f 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectManageSaveReq.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/vo/request/ProjectManageSaveReq.java
@@ -1,6 +1,7 @@
 package com.gkhy.system.domain.vo.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gkhy.system.domain.vo.ProjectDeptPostDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,8 +25,8 @@
     /**
      * 项目名称
      */
-    @ApiModelProperty(value = "项目名称",required = true)
-    @NotBlank(message = "项目名称不能为空")
+    @ApiModelProperty(value = "项目名称(事由)",required = true)
+    @NotBlank(message = "项目名称(事由)不能为空")
     private String projectName;
 
     /**
@@ -45,22 +46,31 @@
     /**
      * 被检单位
      */
-    @ApiModelProperty(value = "被检单位")
-    private String companyName;
+    @ApiModelProperty(value = "工作类别")
+    @NotBlank(message = "工作类别不能为空")
+    private String jobCategory;
 
     /**
      * 项目地址
      */
-    @ApiModelProperty(value = "项目地址",required = true)
-    @NotBlank(message = "项目地址不能为空")
+    @ApiModelProperty(value = "目的地及相关企业名称等",required = true)
+    @NotBlank(message = "目的地及相关企业名称等")
     private String projectAddress;
 
-    /**
-     * 部门带队人员
-     */
-    @ApiModelProperty(value = "部门带队人员",required = true)
-    @NotBlank(message = "处室带队人员不能为空")
-    private String deptUserName;
+//    /**
+//     * 部门带队人员
+//     */
+//    @ApiModelProperty(value = "处室人员",required = true)
+//    @NotBlank(message = "处室人员不能为空")
+//    private String deptUserName;
+//
+//    @ApiModelProperty(value = "职务",required = true)
+//    @NotBlank(message = "职务不能为空")
+//    private String postName;
+
+    @ApiModelProperty(value = "处室人员及职务职务",required = true)
+    @NotNull(message = "处室人员及职务职务不能为空")
+    private ProjectDeptPostDTO deptPostName;
 
     /**
      * 项目预计开始日期
@@ -79,7 +89,6 @@
     private Date projectDateEnd;
 
 
-    @ApiModelProperty(value = "项目概况",required = true)
-    @NotBlank(message = "项目概况不能为空")
+    @ApiModelProperty(value = "项目概况")
     private String remark;
 }

--
Gitblit v1.9.2