Skip to content

D
dex-basic-service-expand
Commit 7578b617 authored by wangyangyang's avatar wangyangyang
Browse files
Options

项目群加名称字段

parent 657b1811
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 93 deletions
dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramVO.java
View file @ 7578b617
......@@ -4,6 +4,7 @@ import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.ArrayList;
import cn.hutool.core.convert.Convert;
import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......@@ -12,16 +13,22 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
import com.yonde.dex.user.common.vo.DxUserInfoVO;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.math.BigInteger;
import org.springframework.data.annotation.Transient;
import lombok.experimental.Delegate;
import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.XmlAttribute;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
import lombok.Data;
......@@ -44,16 +51,16 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtProgram-VO
* @author: dexadmin
* @version: V
* @date: 2024-9-9 11:04:24
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
* @description: ExtProgram-VO
* @author: dexadmin
* @version: V
* @date: 2024-9-11 9:52:59
**/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@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_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
......@@ -73,135 +80,141 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBas
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_TYPE_PROP_NAME = "managerOrgIdType";
public static final String NAME_PROP_NAME = "name";
public static final String NUMBER_PROP_NAME = "number";
public static final String PRO_TYPE_PROP_NAME = "proType";
public static final String START_TIME_PROP_NAME = "startTime";
public static final String TOTAL_BUDGET_PROP_NAME = "totalBudget";
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
/**
* dao扩展对象
*/
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 外协项目预算总额
*/
* 外协项目预算总额
*/
private String budgetAmount;
/**
* 客户单位
*/
* 客户单位
*/
private String customUnit;
/**
* 计划结束时间
*/
* 计划结束时间
*/
private LocalDateTime endTime;
/**
* 项目群项目关联link集合
*/
* 项目群项目关联link集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private List<ExtProgramProjectLinkVO> extProgramProjectLinks;
/**
* 经费来源
*/
* 经费来源
*/
private String fundSource;
/**
* 负责人
*/
* 负责人
*/
@ReferenceProperty(baseProperty = "headerId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO header;
/**
* 负责人
*/
* 负责人
*/
private Long headerId;
/**
* 负责人
*/
* 负责人
*/
private String headerIdType;
/**
* 项目主管
*/
* 项目主管
*/
@ReferenceProperty(baseProperty = "managerId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO manager;
/**
* 项目主管
*/
* 项目主管
*/
private Long managerId;
/**
* 项目主管
*/
* 项目主管
*/
private String managerIdType;
/**
* 主管部门
*/
* 主管部门
*/
@ReferenceProperty(baseProperty = "managerOrgId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxOrganizationVO managerOrg;
/**
* 主管部门
*/
* 主管部门
*/
private Long managerOrgId;
/**
* 主管部门
*/
* 主管部门
*/
private String managerOrgIdType;
/**
* 项目代号
*/
* 项目名称
*/
private String name;
/**
* 项目代号
*/
private String number;
/**
* 项目类型
*/
* 项目类型
*/
private String proType;
/**
* 计划开始时间
*/
* 计划开始时间
*/
private LocalDateTime startTime;
/**
* 总经费
*/
* 总经费
*/
private String totalBudget;
}
......
dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/entity/po/ExtProgram.java
View file @ 7578b617
package com.yonde.dex.basic.entity.po;
import org.springframework.data.annotation.CreatedBy;
import javax.persistence.UniqueConstraint;
import java.util.Date;
import java.time.LocalDateTime;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.LastModifiedDate;
import com.yonde.dex.dao.entity.base.IdEntity;
import org.springframework.data.annotation.LastModifiedBy;
import javax.persistence.Column;
import org.springframework.data.annotation.CreatedDate;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import lombok.Data;
import com.yonde.dex.basedata.entity.annotation.*;
import java.math.BigInteger;
import javax.persistence.*;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
......@@ -34,97 +44,101 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
/**
* @description: ExtProgram-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-9-9 11:04:24
**/
* @description: ExtProgram-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-9-11 9:52:59
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@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属性
*/
@DexEmbedded()
@Embedded()
private DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable;
/**
* 扩展PO属性
*/
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
/**
* dao扩展对象
*/
* dao扩展对象
*/
@DexEmbedded()
@Embedded()
private DxIdEntityEmbeddable dxIdEmbeddable;
/**
* 扩展PO属性
*/
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 外协项目预算总额
*/
* 外协项目预算总额
*/
private String budgetAmount;
/**
* 客户单位
*/
* 客户单位
*/
private String customUnit;
/**
* 计划结束时间
*/
* 计划结束时间
*/
private LocalDateTime endTime;
/**
* 经费来源
*/
* 经费来源
*/
private String fundSource;
/**
* 负责人的id
*/
* 负责人的id
*/
private Long headerId;
/**
* 负责人的类型
*/
* 负责人的类型
*/
private String headerIdType;
/**
* 项目主管的id
*/
* 项目主管的id
*/
private Long managerId;
/**
* 项目主管的类型
*/
* 项目主管的类型
*/
private String managerIdType;
/**
* 主管部门的id
*/
* 主管部门的id
*/
private Long managerOrgId;
/**
* 主管部门的类型
*/
* 主管部门的类型
*/
private String managerOrgIdType;
/**
* 项目代号
*/
* 项目名称
*/
private String name;
/**
* 项目代号
*/
private String number;
/**
* 项目类型
*/
* 项目类型
*/
private String proType;
/**
* 计划开始时间
*/
* 计划开始时间
*/
private LocalDateTime startTime;
/**
* 总经费
*/
* 总经费
*/
private String totalBudget;
}
......
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