修改及增加功能

heheng

2024-12-03 05600d089901d44e8d5036046025b6a90ceb896a

 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;
@@ -21,7 +24,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;
@@ -56,8 +59,8 @@
    /**
     * 被检单位
     */
    @ApiModelProperty(value = "被检单位")
    private String companyName;
    @ApiModelProperty(value = "工作类别")
    private String jobCategory;

    /**
     * 项目地址
@@ -66,12 +69,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;

    /**
     * 乐观锁
@@ -176,13 +183,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 +193,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 +264,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 +337,20 @@
    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;
    }
}