Sfoglia il codice sorgente

【CHG】修改查询条件

zhaomn 2 anni fa
parent
commit
61d90f72a5

+ 4 - 4
railway-business/src/main/java/com/railway/business/bi/domain/vo/TestPlanDtQuery.java

@@ -37,22 +37,22 @@ public class TestPlanDtQuery implements Serializable {
   @ApiModelProperty(value = "计划试验日期起始")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate testPlanDateStart;
+  private LocalDate testPlanDate_Start;
 
   @ApiModelProperty(value = "计划试验日期结束")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate testPlanDateEnd;
+  private LocalDate testPlanDate_End;
 
   @ApiModelProperty(value = "完成日期起始")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate completionDateStart;
+  private LocalDate completionDate_Start;
 
   @ApiModelProperty(value = "完成日期结束")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate completionDateEnd;
+  private LocalDate completionDate_End;
 
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;

+ 4 - 9
railway-business/src/main/java/com/railway/business/bi/domain/vo/TestPlanKgQuery.java

@@ -1,6 +1,5 @@
 package com.railway.business.bi.domain.vo;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,28 +33,24 @@ public class TestPlanKgQuery implements Serializable {
   private String substationName;
 
   @ApiModelProperty(value = "计划时间开始")
-  @JSONField(name = "testPlanDate_Start")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate testPlanDateStart;
+  private LocalDate testPlanDate_Start;
 
   @ApiModelProperty(value = "计划时间结束")
-  @JSONField(name = "testPlanDate_End")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate testPlanDateEnd;
+  private LocalDate testPlanDate_End;
 
   @ApiModelProperty(value = "实际时间开始")
-  @JSONField(name = "completionDate_Start")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate completionDateStart;
+  private LocalDate completionDate_Start;
 
   @ApiModelProperty(value = "实际时间结束")
-  @JSONField(name = "completionDate_End")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate completionDateEnd;
+  private LocalDate completionDate_End;
 
   @ApiModelProperty(value = "导入文件记录ID")
   private Long fileId;