分析算法更新--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchSaveOrUpdateDTO.java

@@ -87,7 +87,6 @@ public class AnalysisLineBatchSaveOrUpdateDTO {
         @ApiModelProperty("检查人")
         private String checkBy;
 
-
         @ApiModelProperty("检查起始里程")
         private BigDecimal startingMileage;
 

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml

@@ -30,7 +30,8 @@
 
     <select id="queryPageEkPatrolList" resultType="org.jeecg.modules.diseaseAnalysis.vo.EkRecordPatrolMasterVO">
         SELECT
-        t.*
+        t.*,
+        t.inspect_time as checkTime
         FROM
         t_xd_record_patrol_master t
         WHERE

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/EkRecordPatrolMasterVO.java

@@ -48,9 +48,8 @@ public class EkRecordPatrolMasterVO {
     private String workCode;
 
     @ApiModelProperty("检查日期")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date inspectTime;
+    private Date checkTime;
 
     @ApiModelProperty("天气")
     private String weather;
@@ -91,24 +90,6 @@ public class EkRecordPatrolMasterVO {
     @ApiModelProperty("检查人姓名")
     private String checkBy;
 
-    @ApiModelProperty("清点时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
-    private Date checkTime;
-
-    @ApiModelProperty("销点时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd hh:mm")
-    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm")
-    private Date pinpointTime;
-
-    @ApiModelProperty("审核人姓名")
-    private String verifyBy;
-
-    @ApiModelProperty("审核时间")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date verifyTime;
-
     @ApiModelProperty("巡道员备忘录")
     private String remark;