Browse Source

项目日志新增字段 reporterId

jihs 4 years ago
parent
commit
0027e85599

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

@@ -29,6 +29,8 @@ public class ProWorkLogicAddReqDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endDate;
+    @ApiModelProperty("汇报人id")
+    private String reporterId;
     @ApiModelProperty("汇报人")
     private String reporter;
     @ApiModelProperty("里程碑id")

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

@@ -31,6 +31,8 @@ public class ProWorkLogicRespDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endDate;
+     @ApiModelProperty("汇报人id")
+     private String reporterId;
     @ApiModelProperty("汇报人")
     private String reporter;
     @ApiModelProperty("里程碑id")
@@ -54,6 +56,7 @@ public class ProWorkLogicRespDTO {
          this.proName = proWorkLogic.getProName();
          this.startDate = proWorkLogic.getStartDate();
          this.endDate = proWorkLogic.getEndDate();
+         this.reporterId = proWorkLogic.getReporterId();
          this.reporter = proWorkLogic.getReporter();
          this.milesId = proWorkLogic.getMilesId();
          this.milesName = proWorkLogic.getMilesName();

+ 1 - 0
src/main/java/org/jeecg/modules/prowork/controller/ProWorkLogicController.java

@@ -101,6 +101,7 @@ public class ProWorkLogicController {
 			 @ApiImplicitParam(name="proName", value="项目名称",required=false, dataType="String"),
 			 @ApiImplicitParam(name="startDate", value="开始日期",required=false, dataType="String"),
 			 @ApiImplicitParam(name="endDate", value="结束日期",required=false, dataType="String"),
+			 @ApiImplicitParam(name="reporterId", value="汇报人id",required=false, dataType="String"),
 			 @ApiImplicitParam(name="reporter", value="汇报人",required=false, dataType="String"),
 			 @ApiImplicitParam(name="milesId", value="里程碑id",required=false, dataType="String"),
 			 @ApiImplicitParam(name="milesName", value="里程碑(计划)",required=false, dataType="String"),

+ 3 - 0
src/main/java/org/jeecg/modules/prowork/entity/ProWorkLogic.java

@@ -41,6 +41,8 @@ public class ProWorkLogic implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date endDate;
+	@ApiModelProperty("汇报人id")
+	private String reporterId;
 	@ApiModelProperty("汇报人")
 	private String reporter;
 	@ApiModelProperty("里程碑id")
@@ -78,6 +80,7 @@ public class ProWorkLogic implements Serializable {
 		this.proName = reqDTO.getProName();
 		this.startDate = reqDTO.getStartDate();
 		this.endDate = reqDTO.getEndDate();
+		this.reporterId = reqDTO.getReporterId();
 		this.reporter = reqDTO.getReporter();
 		this.milesId = reqDTO.getMilesId();
 		this.milesName = reqDTO.getMilesName();