Commit 7578b617 authored by wangyangyang's avatar wangyangyang

项目群加名称字段

parent 657b1811
...@@ -4,6 +4,7 @@ import javax.validation.constraints.NotBlank; ...@@ -4,6 +4,7 @@ import javax.validation.constraints.NotBlank;
import java.util.Date; import java.util.Date;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import com.yonde.dex.basedata.entity.annotation.XmlElementProperty; import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
...@@ -12,16 +13,22 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO; ...@@ -12,16 +13,22 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
import com.yonde.dex.user.common.vo.DxUserInfoVO; import com.yonde.dex.user.common.vo.DxUserInfoVO;
import lombok.ToString; import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.math.BigInteger; import java.math.BigInteger;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import lombok.experimental.Delegate; import lombok.experimental.Delegate;
import javax.xml.bind.annotation.*; import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter; import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
import lombok.Data; import lombok.Data;
...@@ -44,16 +51,16 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda ...@@ -44,16 +51,16 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
import com.yonde.dex.basedata.entity.users.DxUserVO; import com.yonde.dex.basedata.entity.users.DxUserVO;
/** /**
* @description: ExtProgram-VO * @description: ExtProgram-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-9-9 11:04:24 * @date: 2024-9-11 9:52:59
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class) @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxSecretVOHolder{ public class ExtProgramVO extends IdOnlyVO implements IdVO, DxLifecycleManageBaseVOHolder, DxObjFileLinkVOHolder, DxSecretVOHolder {
public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable"; public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable"; public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
...@@ -73,6 +80,7 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas ...@@ -73,6 +80,7 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas
public static final String MANAGER_ORG_PROP_NAME = "managerOrg"; public static final String MANAGER_ORG_PROP_NAME = "managerOrg";
public static final String MANAGER_ORG_ID_PROP_NAME = "managerOrgId"; public static final String MANAGER_ORG_ID_PROP_NAME = "managerOrgId";
public static final String MANAGER_ORG_ID_TYPE_PROP_NAME = "managerOrgIdType"; public static final String MANAGER_ORG_ID_TYPE_PROP_NAME = "managerOrgIdType";
public static final String NAME_PROP_NAME = "name";
public static final String NUMBER_PROP_NAME = "number"; public static final String NUMBER_PROP_NAME = "number";
public static final String PRO_TYPE_PROP_NAME = "proType"; public static final String PRO_TYPE_PROP_NAME = "proType";
public static final String START_TIME_PROP_NAME = "startTime"; public static final String START_TIME_PROP_NAME = "startTime";
...@@ -184,6 +192,11 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas ...@@ -184,6 +192,11 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas
*/ */
private String managerOrgIdType; private String managerOrgIdType;
/**
* 项目名称
*/
private String name;
/** /**
* 项目代号 * 项目代号
*/ */
......
package com.yonde.dex.basic.entity.po; package com.yonde.dex.basic.entity.po;
import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedBy;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import java.util.Date; import java.util.Date;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.annotation.LastModifiedDate;
import com.yonde.dex.dao.entity.base.IdEntity; import com.yonde.dex.dao.entity.base.IdEntity;
import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedBy;
import javax.persistence.Column; import javax.persistence.Column;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded; import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import lombok.Data; import lombok.Data;
import com.yonde.dex.basedata.entity.annotation.*; import com.yonde.dex.basedata.entity.annotation.*;
import java.math.BigInteger; import java.math.BigInteger;
import javax.persistence.*; import javax.persistence.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Embedded; import javax.persistence.Embedded;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable; import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
import com.yonde.dex.dao.entity.base.IdEntity; import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column; import javax.persistence.Column;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder; import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable; import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder; import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
...@@ -34,17 +44,17 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable; ...@@ -34,17 +44,17 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity; import com.yonde.dex.dao.entity.base.IdOnlyEntity;
/** /**
* @description: ExtProgram-PO实体 * @description: ExtProgram-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-9-9 11:04:24 * @date: 2024-9-11 9:52:59
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@Data @Data
@Table(name = "EXT_PROGRAM") @Table(name = "EXT_PROGRAM")
public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxSecretHolder{ public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder, DxLifecycleManageBaseHolder, IdEntity, DxSecretHolder {
/** /**
* 扩展PO属性 * 扩展PO属性
...@@ -110,6 +120,10 @@ public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxL ...@@ -110,6 +120,10 @@ public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxL
* 主管部门的类型 * 主管部门的类型
*/ */
private String managerOrgIdType; private String managerOrgIdType;
/**
* 项目名称
*/
private String name;
/** /**
* 项目代号 * 项目代号
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment