anderx лет назад: 5
Родитель
Сommit
e8148147c5

+ 13 - 7
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1875,7 +1875,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	</if>
 	where a.split_status in (0,2) and a.task_status in (1,2,3)
 	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
-	<if test="screen ==1">
+	<if test="screen ==0">
 	and a.status in(0,1,2,3,5)
 	</if>
 	<if test="screen ==2">
@@ -1890,6 +1890,9 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	<if test="screen ==5">
 	and a.spot_check_status =1
 	</if>	
+	<if test="screen ==12">
+	and a.publicity_time is not null
+	</if>
     <if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>
@@ -1962,8 +1965,8 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	where apply_count &gt; 0)tj on a.id=tj.tid
 	</if>
 	where a.split_status in (0,2) and a.task_status in (1,2,3)
-	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 -->
-	<if test="screen ==1">
+	<!--  筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数 -->
+	<if test="screen ==0">
 	and a.status in(0,1,2,3,5)
 	</if>
 	<if test="screen ==2">
@@ -1977,7 +1980,10 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	</if>	
 	<if test="screen ==5">
 	and a.spot_check_status =1
-	</if>	
+	</if>
+	<if test="screen ==12">
+	and a.publicity_time is not null
+	</if>		
   <if test="startDate != null and endDate != null">
   	and a.task_distribution_time between #{startDate} and #{endDate}
   	</if>
@@ -2034,7 +2040,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	ifnull(x.sqs,0)applyCount ,ifnull(x.bhs,0)rejectCount ,ifnull(x.xzs,0) certificatesCount,
 	</if>
 	<if test="status==0">
-	ifnull(x.wcs,0) completeCount, ifnull(x.lxs,0) setUpCount,
+	ifnull(x.wcs,0) completeCount, ifnull(x.gss,0) publicityCount,
 	</if>
 	x.amountCount,x.costAmount,x.profit
 	from (select dep.province, ad.department_id,bp.cid ,sum(kcs.cq) kcs,sum(pds.cq)pds,
@@ -2051,7 +2057,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	sum(tj.sqs) sqs,sum(tj.bhs) bhs,sum(tj.xzs) xzs,
 	</if>
 	<if test="status==0">
-	sum(wcs.cq)wcs, sum(lxs.cq)lxs,
+	sum(wcs.cq)wcs, sum(gss.cq)gss,
 	</if>
 	sum(a.commodity_price)amountCount,sum(ttm.cost_amount)costAmount, (sum(a.commodity_price)-sum(ttm.cost_amount))profit
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join t_task_mid ttm on a.id=ttm.tid 
@@ -2078,7 +2084,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	</if>
 	<if test="status==0">
 	left join (select id,commodity_quantity cq from t_order_task where status in(4,6))wcs on a.id=wcs.id
-	left join (select id,commodity_quantity cq from t_order_task where  set_up_status =1)lxs on a.id=lxs.id
+	left join (select id,commodity_quantity cq from t_order_task where  publicity_time is not null)gss on a.id=gss.id
 	</if>
 	where  b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
 	<if test="startDate != null and endDate != null">

+ 11 - 0
src/main/java/com/goafanti/order/bo/OutProvincialStatistics.java

@@ -62,6 +62,8 @@ public class OutProvincialStatistics {
 	private Integer certificatesCount;
 	/** 申请数 */
 	private Integer	applyCount;
+	/** 公示数 */
+	private Integer	publicityCount;
 	
 	private BigDecimal amountCount;
 	
@@ -70,6 +72,7 @@ public class OutProvincialStatistics {
 	private BigDecimal profit;
 	
 	
+	
 
 	
 	
@@ -211,6 +214,14 @@ public class OutProvincialStatistics {
 	public void setApplyCount(Integer applyCount) {
 		this.applyCount = applyCount;
 	}
+
+	public Integer getPublicityCount() {
+		return publicityCount;
+	}
+
+	public void setPublicityCount(Integer publicityCount) {
+		this.publicityCount = publicityCount;
+	}
 	
 	
 	

+ 2 - 1
src/main/webapp/WEB-INF/web.xml

@@ -1,4 +1,5 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
          http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
 
 	<display-name>AFT</display-name>