检测时间

huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java

@@ -66,7 +66,6 @@ public class BillCleanController {
         if (type.equals("1")){
             return new Result(ResultCode.SUCCESS,billCleanService.getById(paramsMap.get("id")));
         }else {
-            //TODO 烘干
             return new Result(ResultCode.SUCCESS,billDryService.getById(paramsMap.get("id")));
         }
 

huimv-admin/src/main/java/com/huimv/admin/entity/vo/CleanAndDryVo.java

@@ -23,5 +23,8 @@ public class CleanAndDryVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime subDate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private LocalDateTime passDate;
+
     private Integer type;
 }

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml

@@ -23,7 +23,7 @@
     </resultMap>
 
     <select id="listCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
-        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,pass_date,sub_date,1 AS 'type'
         FROM `bill_clean` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
         <if test="status != null">
             AND bill_status = #{status}
@@ -31,7 +31,7 @@
 
         UNION ALL
 
-        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,pass_date,sub_date,2 AS 'type'
         FROM `bill_dry` WHERE farm_id = #{farmId} AND vistit_type != 0 AND img_status = 1
         <if test="status != null">
             AND bill_status = #{status}
@@ -40,12 +40,12 @@
     </select>
 
     <select id="listPersonalCleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo">
-        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,1 AS 'type'
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,pass_date,1 AS 'type'
         FROM `bill_clean` WHERE admission_user_id = #{userId} AND vistit_type != 0 AND img_status = 1
 
         UNION ALL
 
-        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,2 AS 'type'
+        SELECT id,car_num,bill_status,test_location,check_date,vistit_type,sub_date,pass_date,2 AS 'type'
         FROM `bill_dry` WHERE admission_user_id = #{userId} AND vistit_type != 0 AND img_status = 1
         ORDER BY sub_date DESC
     </select>