Browse Source

更新日志档案

jihs 4 years ago
parent
commit
2956809c8d

+ 2 - 0
src/main/java/org/jeecg/common/dto/prowork/ProWorkLogicContentAddReqDTO.java

@@ -9,6 +9,8 @@ import lombok.Data;
 public class ProWorkLogicContentAddReqDTO {
     @ApiModelProperty("日志id")
     private String logicId;
+    @ApiModelProperty("项目档案计划id")
+    private String proPlanId;
     @ApiModelProperty("项目档案id")
     private String proArchivesId;
     @ApiModelProperty("项目档案里程碑")

+ 3 - 0
src/main/java/org/jeecg/common/dto/prowork/ProWorkLogicContentListRespDTO.java

@@ -16,6 +16,8 @@ public class ProWorkLogicContentListRespDTO {
     private String id;
     @ApiModelProperty("日志id")
     private String logicId;
+     @ApiModelProperty("项目档案计划id")
+     private String proPlanId;
     @ApiModelProperty("项目档案id")
     private String proArchivesId;
     @ApiModelProperty("项目档案里程碑")
@@ -31,6 +33,7 @@ public class ProWorkLogicContentListRespDTO {
     public ProWorkLogicContentListRespDTO(ProWorkLogicContent proWorkLogicContent ) {
         this.id = proWorkLogicContent.getId();
         this.logicId = proWorkLogicContent.getLogicId();
+        this.proPlanId = proWorkLogicContent.getProPlanId();
         this.proArchivesId = proWorkLogicContent.getProArchivesId();
         this.proArchivesMilestone = proWorkLogicContent.getProArchivesMilestone();
         this.content = proWorkLogicContent.getContent();

+ 3 - 2
src/main/java/org/jeecg/modules/prowork/entity/ProWorkLogicContent.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.prowork.entity;
 
 import java.io.Serializable;
 import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -12,7 +11,6 @@ import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.dto.prowork.ProWorkLogicContentAddReqDTO;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 
 /**
  * @Description: 日志详情(实施,开发,服务)
@@ -28,6 +26,8 @@ public class ProWorkLogicContent implements Serializable {
 	@ApiModelProperty("id")
 	@TableId(type = IdType.UUID)
 	private String id;
+	@ApiModelProperty("项目档案计划id")
+	private String proPlanId;
 	@ApiModelProperty("日志id")
 	private String logicId;
 	@ApiModelProperty("项目档案id")
@@ -60,6 +60,7 @@ public class ProWorkLogicContent implements Serializable {
 
 	public ProWorkLogicContent(ProWorkLogicContentAddReqDTO detail) {
 		this.logicId = detail.getLogicId();
+		this.proPlanId = detail.getProPlanId();
 		this.proArchivesId = detail.getProArchivesId();
 		this.proArchivesMilestone = detail.getProArchivesMilestone();
 		this.content = detail.getContent();