Procházet zdrojové kódy

公出统计修改

Administrator před 4 roky
rodič
revize
5b9ecf82b6

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

@@ -3,6 +3,7 @@ package com.goafanti.admin.bo;
 public class OutPublicStatistics {
 
 	private String name;
+	private String aid;
 	private Integer tg;
 	private Integer wsh;
 	private Integer bh;
@@ -37,6 +38,12 @@ public class OutPublicStatistics {
 	public void setDuration(Double duration) {
 		this.duration = duration;
 	}
+	public String getAid() {
+		return aid;
+	}
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
 	
 	
 }

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

@@ -534,9 +534,9 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
   </select>
   
   <select id="listPublicStatistics" resultType="com.goafanti.admin.bo.OutPublicStatistics">
-  	select y.name,y.bh,y.wsh,y.tg,y.duration from(select x.name ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.duration)duration 
+  	select y.aid,y.bh,y.wsh,y.tg,y.duration,c.name from(select x.aid ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.duration)duration 
 	from (select if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,a.aid 
-  	,if(a.status=2,a.duration,0)duration,b.name    from  public_release a  left join admin b on a.aid=b.id
+  	,if(a.status=2,a.duration,0)duration    from  public_release a  left join admin b on a.aid=b.id
 	where 1=1
 	<if test="aid != null">
 	and a.aid= #{aid}
@@ -550,7 +550,7 @@ a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,
 	<if test="depId != null">
 	and b.department_id = #{depId}
 	</if>
-	)x  group by name)y 
+	)x  group by x.aid)y left join admin c on c.id=y.aid
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>