Merge branch 'develop' into develop2

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/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)){
@@ -512,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("订单审核")){
@@ -539,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("订单审核")){
@@ -565,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)){
@@ -586,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)){
@@ -765,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("订单审核")){
@@ -792,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("订单审核")){
@@ -818,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)){
@@ -838,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)){