anderx 3 днів тому
батько
коміт
4faf634b7d

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

@@ -893,8 +893,15 @@
     </select>
 
     <select id="listPublicStatistics" resultType="com.goafanti.weChat.bo.OutPublicStatistics">
-        select y.aid,y.bh,y.dk,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.dk)dk,sum(x.duration)duration
-        from (select a.aid, if(a.status=0,1,0)bh ,if(a.status=1,1,0)wsh,if(a.status=2,1,0)tg,b.dk ,if(a.status=2,a.duration,0)duration
+        select y.aid,y.bh,y.dk,y.wsh,y.tg,y.xds,y.duration,c.name
+        from(select x.aid ,sum(x.bh)bh,sum(x.wsh)wsh,sum(x.tg)tg,sum(x.xds)xds,
+        sum(x.dk)dk,sum(x.duration)duration
+        from (select a.aid, b.dk ,
+        if(a.status=0,1,0)bh ,
+        if(a.status=1,1,0)wsh,
+        if(a.status=2 and a.type &lt; 5,1,0)tg,
+        if(a.status=2 and (a.type=5 or a.type=6),1,0)xds,
+        if(a.status=2,a.duration,0)duration
         from public_release a left join admin c on a.aid =c.id
         inner join (select prid ,sum(if(clock_in=1,1,0))dk from public_release_details where 1=1
         <if test="clockStart != null and clockEnd != null">

+ 3 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicStatistics.java

@@ -7,8 +7,11 @@ public class OutPublicStatistics {
 	@Excel(name = "公出人员")
 	private String name;
 	private String aid;
+	@Excel(name = "非公出协单次数")
+	private Integer xds;
 	@Excel(name = "公出次数")
 	private Integer tg;
+
 	@Excel(name = "打卡次数")
 	private Integer dk;
 	@Excel(name = "总时长")