Просмотр исходного кода

气瓶小程序配送bug修改

xuxiaofei лет назад: 2
Родитель
Сommit
b02fb79845

+ 10 - 7
zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/domain/QpTaskDetail.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 qp_task_detail
- * 
+ *
  * @author zd
  * @date 2022-05-11
  */
@@ -86,31 +86,34 @@ public class QpTaskDetail extends BaseEntity
     @ApiModelProperty(value = "处理时间")
     private Date disposeTime;
 
-    public void setId(Long id) 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date disposeTime2;
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
 
-    public void setTaskId(Long taskId) 
+    public void setTaskId(Long taskId)
     {
         this.taskId = taskId;
     }
 
-    public Long getTaskId() 
+    public Long getTaskId()
     {
         return taskId;
     }
-    public void setBottleNumber(Long bottleNumber) 
+    public void setBottleNumber(Long bottleNumber)
     {
         this.bottleNumber = bottleNumber;
     }
 
-    public Long getBottleNumber() 
+    public Long getBottleNumber()
     {
         return bottleNumber;
     }

+ 2 - 2
zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTaskDetailMapper.xml

@@ -47,7 +47,7 @@
 
 
     <sql id="selectQpTaskDetailVo">
-        select id, air_bottle_config_id, task_id, bottle_number, qp_status, apply_describe, supplier_id, car_id, car_number, transport_id, transport_name, is_dispose, dispose_user, dispose_userid, dispose_time, create_time from qp_task_detail
+        select id, air_bottle_config_id, task_id, bottle_number, qp_status, apply_describe, supplier_id, car_id, car_number, transport_id, transport_name, is_dispose, dispose_user, dispose_userid, dispose_time, dispose_time disposeTime2, create_time from qp_task_detail
     </sql>
 
     <sql id="selectQpTaskDetailListVo">
@@ -312,4 +312,4 @@
         ORDER BY t.back_time desc
     </select>
 
-</mapper>
+</mapper>