Commit cb7fba85 authored by wangqiang's avatar wangqiang

季报和行动项功能开发

parent de36b4cb
package com.yonde.dcs.plan.common.vo; package com.yonde.dcs.plan.common.vo;
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;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore; 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.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded; import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
import com.yonde.dex.basedata.entity.annotation.ReferenceProperty; import lombok.Data;
import com.yonde.dex.basedata.entity.annotation.VersionProperty; import com.yonde.dex.basedata.entity.annotation.*;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference;
import com.yonde.dex.basedata.entity.data.VersionRelationType; import com.yonde.dex.basedata.entity.data.VersionRelationType;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable; import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
import com.yonde.dex.basedata.entity.vo.IdVO; import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable; import com.yonde.dcs.plan.common.vo.ExtQuarterlyReportVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder; import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.user.common.vo.DxUserInfoVO; import com.yonde.dex.user.common.vo.DxUserInfoVO;
import lombok.Data; import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
import lombok.EqualsAndHashCode; import com.yonde.dex.basedata.entity.users.DxUserVO;
import lombok.ToString;
import java.time.LocalDateTime;
/** /**
* @description: ExtActionItem-VO * @description: ExtActionItem-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-11-5 10:16:11 * @date: 2024-11-5 11:10:05
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtActionItemVO.class) @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtActionItemVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -52,6 +72,10 @@ public class ExtActionItemVO extends IdOnlyVO implements IdVO ,DxLifecycleManage ...@@ -52,6 +72,10 @@ public class ExtActionItemVO extends IdOnlyVO implements IdVO ,DxLifecycleManage
public static final String PROJECT_SOURCE_PROP_NAME = "projectSource"; public static final String PROJECT_SOURCE_PROP_NAME = "projectSource";
public static final String REAL_COMPLETE_TIME_PROP_NAME = "realCompleteTime"; public static final String REAL_COMPLETE_TIME_PROP_NAME = "realCompleteTime";
public static final String SERIAL_NUMBER_PROP_NAME = "serialNumber"; public static final String SERIAL_NUMBER_PROP_NAME = "serialNumber";
public static final String TASK_RELEASE_DATE_PROP_NAME = "taskReleaseDate";
public static final String TASK_RELEASE_PERSON_PROP_NAME = "taskReleasePerson";
public static final String TASK_RELEASE_PERSON_ID_PROP_NAME = "taskReleasePersonId";
public static final String TASK_RELEASE_PERSON_ID_TYPE_PROP_NAME = "taskReleasePersonIdType";
/** /**
* 扩展VO属性 * 扩展VO属性
...@@ -155,6 +179,28 @@ public class ExtActionItemVO extends IdOnlyVO implements IdVO ,DxLifecycleManage ...@@ -155,6 +179,28 @@ public class ExtActionItemVO extends IdOnlyVO implements IdVO ,DxLifecycleManage
*/ */
private String serialNumber; private String serialNumber;
/**
* 任务启动时间
*/
private LocalDateTime taskReleaseDate;
/**
* 任务发布人
*/
@ReferenceProperty(baseProperty = "taskReleasePersonId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO taskReleasePerson;
/**
* 任务发布人
*/
private Long taskReleasePersonId;
/**
* 任务发布人
*/
private String taskReleasePersonIdType;
} }
package com.yonde.dcs.plan.entity.po; package com.yonde.dcs.plan.entity.po;
import com.yonde.dex.basedata.entity.annotation.DexEmbedded; import org.springframework.data.annotation.CreatedBy;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable; 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 com.yonde.dex.dao.entity.base.IdEntity;
import com.yonde.dex.dao.entity.base.IdOnlyEntity; import org.springframework.data.annotation.LastModifiedBy;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable; import javax.persistence.Column;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder; import org.springframework.data.annotation.CreatedDate;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable; import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; 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 lombok.NoArgsConstructor;
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 java.time.LocalDateTime; 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;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
/** /**
* @description: ExtActionItem-PO实体 * @description: ExtActionItem-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-11-5 10:16:11 * @date: 2024-11-5 11:10:05
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -104,6 +118,18 @@ public class ExtActionItem extends IdOnlyEntity implements DxObjFileLinkHolder , ...@@ -104,6 +118,18 @@ public class ExtActionItem extends IdOnlyEntity implements DxObjFileLinkHolder ,
* 序号,只有项目进展类型有 * 序号,只有项目进展类型有
*/ */
private String serialNumber; private String serialNumber;
/**
* 任务启动时间
*/
private LocalDateTime taskReleaseDate;
/**
* 任务发布人的id
*/
private Long taskReleasePersonId;
/**
* 任务发布人的类型
*/
private String taskReleasePersonIdType;
} }
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