Commit 71de67e8 authored by litengwei's avatar litengwei

双规小程序接口

parent 7111bcb7
package com.yeejoin.amos.patrol.core.common.response; package com.yeejoin.amos.patrol.core.common.response;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -24,23 +25,25 @@ public class AppPointCheckRespone { ...@@ -24,23 +25,25 @@ public class AppPointCheckRespone {
private Date checkTime; private Date checkTime;
private Date beginTime;
private Date endTime; private String beginTime;
public Date getBeginTime() {
private String endTime;
public String getBeginTime() {
return beginTime; return beginTime;
} }
public void setBeginTime(Date beginTime) { public void setBeginTime(String beginTime) {
this.beginTime = beginTime; this.beginTime = beginTime;
} }
public Date getEndTime() { public String getEndTime() {
return endTime; return endTime;
} }
public void setEndTime(Date endTime) { public void setEndTime(String endTime) {
this.endTime = endTime; this.endTime = endTime;
} }
......
...@@ -24,26 +24,26 @@ public class PointCheckDetailBo { ...@@ -24,26 +24,26 @@ public class PointCheckDetailBo {
private Date checkTime; private Date checkTime;
private Date beginTime; private String beginTime;
public Date getBeginTime() { private String endTime;
public String getBeginTime() {
return beginTime; return beginTime;
} }
public void setBeginTime(Date beginTime) { public void setBeginTime(String beginTime) {
this.beginTime = beginTime; this.beginTime = beginTime;
} }
public Date getEndTime() { public String getEndTime() {
return endTime; return endTime;
} }
public void setEndTime(Date endTime) { public void setEndTime(String endTime) {
this.endTime = endTime; this.endTime = endTime;
} }
private Date endTime;
private long checkId; private long checkId;
private String checkRemark; private String checkRemark;
......
...@@ -667,8 +667,14 @@ ...@@ -667,8 +667,14 @@
ppt.route_id routeId, ppt.route_id routeId,
ppl.name planName, ppl.name planName,
ppt.begin_time checkTime, ppt.begin_time checkTime,
ppt.begin_time beginTime, date_format(
ppt.end_time endTime, ppt.begin_time,
'%Y-%m-%d %H:%i:%s'
) beginTime,
date_format(
ppt.end_time,
'%Y-%m-%d %H:%i:%s'
) endTime,
ppl.dept_id checkDepartmentId, ppl.dept_id checkDepartmentId,
ppt.user_id userId, ppt.user_id userId,
ppt.user_name userName, ppt.user_name userName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment