Merge remote-tracking branch 'origin/develop' into develop

src/custom/restcontroller/sale/salestarget/SQL/企业-业绩目标完成列表.sql

@@ -45,7 +45,9 @@ SELECT DISTINCT m.year,
                 m11.target_l                               m11l,
                 m11.target_h                               m11h,
                 m12.target_l                               m12l,
-                m12.target_h                               m12h
+                m12.target_h                               m12h,
+                ROUND(ifnull(t5.sumamount_year,0)/10000,2) sumamount_year,
+                ROUND(ifnull(t6.sumamount_currentmonth,0)/10000,2) sumamount_currentmonth
 from sa_salestarget m
          LEFT JOIN sa_salestarget m1 ON m1.year = m.year and m1.point = 1 and m.sys_enterpriseid = m1.sys_enterpriseid
          LEFT JOIN sa_salestarget m2 ON m2.year = m.year and m2.point = 2 and m.sys_enterpriseid = m2.sys_enterpriseid
@@ -63,4 +65,8 @@ from sa_salestarget m
          LEFT JOIN sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid
          LEFT JOIN sys_enterprise_tradefield t3 on t1.sys_enterpriseid=t3.sys_enterpriseid and t1.siteid=t3.siteid
          LEFT JOIN sa_salearea t4 on t3.sa_saleareaid=t4.sa_saleareaid and t3.siteid=t4.siteid
-ORDER BY m.year desc
+         left join (select * from(select  sys_enterpriseid,siteid,DATE_FORMAT(checkdate,'%Y') date,sum(amount) sumamount_year from sa_cashbill where type=1 group by sys_enterpriseid,siteid,DATE_FORMAT(checkdate,'%Y')) t
+                    where  DATE_FORMAT(NOW(), '%Y')=date) t5 on t1.sys_enterpriseid=t5.sys_enterpriseid and t1.siteid=t5.siteid
+         left join (select * from(select  sys_enterpriseid,siteid,DATE_FORMAT(checkdate,'%Y-%m') date,sum(amount) sumamount_currentmonth from sa_cashbill where type=1 group by sys_enterpriseid,siteid,DATE_FORMAT(checkdate,'%Y-%m')) t
+                    where  DATE_FORMAT(NOW(), '%Y-%m')=date) t6 on t1.sys_enterpriseid=t6.sys_enterpriseid and t1.siteid=t6.siteid
+ORDER BY m.year desc,ROUND(ifnull(t6.sumamount_currentmonth,0)/10000,2) desc

src/custom/restcontroller/sale/salestarget/SQL/企业-出货.sql

@@ -1,39 +1,33 @@
 with sa_salestarget as (
-    select 0+CAST(sum(amount) AS CHAR) amount,point,sys_enterpriseid,year from(SELECT  (t5.sumqty*t1.price) amount, MONTH (t2.createdate) point,ifnull(t2.sys_enterpriseid,0) sys_enterpriseid,YEAR(t2.createdate) year
+    select 0+CAST(sum(amount) AS CHAR) amount,point,sys_enterpriseid,year from(SELECT  (t5.qty*t1.price) amount, MONTH (t6.checkdate) point,ifnull(t2.sys_enterpriseid,0) sys_enterpriseid,YEAR(t6.checkdate) year
 FROM sa_orderitems t1
     LEFT JOIN sa_order t2 ON t1.sa_orderid=t2.sa_orderid AND t1.siteid=t2.siteid
 		left join sys_enterprise_tradefield t3 on t2.sys_enterpriseid=t3.sys_enterpriseid and t2.siteid=t3.siteid
 		left join sa_salearea t4 on t4.sa_saleareaid=t3.sa_saleareaid and t4.siteid=t3.siteid
- inner join (
-SELECT  t1.sa_orderitemsid,t1.siteid,
-        SUM(ifnull(t1.qty,0)) sumqty
-FROM st_stockbill_items t1
-         inner join st_stockbill t2 on t1.siteid = t2.siteid and t1.st_stockbillid = t2.st_stockbillid
-         inner join sa_orderitems t4 on t1.sa_orderitemsid=t4.sa_orderitemsid and t1.siteid = t4.siteid
-WHERE t2.STATUS ='审核' and $where1$ and t2.rb=1 group by t1.sa_orderitemsid,t1.siteid) t5 on t5.sa_orderitemsid=t1.sa_orderitemsid and t5.siteid=t1.siteid
-
-WHERE YEAR (t2.createdate)=$year$ and t2.sys_enterpriseid in $sys_enterpriseid$ AND t1.siteid=$siteid$) a
+        inner join st_stockbill_items t5 ON t5.sa_orderitemsid = t1.sa_orderitemsid AND t5.siteid = t1.siteid
+        inner join st_stockbill t6 ON t6.st_stockbillid = t5.st_stockbillid AND t6.siteid = t5.siteid
+WHERE YEAR (t6.checkdate)=$year$ and t2.sys_enterpriseid in $sys_enterpriseid$ AND t1.siteid=$siteid$ and t6.rb=1) a
 GROUP BY point,sys_enterpriseid,year
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-                ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-                ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-                ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-                ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-                ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-                ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-                ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-                ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-                ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-                ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-                ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-                ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+                ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+                ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+                ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+                ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+                ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+                ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+                ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+                ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+                ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+                ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+                ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+                ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestarget m
          LEFT JOIN sa_salestarget m1 ON m1.year = m.year and m1.point = 1 and m.sys_enterpriseid = m1.sys_enterpriseid
          LEFT JOIN sa_salestarget m2 ON m2.year = m.year and m2.point = 2 and m.sys_enterpriseid = m2.sys_enterpriseid

src/custom/restcontroller/sale/salestarget/SQL/企业-开票.sql

@@ -6,23 +6,23 @@ GROUP BY point,year,sys_enterpriseid
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-                ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-                ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-                ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-                ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-                ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-                ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-                ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-                ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-                ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-                ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-                ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-                ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+                ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+                ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+                ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+                ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+                ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+                ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+                ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+                ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+                ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+                ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+                ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+                ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestarget m
          LEFT JOIN sa_salestarget m1 ON m1.year = m.year and m1.point = 1 and m.sys_enterpriseid = m1.sys_enterpriseid
          LEFT JOIN sa_salestarget m2 ON m2.year = m.year and m2.point = 2 and m.sys_enterpriseid = m2.sys_enterpriseid

src/custom/restcontroller/sale/salestarget/SQL/企业-收款.sql

@@ -5,23 +5,23 @@ with sa_salestarget as (
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-                ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-                ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-                ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-                ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-                ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-                ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-                ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-                ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-                ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-                ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-                ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-                ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+                ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+                ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+                ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+                ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+                ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+                ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+                ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+                ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+                ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+                ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+                ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+                ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestarget m
          LEFT JOIN sa_salestarget m1 ON m1.year = m.year and m1.point = 1 and m.sys_enterpriseid = m1.sys_enterpriseid
          LEFT JOIN sa_salestarget m2 ON m2.year = m.year and m2.point = 2 and m.sys_enterpriseid = m2.sys_enterpriseid

src/custom/restcontroller/sale/salestarget/SQL/企业-订单.sql

@@ -6,23 +6,23 @@ GROUP BY point,year,sys_enterpriseid
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-                ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-                ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-                ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-                ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-                ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-                ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-                ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-                ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-                ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-                ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-                ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-                ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+                ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+                ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+                ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+                ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+                ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+                ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+                ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+                ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+                ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+                ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+                ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+                ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+                ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+                ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+                ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+                ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestarget m
          LEFT JOIN sa_salestarget m1 ON m1.year = m.year and m1.point = 1 and m.sys_enterpriseid = m1.sys_enterpriseid
          LEFT JOIN sa_salestarget m2 ON m2.year = m.year and m2.point = 2 and m.sys_enterpriseid = m2.sys_enterpriseid

src/custom/restcontroller/sale/salestarget/enterprise.java

@@ -113,6 +113,11 @@ public class enterprise extends Controller {
         if (assessmentindicators.equals("开票")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-开票");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(statisticaldimension.equals("订单审核")){
                 where1=where1+" and t2.status='审核' ";
             }else{
@@ -134,6 +139,11 @@ public class enterprise extends Controller {
         if (assessmentindicators.equals("订单")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-订单");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(statisticaldimension.equals("订单审核")){
                 where1=where1+" and t2.status='审核' ";
             }else{
@@ -155,6 +165,12 @@ public class enterprise extends Controller {
         if (assessmentindicators.equals("出货")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-出货");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
+
             if(StringUtils.isNotBlank(sa_accountclassids)){
                 if(isJSONArray(sa_accountclassids)){
                     JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
@@ -171,6 +187,11 @@ public class enterprise extends Controller {
         if (assessmentindicators.equals("收款")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-收款");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(StringUtils.isNotBlank(statisticaldimension)){
                 if(isJSONObject(statisticaldimension)){
                     JSONObject jsonObjectResult = JSONObject.parseObject(statisticaldimension);

src/custom/restcontroller/webmanage/sale/databoard/SQL/销售单量统计查询_月份.sql

@@ -1 +1 @@
-select  DATE_FORMAT(t1.checkdate,'%Y') y,DATE_FORMAT(t1.checkdate,'%m') m,CAST(count(1) AS DECIMAL(16,0)) typestatistics from sa_order t1 where t1.status not in('新建','提交') and t1.siteid =$siteid$ and $where$ and t1.checkdate >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR) group by DATE_FORMAT(t1.checkdate,'%Y'),DATE_FORMAT(t1.checkdate,'%m')
+select  DATE_FORMAT(t1.checkdate,'%Y') y,DATE_FORMAT(t1.checkdate,'%m') m,CAST(count(1) AS DECIMAL(16,0)) typestatistics from sa_order t1 where t1.status not in('新建','提交') and t1.siteid =$siteid$ and $where$ and year(t1.checkdate) >= year(DATE_SUB(CURDATE(), INTERVAL 1 YEAR))  group by DATE_FORMAT(t1.checkdate,'%Y'),DATE_FORMAT(t1.checkdate,'%m')

src/custom/restcontroller/webmanage/sale/databoard/SQL/销售额统计查询_月份.sql

@@ -1,2 +1,2 @@
-select  DATE_FORMAT(t1.checkdate,'%Y') y,DATE_FORMAT(t1.checkdate,'%m') m,cast(ifnull(sum(if(t2.isclose,t2.deliedqty*t2.price,t2.amount)),0) AS DECIMAL(16,6)) typestatistics  from sa_order t1 inner join sa_orderitems t2 on t1.sa_orderid=t2.sa_orderid and t1.siteid=t2.siteid where t1.siteid=$siteid$ and t1.status not in('新建','提交') and $where$ and t1.checkdate >= DATE_SUB(CURDATE(), INTERVAL 1 YEAR)  group by  DATE_FORMAT(t1.checkdate,'%Y'),DATE_FORMAT(t1.checkdate,'%m')
+select  DATE_FORMAT(t1.checkdate,'%Y') y,DATE_FORMAT(t1.checkdate,'%m') m,cast(ifnull(sum(if(t2.isclose,t2.deliedqty*t2.price,t2.amount)),0) AS DECIMAL(16,6)) typestatistics  from sa_order t1 inner join sa_orderitems t2 on t1.sa_orderid=t2.sa_orderid and t1.siteid=t2.siteid where t1.siteid=$siteid$ and t1.status not in('新建','提交') and $where$ and year(t1.checkdate) >= year(DATE_SUB(CURDATE(), INTERVAL 1 YEAR))  group by  DATE_FORMAT(t1.checkdate,'%Y'),DATE_FORMAT(t1.checkdate,'%m')
 

src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -788,7 +788,7 @@ public class dispatch extends Controller {
         RowsMap rowsMap = rowsOrderDetail.toRowsMap("sa_orderitemsid");
         Rows rowsDispatchDetail = dbConnect.runSqlQuery("select t1.qty,t1.sa_orderitemsid,t1.rowno,t2.itemname,t2.itemno from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid);
         Rows rowsDispatchDetailGroup = dbConnect.runSqlQuery("select sum(t1.qty) qty,t1.sa_orderitemsid,t1.siteid from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid + " group by t1.sa_orderitemsid,t1.siteid");
-        Rows rowsDispatchAllDetail = dbConnect.runSqlQuery("select sum(t1.outwarehouseqty) sumoutwarehouseqty,t1.sa_orderitemsid from sa_dispatch_items t1 inner join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid  where t2.status in('复核','关闭','手工关闭') group by t1.sa_orderitemsid");
+        Rows rowsDispatchAllDetail = dbConnect.runSqlQuery("select sum(t1.outwarehouseqty) sumoutwarehouseqty,t1.sa_orderitemsid from sa_dispatch_items t1 inner join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid  where t2.status in('复核','关闭','手工关闭') and t1.sa_orderitemsid in(select sa_orderitemsid from sa_dispatch_items where sa_dispatchid="+sa_dispatchid+") group by t1.sa_orderitemsid");
         RowsMap rowsDispatchAllDetailMap = rowsDispatchAllDetail.toRowsMap("sa_orderitemsid");
 
         Rows rowscurrentDispatchDetail = dbConnect.runSqlQuery("select sum(t1.qty) qty,t1.sa_orderitemsid,t1.siteid,t2.itemno from sa_dispatch_items t1 left join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid  where t1.sa_dispatchid=" + sa_dispatchid + " group by t1.sa_orderitemsid,t1.siteid,t2.itemno");

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1473,12 +1473,25 @@ public class Order extends Controller {
         }
         Long sa_promotionid = row.getLong("sa_promotionid");
         if (sa_promotionid > 0) {
+
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE  siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isEmpty()) {
                 return getErrReturnObject().setErrMsg("该促销活动不存在，无法提交").toString();
             }
             if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("该促销活动已截止，无法提交").toString();
             }
+
+            Rows promotionRows = dbConnect.runSqlQuery("SELECT isauth FROM sa_promotion WHERE  siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'");
+            if(!promotionRows.get(0).getBoolean("isauth")){
+                SQLFactory sqlFactory = new SQLFactory(this, "促销方案经销商授权区域查询");
+                sqlFactory.addParameter("sys_enterpriseid",sys_enterpriseid);
+                sqlFactory.addParameter("siteid",siteid);
+                Rows spromotionsaleareaRows = dbConnect.runSqlQuery(sqlFactory);
+                RowsMap spromotionsaleareaRowsMap = spromotionsaleareaRows.toRowsMap("sa_promotionid");
+                if ((dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion_auth WHERE sys_enterpriseid= "+sys_enterpriseid+" AND siteid='" + siteid + "' AND sa_promotionid='" + sa_promotionid + "'").isEmpty() && !spromotionsaleareaRowsMap.containsKey(String.valueOf(sa_promotionid)))) {
+                    return getErrReturnObject().setErrMsg("该促销活动已过期，无法提交").toString();
+                }
+            }
         }
         if (!((row.getString("status").equals("新建") && !row.getString("type").equals("特殊订单")) || (row.getString("status").equals("确认") && row.getString("type").equals("特殊订单")))) {
             return getErrReturnObject().setErrMsg("新建或非确认无法提交").toString();
@@ -1504,6 +1517,10 @@ public class Order extends Controller {
         }
         //促销订单：提交时商品必须是上架状态，并且活动方案中的商品必须也是上架状态，否则不允许提交
         if (type.equals("促销订单")) {
+            Rows promotionitemsRows = dbConnect.runSqlQuery("select t2.itemno from  sa_promotion_items t1 inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where  t1.sa_promotionid=" + sa_promotionid + " and t1.siteid='" + siteid + "' and t1.isonsale=0 and t1.itemid in(select itemid from sa_orderitems where sa_orderid="+sa_orderid+")");
+            if(promotionitemsRows.isNotEmpty()){
+                return getErrReturnObject().setErrMsg("商品："+promotionitemsRows.get(0).getString("itemno")+"已下架，无法提交。").toString();
+            }
             Rows promotionauthRows = dbConnect.runSqlQuery("select * from  sa_promotion_auth where  sa_promotionid=" + sa_promotionid + " and sys_enterpriseid ='" + sys_enterpriseid + "' and siteid='" + siteid + "'");
             if (promotionauthRows.isNotEmpty()) {
                 if (promotionauthRows.get(0).getBoolean("settlestatus")) {

src/custom/restcontroller/webmanage/sale/order/SQL/促销方案经销商授权区域查询.sql

@@ -0,0 +1,27 @@
+SELECT
+    sa_promotionid
+FROM
+    sa_promotion_salearea
+WHERE
+    sa_saleareaid IN (
+        WITH recursive salearea AS (
+            SELECT
+                sa_saleareaid,
+                parentid
+            FROM
+                sa_salearea
+            WHERE
+                siteid = $siteid$
+              AND sa_saleareaid IN ( SELECT sa_saleareaid FROM sys_enterprise_tradefield WHERE sys_enterpriseid = $sys_enterpriseid$ ) UNION ALL
+            SELECT
+                t2.sa_saleareaid,
+                t2.parentid
+            FROM
+                salearea t1
+                    INNER JOIN sa_salearea t2 ON t1.parentid = t2.sa_saleareaid
+                    AND t2.siteid = $siteid$
+        ) SELECT
+            sa_saleareaid
+        FROM
+            salearea
+    )

src/custom/restcontroller/webmanage/sale/salestarget/SQL/人员目标统计-出货.sql

@@ -1,19 +1,13 @@
 with sa_salestarget as
          (
-select 0+CAST(sum(amount) AS CHAR) amount,point,sa_saleareaid,type from(SELECT  (t5.sumqty*t1.price) amount, MONTH (t2.createdate) point,ifnull(t4.sa_saleareaid,0) sa_saleareaid,'月' type
+select 0+CAST(sum(amount) AS CHAR) amount,point,sa_saleareaid,type from(SELECT  (t5.qty*t1.price) amount, MONTH (t6.checkdate) point,ifnull(t4.sa_saleareaid,0) sa_saleareaid,'月' type
 FROM sa_orderitems t1
     LEFT JOIN sa_order t2 ON t1.sa_orderid=t2.sa_orderid AND t1.siteid=t2.siteid
 		left join sys_enterprise_tradefield t3 on t2.sys_enterpriseid=t3.sys_enterpriseid and t2.siteid=t3.siteid
 		left join sa_salearea t4 on t4.sa_saleareaid=t3.sa_saleareaid and t4.siteid=t3.siteid
- inner join (
-SELECT  t1.sa_orderitemsid,t1.siteid,
-        SUM(ifnull(t1.qty,0)) sumqty
-FROM st_stockbill_items t1
-         inner join st_stockbill t2 on t1.siteid = t2.siteid and t1.st_stockbillid = t2.st_stockbillid
-         inner join sa_orderitems t4 on t1.sa_orderitemsid=t4.sa_orderitemsid and t1.siteid = t4.siteid
-WHERE t2.STATUS ='审核' and t2.rb=1 and $where1$ group by t1.sa_orderitemsid,t1.siteid) t5 on t5.sa_orderitemsid=t1.sa_orderitemsid and t5.siteid=t1.siteid
-
-WHERE YEAR (t2.createdate)=$year$ AND t1.siteid=$siteid$) a
+        inner join st_stockbill_items t5 ON t5.sa_orderitemsid = t1.sa_orderitemsid AND t5.siteid = t1.siteid
+        inner join st_stockbill t6 ON t6.st_stockbillid = t5.st_stockbillid AND t6.siteid = t5.siteid
+WHERE YEAR (t6.checkdate)=$year$ AND t1.siteid=$siteid$ and t6.rb=1) a
 GROUP BY point,sa_saleareaid,type
     )
         , hrtarget as (
@@ -22,23 +16,23 @@ select t1.sa_saleareaid,
     t1.hrid,
     t1.name,
     t1.position,
-     ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-    ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-    ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-    ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-    ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-    ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-    ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-    ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-    ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-    ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-    ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-    ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-    ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+     ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+    ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+    ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+    ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+    ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+    ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+    ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+    ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+    ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+    ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+    ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+    ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+    ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestargethr t1
     left join sa_salestarget m1 on t1.sa_saleareaid = m1.sa_saleareaid and m1.type = '月' and m1.point = 1
     left join sa_salestarget m2 on t1.sa_saleareaid = m2.sa_saleareaid and m2.type = '月' and m2.point = 2
@@ -62,23 +56,23 @@ from (
 								t2.parentid,
                 t2.areafullname,
                 1       level,
-                 CAST(ROUND(y1a,2) AS DECIMAL(16,2)) y1a,
-                 CAST(ROUND(s1a,2) AS DECIMAL(16,2))  s1a,
-                 CAST(ROUND(s2a,2) AS DECIMAL(16,2)) s2a,
-                 CAST(ROUND(s3a,2) AS DECIMAL(16,2))  s3a,
-                 CAST(ROUND(s4a,2) AS DECIMAL(16,2))  s4a,
-                 CAST(ROUND(m1a,2) AS DECIMAL(16,2))  m1a,
-                 CAST(ROUND(m2a,2) AS DECIMAL(16,2))  m2a,
-                 CAST(ROUND(m3a,2) AS DECIMAL(16,2))  m3a,
-                 CAST(ROUND(m4a,2) AS DECIMAL(16,2))   m4a,
-                 CAST(ROUND(m5a,2) AS DECIMAL(16,2))  m5a,
-                 CAST(ROUND(m6a,2) AS DECIMAL(16,2))   m6a,
-                 CAST(ROUND(m7a,2) AS DECIMAL(16,2))   m7a,
-                 CAST(ROUND(m8a,2) AS DECIMAL(16,2))  m8a,
-                 CAST(ROUND(m9a,2) AS DECIMAL(16,2))  m9a,
-                 CAST(ROUND(m10a,2) AS DECIMAL(16,2))  m10a,
-                 CAST(ROUND(m11a,2) AS DECIMAL(16,2))  m11a,
-                 CAST(ROUND(m12a,2) AS DECIMAL(16,2))  m12a
+                 ROUND(y1a,$num$)  y1a,
+                 ROUND(s1a,$num$)   s1a,
+                 ROUND(s2a,$num$)  s2a,
+                 ROUND(s3a,$num$)  s3a,
+                 ROUND(s4a,$num$)   s4a,
+                 ROUND(m1a,$num$)   m1a,
+                 ROUND(m2a,$num$)   m2a,
+                 ROUND(m3a,$num$)   m3a,
+                 ROUND(m4a,$num$)    m4a,
+                 ROUND(m5a,$num$)   m5a,
+                 ROUND(m6a,$num$)    m6a,
+                 ROUND(m7a,$num$)    m7a,
+                 ROUND(m8a,$num$)   m8a,
+                 ROUND(m9a,$num$)   m9a,
+                 ROUND(m10a,$num$)   m10a,
+                 ROUND(m11a,$num$)   m11a,
+                 ROUND(m12a,$num$)  m12a
          from hrtarget t1
                   INNER JOIN sa_salearea t2 ON t2.sa_saleareaid = t1.sa_saleareaid
 			  union all
@@ -88,23 +82,23 @@ from (
 								t6.parentid,
                 t6.areafullname,
                 0        level,
-                CAST(ROUND(sum(y1a),2)  AS DECIMAL(16,2)) y1a,
-                CAST(ROUND(sum(s1a),2)  AS DECIMAL(16,2)) s1a,
-                CAST(ROUND(sum(s2a),2)  AS DECIMAL(16,2)) s2a,
-                CAST(ROUND(sum(s3a),2)  AS DECIMAL(16,2)) s3a,
-                CAST(ROUND(sum(s4a),2)  AS DECIMAL(16,2)) s4a,
-                CAST(ROUND(sum(m1a),2)  AS DECIMAL(16,2)) m1a,
-                CAST(ROUND(sum(m2a),2)  AS DECIMAL(16,2)) m2a,
-                CAST(ROUND(sum(m3a),2) AS DECIMAL(16,2)) m3a,
-                CAST(ROUND(sum(m4a),2)  AS DECIMAL(16,2)) m4a,
-                CAST(ROUND(sum(m5a),2)  AS DECIMAL(16,2)) m5a,
-                CAST(ROUND(sum(m6a),2)  AS DECIMAL(16,2)) m6a,
-                CAST(ROUND(sum(m7a),2)  AS DECIMAL(16,2)) m7a,
-                CAST(ROUND(sum(m8a),2)  AS DECIMAL(16,2)) m8a,
-                CAST(ROUND(sum(m9a),2)  AS DECIMAL(16,2)) m9a,
-                CAST(ROUND(sum(m10a),2)  AS DECIMAL(16,2)) m10a,
-                CAST(ROUND(sum(m11a),2)  AS DECIMAL(16,2)) m11a,
-                CAST(ROUND(sum(m12a),2)  AS DECIMAL(16,2)) m12a
+                ROUND(sum(y1a),$num$)   y1a,
+                ROUND(sum(s1a),$num$)  s1a,
+                ROUND(sum(s2a),$num$)   s2a,
+                ROUND(sum(s3a),$num$)   s3a,
+                ROUND(sum(s4a),$num$)   s4a,
+                ROUND(sum(m1a),$num$)   m1a,
+                ROUND(sum(m2a),$num$)  m2a,
+                ROUND(sum(m3a),$num$)   m3a,
+                ROUND(sum(m4a),$num$)   m4a,
+                ROUND(sum(m5a),$num$)   m5a,
+                ROUND(sum(m6a),$num$)   m6a,
+                ROUND(sum(m7a),$num$)   m7a,
+                ROUND(sum(m8a),$num$)   m8a,
+                ROUND(sum(m9a),$num$)   m9a,
+                ROUND(sum(m10a),$num$)   m10a,
+                ROUND(sum(m11a),$num$)   m11a,
+                ROUND(sum(m12a),$num$)   m12a
          from hrtarget t1
                 left join sa_salearea t5 on t1.sa_saleareaid = t5.sa_saleareaid
 								 left join sa_salearea t6 on t5.parentid = t6.sa_saleareaid and t5.siteid = t6.siteid

src/custom/restcontroller/webmanage/sale/salestarget/SQL/人员目标统计-开票.sql

@@ -51,23 +51,23 @@ from (
 								t2.parentid,
                 t2.areafullname,
                 1       level,
-                ROUND(y1a/10000,2) y1a,
-                ROUND(s1a/10000,2) s1a,
-                ROUND(s2a/10000,2) s2a,
-                ROUND(s3a/10000,2) s3a,
-                ROUND(s4a/10000,2) s4a,
-                ROUND(m1a/10000,2) m1a,
-                ROUND(m2a/10000,2) m2a,
-                ROUND(m3a/10000,2) m3a,
-                ROUND(m4a/10000,2) m4a,
-                ROUND(m5a/10000,2) m5a,
-                ROUND(m6a/10000,2) m6a,
-                ROUND(m7a/10000,2) m7a,
-                ROUND(m8a/10000,2) m8a,
-                ROUND(m9a/10000,2) m9a,
-                ROUND(m10a/10000,2) m10a,
-                ROUND(m11a/10000,2) m11a,
-                ROUND(m12a/10000,2) m12a
+                ROUND(y1a/10000,$num$) y1a,
+                ROUND(s1a/10000,$num$) s1a,
+                ROUND(s2a/10000,$num$) s2a,
+                ROUND(s3a/10000,$num$) s3a,
+                ROUND(s4a/10000,$num$) s4a,
+                ROUND(m1a/10000,$num$) m1a,
+                ROUND(m2a/10000,$num$) m2a,
+                ROUND(m3a/10000,$num$) m3a,
+                ROUND(m4a/10000,$num$) m4a,
+                ROUND(m5a/10000,$num$) m5a,
+                ROUND(m6a/10000,$num$) m6a,
+                ROUND(m7a/10000,$num$) m7a,
+                ROUND(m8a/10000,$num$) m8a,
+                ROUND(m9a/10000,$num$) m9a,
+                ROUND(m10a/10000,$num$) m10a,
+                ROUND(m11a/10000,$num$) m11a,
+                ROUND(m12a/10000,$num$) m12a
          from hrtarget t1
                   INNER JOIN sa_salearea t2 ON t2.sa_saleareaid = t1.sa_saleareaid
 			  union all
@@ -77,23 +77,23 @@ from (
 								t6.parentid,
                 t6.areafullname,
                 0        level,
-                ROUND(sum(y1a)/10000,2) y1a,
-                ROUND(sum(s1a)/10000,2) s1a,
-                ROUND(sum(s2a)/10000,2) s2a,
-                ROUND(sum(s3a)/10000,2) s3a,
-                ROUND(sum(s4a)/10000,2) s4a,
-                ROUND(sum(m1a)/10000,2) m1a,
-                ROUND(sum(m2a)/10000,2) m2a,
-                ROUND(sum(m3a)/10000,2) m3a,
-                ROUND(sum(m4a)/10000,2) m4a,
-                ROUND(sum(m5a)/10000,2) m5a,
-                ROUND(sum(m6a)/10000,2) m6a,
-                ROUND(sum(m7a)/10000,2) m7a,
-                ROUND(sum(m8a)/10000,2) m8a,
-                ROUND(sum(m9a)/10000,2) m9a,
-                ROUND(sum(m10a)/10000,2) m10a,
-                ROUND(sum(m11a)/10000,2) m11a,
-                ROUND(sum(m12a)/10000,2) m12a
+                ROUND(sum(y1a)/10000,$num$) y1a,
+                ROUND(sum(s1a)/10000,$num$) s1a,
+                ROUND(sum(s2a)/10000,$num$) s2a,
+                ROUND(sum(s3a)/10000,$num$) s3a,
+                ROUND(sum(s4a)/10000,$num$) s4a,
+                ROUND(sum(m1a)/10000,$num$) m1a,
+                ROUND(sum(m2a)/10000,$num$) m2a,
+                ROUND(sum(m3a)/10000,$num$) m3a,
+                ROUND(sum(m4a)/10000,$num$) m4a,
+                ROUND(sum(m5a)/10000,$num$) m5a,
+                ROUND(sum(m6a)/10000,$num$) m6a,
+                ROUND(sum(m7a)/10000,$num$) m7a,
+                ROUND(sum(m8a)/10000,$num$) m8a,
+                ROUND(sum(m9a)/10000,$num$) m9a,
+                ROUND(sum(m10a)/10000,$num$) m10a,
+                ROUND(sum(m11a)/10000,$num$) m11a,
+                ROUND(sum(m12a)/10000,$num$) m12a
          from hrtarget t1
                 left join sa_salearea t5 on t1.sa_saleareaid = t5.sa_saleareaid
 								 left join sa_salearea t6 on t5.parentid = t6.sa_saleareaid and t5.siteid = t6.siteid

src/custom/restcontroller/webmanage/sale/salestarget/SQL/人员目标统计-收款.sql

@@ -13,23 +13,23 @@ select t1.sa_saleareaid,
     t1.hrid,
     t1.name,
     t1.position,
-    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-    ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-    ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-    ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-    ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-    ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-    ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-    ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-    ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-    ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-    ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-    ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-    ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+    ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+    ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+    ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+    ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+    ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+    ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+    ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+    ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+    ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+    ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+    ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+    ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestargethr t1
     left join sa_salestarget m1 on t1.sa_saleareaid = m1.sa_saleareaid and m1.type = '月' and m1.point = 1
     left join sa_salestarget m2 on t1.sa_saleareaid = m2.sa_saleareaid and m2.type = '月' and m2.point = 2
@@ -53,23 +53,23 @@ from (
 								t2.parentid,
                 t2.areafullname,
                 1       level,
-                CAST(ROUND(y1a,2) AS DECIMAL(16,2)) y1a,
-                CAST(ROUND(s1a,2) AS DECIMAL(16,2))  s1a,
-                CAST(ROUND(s2a,2) AS DECIMAL(16,2)) s2a,
-                CAST(ROUND(s3a,2) AS DECIMAL(16,2))  s3a,
-                CAST(ROUND(s4a,2) AS DECIMAL(16,2))  s4a,
-                CAST(ROUND(m1a,2) AS DECIMAL(16,2))  m1a,
-                CAST(ROUND(m2a,2) AS DECIMAL(16,2))  m2a,
-                CAST(ROUND(m3a,2) AS DECIMAL(16,2))  m3a,
-                CAST(ROUND(m4a,2) AS DECIMAL(16,2))   m4a,
-                CAST(ROUND(m5a,2) AS DECIMAL(16,2))  m5a,
-                CAST(ROUND(m6a,2) AS DECIMAL(16,2))   m6a,
-                CAST(ROUND(m7a,2) AS DECIMAL(16,2))   m7a,
-                CAST(ROUND(m8a,2) AS DECIMAL(16,2))  m8a,
-                CAST(ROUND(m9a,2) AS DECIMAL(16,2))  m9a,
-                CAST(ROUND(m10a,2) AS DECIMAL(16,2))  m10a,
-                CAST(ROUND(m11a,2) AS DECIMAL(16,2))  m11a,
-                CAST(ROUND(m12a,2) AS DECIMAL(16,2))  m12a
+                ROUND(y1a,$num$)  y1a,
+                ROUND(s1a,$num$)   s1a,
+                ROUND(s2a,$num$)  s2a,
+                ROUND(s3a,$num$)   s3a,
+                ROUND(s4a,$num$)   s4a,
+                ROUND(m1a,$num$)   m1a,
+                ROUND(m2a,$num$)   m2a,
+                ROUND(m3a,$num$)   m3a,
+                ROUND(m4a,$num$)    m4a,
+                ROUND(m5a,$num$)   m5a,
+                ROUND(m6a,$num$)    m6a,
+                ROUND(m7a,$num$)    m7a,
+                ROUND(m8a,$num$)   m8a,
+                ROUND(m9a,$num$)   m9a,
+                ROUND(m10a,$num$)   m10a,
+                ROUND(m11a,$num$)   m11a,
+                ROUND(m12a,$num$)   m12a
          from hrtarget t1
                   INNER JOIN sa_salearea t2 ON t2.sa_saleareaid = t1.sa_saleareaid
 			  union all
@@ -79,23 +79,23 @@ from (
 								t6.parentid,
                 t6.areafullname,
                 0        level,
-                CAST(ROUND(sum(y1a),2)  AS DECIMAL(16,2)) y1a,
-                CAST(ROUND(sum(s1a),2)  AS DECIMAL(16,2)) s1a,
-                CAST(ROUND(sum(s2a),2)  AS DECIMAL(16,2)) s2a,
-                CAST(ROUND(sum(s3a),2)  AS DECIMAL(16,2)) s3a,
-                CAST(ROUND(sum(s4a),2)  AS DECIMAL(16,2)) s4a,
-                CAST(ROUND(sum(m1a),2)  AS DECIMAL(16,2)) m1a,
-                CAST(ROUND(sum(m2a),2)  AS DECIMAL(16,2)) m2a,
-                CAST(ROUND(sum(m3a),2) AS DECIMAL(16,2)) m3a,
-                CAST(ROUND(sum(m4a),2)  AS DECIMAL(16,2)) m4a,
-                CAST(ROUND(sum(m5a),2)  AS DECIMAL(16,2)) m5a,
-                CAST(ROUND(sum(m6a),2)  AS DECIMAL(16,2)) m6a,
-                CAST(ROUND(sum(m7a),2)  AS DECIMAL(16,2)) m7a,
-                CAST(ROUND(sum(m8a),2)  AS DECIMAL(16,2)) m8a,
-                CAST(ROUND(sum(m9a),2)  AS DECIMAL(16,2)) m9a,
-                CAST(ROUND(sum(m10a),2)  AS DECIMAL(16,2)) m10a,
-                CAST(ROUND(sum(m11a),2)  AS DECIMAL(16,2)) m11a,
-                CAST(ROUND(sum(m12a),2)  AS DECIMAL(16,2)) m12a
+                ROUND(sum(y1a),$num$)   y1a,
+                ROUND(sum(s1a),$num$)   s1a,
+                ROUND(sum(s2a),$num$)   s2a,
+                ROUND(sum(s3a),$num$)   s3a,
+                ROUND(sum(s4a),$num$)   s4a,
+                ROUND(sum(m1a),$num$)   m1a,
+                ROUND(sum(m2a),$num$)   m2a,
+                ROUND(sum(m3a),$num$)   m3a,
+                ROUND(sum(m4a),$num$)   m4a,
+                ROUND(sum(m5a),$num$)   m5a,
+                ROUND(sum(m6a),$num$)   m6a,
+                ROUND(sum(m7a),$num$)   m7a,
+                ROUND(sum(m8a),$num$)   m8a,
+                ROUND(sum(m9a),$num$)   m9a,
+                ROUND(sum(m10a),$num$)  m10a,
+                ROUND(sum(m11a),$num$)  m11a,
+                ROUND(sum(m12a),$num$)  m12a
          from hrtarget t1
                 left join sa_salearea t5 on t1.sa_saleareaid = t5.sa_saleareaid
 								 left join sa_salearea t6 on t5.parentid = t6.sa_saleareaid and t5.siteid = t6.siteid

src/custom/restcontroller/webmanage/sale/salestarget/SQL/人员目标统计-订单.sql

@@ -11,23 +11,23 @@ GROUP BY  point,sa_saleareaid,type
         , hrtarget as (
 select t1.sa_saleareaid,
     t1.areaname,
-    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,2)  as y1a,
-    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,2)  as s1a,
-    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,2)  as s2a,
-    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,2)  as s3a,
-    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,2) as s4a,
-    ROUND(ifnull(m1.amount,0)/10000,2) as m1a,
-    ROUND(ifnull(m2.amount,0)/10000,2) as m2a,
-    ROUND(ifnull(m3.amount,0)/10000,2) as m3a,
-    ROUND(ifnull(m4.amount,0)/10000,2)as m4a,
-    ROUND(ifnull(m5.amount,0)/10000,2) as m5a,
-    ROUND(ifnull(m6.amount,0)/10000,2) as m6a,
-    ROUND(ifnull(m7.amount,0)/10000,2) as m7a,
-    ROUND(ifnull(m8.amount,0)/10000,2) as m8a,
-    ROUND(ifnull(m9.amount,0)/10000,2) as m9a,
-    ROUND(ifnull(m10.amount,0)/10000,2) as m10a,
-    ROUND(ifnull(m11.amount,0)/10000,2) as m11a,
-    ROUND(ifnull(m12.amount,0)/10000,2) as m12a
+    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)+ ifnull(m4.amount,0)+ ifnull(m5.amount,0)+  ifnull(m6.amount,0)+ ifnull(m7.amount,0)+ ifnull(m8.amount,0)+  ifnull(m9.amount,0) + ifnull(m10.amount,0)+ ifnull(m11.amount,0)+  ifnull(m12.amount,0))/10000,$num$)  as y1a,
+    ROUND((ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0))/10000,$num$)  as s1a,
+    ROUND((ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0))/10000,$num$)  as s2a,
+    ROUND((ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0))/10000,$num$)  as s3a,
+    ROUND((ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0))/10000,$num$) as s4a,
+    ROUND(ifnull(m1.amount,0)/10000,$num$) as m1a,
+    ROUND(ifnull(m2.amount,0)/10000,$num$) as m2a,
+    ROUND(ifnull(m3.amount,0)/10000,$num$) as m3a,
+    ROUND(ifnull(m4.amount,0)/10000,$num$)as m4a,
+    ROUND(ifnull(m5.amount,0)/10000,$num$) as m5a,
+    ROUND(ifnull(m6.amount,0)/10000,$num$) as m6a,
+    ROUND(ifnull(m7.amount,0)/10000,$num$) as m7a,
+    ROUND(ifnull(m8.amount,0)/10000,$num$) as m8a,
+    ROUND(ifnull(m9.amount,0)/10000,$num$) as m9a,
+    ROUND(ifnull(m10.amount,0)/10000,$num$) as m10a,
+    ROUND(ifnull(m11.amount,0)/10000,$num$) as m11a,
+    ROUND(ifnull(m12.amount,0)/10000,$num$) as m12a
 from sa_salestargethr t1
     left join sa_salestarget m1 on t1.sa_saleareaid = m1.sa_saleareaid and m1.type = '月' and m1.point = 1
     left join sa_salestarget m2 on t1.sa_saleareaid = m2.sa_saleareaid and m2.type = '月' and m2.point = 2
@@ -51,23 +51,23 @@ from (
 								t2.parentid,
                 t2.areafullname,
                 1       level,
-                CAST(ROUND(y1a,2) AS DECIMAL(16,2)) y1a,
-                CAST(ROUND(s1a,2) AS DECIMAL(16,2))  s1a,
-                CAST(ROUND(s2a,2) AS DECIMAL(16,2)) s2a,
-                CAST(ROUND(s3a,2) AS DECIMAL(16,2))  s3a,
-                CAST(ROUND(s4a,2) AS DECIMAL(16,2))  s4a,
-                CAST(ROUND(m1a,2) AS DECIMAL(16,2))  m1a,
-                CAST(ROUND(m2a,2) AS DECIMAL(16,2))  m2a,
-                CAST(ROUND(m3a,2) AS DECIMAL(16,2))  m3a,
-                CAST(ROUND(m4a,2) AS DECIMAL(16,2))   m4a,
-                CAST(ROUND(m5a,2) AS DECIMAL(16,2))  m5a,
-                CAST(ROUND(m6a,2) AS DECIMAL(16,2))   m6a,
-                CAST(ROUND(m7a,2) AS DECIMAL(16,2))   m7a,
-                CAST(ROUND(m8a,2) AS DECIMAL(16,2))  m8a,
-                CAST(ROUND(m9a,2) AS DECIMAL(16,2))  m9a,
-                CAST(ROUND(m10a,2) AS DECIMAL(16,2))  m10a,
-                CAST(ROUND(m11a,2) AS DECIMAL(16,2))  m11a,
-                CAST(ROUND(m12a,2) AS DECIMAL(16,2))  m12a
+                ROUND(y1a,$num$) y1a,
+                ROUND(s1a,$num$)  s1a,
+                ROUND(s2a,$num$) s2a,
+                ROUND(s3a,$num$)  s3a,
+                ROUND(s4a,$num$)  s4a,
+                ROUND(m1a,$num$)  m1a,
+                ROUND(m2a,$num$)  m2a,
+                ROUND(m3a,$num$)  m3a,
+                ROUND(m4a,$num$)   m4a,
+                ROUND(m5a,$num$)  m5a,
+                ROUND(m6a,$num$)   m6a,
+                ROUND(m7a,$num$)   m7a,
+                ROUND(m8a,$num$)  m8a,
+                ROUND(m9a,$num$)  m9a,
+                ROUND(m10a,$num$)  m10a,
+                ROUND(m11a,$num$)  m11a,
+                ROUND(m12a,$num$)  m12a
          from hrtarget t1
                   INNER JOIN sa_salearea t2 ON t2.sa_saleareaid = t1.sa_saleareaid
 			  union all
@@ -77,23 +77,23 @@ from (
 								t6.parentid,
                 t6.areafullname,
                 0        level,
-                CAST(ROUND(sum(y1a),2)  AS DECIMAL(16,2)) y1a,
-                CAST(ROUND(sum(s1a),2)  AS DECIMAL(16,2)) s1a,
-                CAST(ROUND(sum(s2a),2)  AS DECIMAL(16,2)) s2a,
-                CAST(ROUND(sum(s3a),2)  AS DECIMAL(16,2)) s3a,
-                CAST(ROUND(sum(s4a),2)  AS DECIMAL(16,2)) s4a,
-                CAST(ROUND(sum(m1a),2)  AS DECIMAL(16,2)) m1a,
-                CAST(ROUND(sum(m2a),2)  AS DECIMAL(16,2)) m2a,
-                CAST(ROUND(sum(m3a),2) AS DECIMAL(16,2)) m3a,
-                CAST(ROUND(sum(m4a),2)  AS DECIMAL(16,2)) m4a,
-                CAST(ROUND(sum(m5a),2)  AS DECIMAL(16,2)) m5a,
-                CAST(ROUND(sum(m6a),2)  AS DECIMAL(16,2)) m6a,
-                CAST(ROUND(sum(m7a),2)  AS DECIMAL(16,2)) m7a,
-                CAST(ROUND(sum(m8a),2)  AS DECIMAL(16,2)) m8a,
-                CAST(ROUND(sum(m9a),2)  AS DECIMAL(16,2)) m9a,
-                CAST(ROUND(sum(m10a),2)  AS DECIMAL(16,2)) m10a,
-                CAST(ROUND(sum(m11a),2)  AS DECIMAL(16,2)) m11a,
-                CAST(ROUND(sum(m12a),2)  AS DECIMAL(16,2)) m12a
+                ROUND(sum(y1a),$num$) y1a,
+                ROUND(sum(s1a),$num$) s1a,
+                ROUND(sum(s2a),$num$) s2a,
+                ROUND(sum(s3a),$num$) s3a,
+                ROUND(sum(s4a),$num$) s4a,
+                ROUND(sum(m1a),$num$) m1a,
+                ROUND(sum(m2a),$num$) m2a,
+                ROUND(sum(m3a),$num$) 3a,
+                ROUND(sum(m4a),$num$) m4a,
+                ROUND(sum(m5a),$num$) m5a,
+                ROUND(sum(m6a),$num$) m6a,
+                ROUND(sum(m7a),$num$) m7a,
+                ROUND(sum(m8a),$num$) m8a,
+                ROUND(sum(m9a),$num$) m9a,
+                ROUND(sum(m10a),$num$) m10a,
+                ROUND(sum(m11a),$num$) m11a,
+                ROUND(sum(m12a),$num$) m12a
          from hrtarget t1
                 left join sa_salearea t5 on t1.sa_saleareaid = t5.sa_saleareaid
 								 left join sa_salearea t6 on t5.parentid = t6.sa_saleareaid and t5.siteid = t6.siteid

src/custom/restcontroller/webmanage/sale/salestarget/enterprisetarget.java

@@ -263,6 +263,11 @@ public class enterprisetarget extends Controller {
         if (assessmentindicators.equals("开票")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(new enterprise(new JSONObject()), "企业-开票");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(statisticaldimension.equals("订单审核")){
                 where1=where1+" and t2.status='审核' ";
             }else{
@@ -288,6 +293,11 @@ public class enterprisetarget extends Controller {
         if (assessmentindicators.equals("订单")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(new enterprise(new JSONObject()), "企业-订单");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(statisticaldimension.equals("订单审核")){
                 where1=where1+" and t2.status='审核' ";
             }else{
@@ -313,6 +323,11 @@ public class enterprisetarget extends Controller {
         if (assessmentindicators.equals("出货")) {
             String where1=" 1=1 ";
             sqlFactory = new SQLFactory(new enterprise(new JSONObject()), "企业-出货");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             if(StringUtils.isNotBlank(sa_accountclassids)){
                 if(isJSONArray(sa_accountclassids)){
                     JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
@@ -332,6 +347,11 @@ public class enterprisetarget extends Controller {
         //收款
         if (assessmentindicators.equals("收款")) {
             sqlFactory = new SQLFactory(new enterprise(new JSONObject()), "企业-收款");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             String where1=" 1=1 ";
             if(StringUtils.isNotBlank(statisticaldimension)){
                 if(isJSONObject(statisticaldimension)){

src/custom/restcontroller/webmanage/sale/salestarget/personnelstatistics.java

@@ -227,6 +227,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("开票")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-开票");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -254,6 +259,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("订单")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-订单");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -280,6 +290,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("出货")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-出货");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(sa_accountclassids)){
@@ -301,6 +316,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("收款")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-收款");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(statisticaldimension)){
@@ -365,10 +385,15 @@ public class personnelstatistics extends Controller {
         for (Row row : rows) {
             if(hrrows.size()!=0){
                 if(hrrowsMap.containsKey(row.getString("sa_saleareaid"))){
-                    rowsResult.add(row);
+                    if(row.getString("type").equals("区域")){
+                        rowsResult.add(row);
+                    }
+
                 }
             }else{
-                rowsResult.add(row);
+                if(row.getString("type").equals("区域")){
+                    rowsResult.add(row);
+                }
             }
 
 
@@ -389,16 +414,18 @@ public class personnelstatistics extends Controller {
             row.putAll(actualRow);
             row.putAll(calculate(row, actualRow));
         }
+
+
         Row rowResult = new Row();
-        rowResult.put("y1l",rowsResult.sum("y1l"));
-        rowResult.put("y1a",rowsResult.sum("y1a"));
+        rowResult.put("y1l",sum1("y1l",rowsResult));
+        rowResult.put("y1a",sum1("y1a",rowsResult));
         for (int i = 1; i < 5; i++) {
-            rowResult.put("s" + i + "l",rowsResult.sum("s" + i + "l"));
-            rowResult.put("s" + i + "a",rowsResult.sum("s" + i + "a"));
+            rowResult.put("s" + i + "l",sum1("s" + i + "l",rowsResult));
+            rowResult.put("s" + i + "a",sum1("s" + i + "a",rowsResult));
         }
         for (int i = 1; i < 13; i++) {
-            rowResult.put("m" + i + "l",rowsResult.sum("m" + i + "l"));
-            rowResult.put("m" + i + "a",rowsResult.sum("m" + i + "a"));
+            rowResult.put("m" + i + "l",sum1("m" + i + "l",rowsResult));
+            rowResult.put("m" + i + "a",sum1("m" + i + "a",rowsResult));
         }
         rowsResult = new Rows();
         rowsResult.add(rowResult);
@@ -505,6 +532,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("开票")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-开票");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -532,6 +564,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("订单")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-订单");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -558,6 +595,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("出货")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-出货");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(sa_accountclassids)){
@@ -579,6 +621,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("收款")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-收款");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(statisticaldimension)){
@@ -758,6 +805,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("开票")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-开票");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -785,6 +837,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("订单")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-订单");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(statisticaldimension.equals("订单审核")){
@@ -811,6 +868,16 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("出货")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-出货");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(sa_accountclassids)){
@@ -831,6 +898,11 @@ public class personnelstatistics extends Controller {
         if (assessmentindicators .equals("收款")) {
             String where1 =" 1=1 ";
             sqlFactory = new SQLFactory(this, "人员目标统计-收款");
+            if(content.getLongValue("num")==0){
+                sqlFactory.addParameter("num",2);
+            }else{
+                sqlFactory.addParameter("num",content.getLongValue("num"));
+            }
             sqlFactory.addParameter("sa_salestargetbillid", sa_salestargetbillid);
             sqlFactory.addParameter_SQL("where", where);
             if(StringUtils.isNotBlank(statisticaldimension)){
@@ -994,6 +1066,14 @@ public class personnelstatistics extends Controller {
         BigDecimal bigDecimal = new BigDecimal(c);
         return bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
-
+    public BigDecimal sum1(String column,Rows rows) {
+        BigDecimal value = new BigDecimal("0");
+        for (Row row : rows) {
+            if (row.containsKey(column)) {
+                value = value.add(new BigDecimal(row.getString(column)));
+            }
+        }
+        return value;
+    }
 
 }