Sfoglia il codice sorgente

公出详情列表字段增加

Administrator 4 anni fa
parent
commit
7aeb0a5549

+ 17 - 3
src/main/java/com/goafanti/admin/bo/OutPublicDtails.java

@@ -6,9 +6,11 @@ public class OutPublicDtails {
 	private String userName;
 	private String aname;
 	private String duration;
-	private String status;
+	private Integer status;
 	private String releaseStarts;
 	private String releaseEnds;
+	private String annexUrl;
+	private String photoUrl;
 	public String getNickname() {
 		return nickname;
 	}
@@ -33,10 +35,10 @@ public class OutPublicDtails {
 	public void setDuration(String duration) {
 		this.duration = duration;
 	}
-	public String getStatus() {
+	public Integer getStatus() {
 		return status;
 	}
-	public void setStatus(String status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
 	public String getReleaseStarts() {
@@ -51,5 +53,17 @@ public class OutPublicDtails {
 	public void setReleaseEnds(String releaseEnds) {
 		this.releaseEnds = releaseEnds;
 	}
+	public String getAnnexUrl() {
+		return annexUrl;
+	}
+	public void setAnnexUrl(String annexUrl) {
+		this.annexUrl = annexUrl;
+	}
+	public String getPhotoUrl() {
+		return photoUrl;
+	}
+	public void setPhotoUrl(String photoUrl) {
+		this.photoUrl = photoUrl;
+	}
 
 }

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

@@ -576,7 +576,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   </select>
   
   <select id="listPublicDtails" resultType="com.goafanti.admin.bo.OutPublicDtails">
-  select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,
+  select b.nickname ,a.user_name userName,c.name aname,a.duration ,a.status,a.annex_url annexUrl,a.photo_url photoUrl,
 	date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds
 	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

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -73,7 +73,7 @@ wx.appSecret=081744369d42405be58fe37f892631f7
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.74
+static.host=//static.jishutao.com/1.1.75
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.74
+static.host=//static.jishutao.com/1.1.75
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload