Administrator 4 years ago
parent
commit
546264d8a5

+ 7 - 0
src/main/java/com/goafanti/admin/bo/OutPublicReleaseList.java

@@ -12,6 +12,7 @@ public class OutPublicReleaseList {
 	private String latitude;
 	private String longitude; 
 	private Integer status;
+	private Integer clockIn;
 	public String getId() {
 		return id;
 	}
@@ -72,5 +73,11 @@ public class OutPublicReleaseList {
 	public void setLongitude(String longitude) {
 		this.longitude = longitude;
 	}
+	public Integer getClockIn() {
+		return clockIn;
+	}
+	public void setClockIn(Integer clockIn) {
+		this.clockIn = clockIn;
+	}
 	
 }

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -484,7 +484,7 @@
   <select id="listPublicRelease" resultType="com.goafanti.admin.bo.OutPublicReleaseList">
 select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
 date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
-a.latitude ,a.longitude 
+a.latitude ,a.longitude ,a.clock_in clockIn 
 from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
 	where 1=1
 	<if test="type==0">