经销商业绩目标模块bug修复

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

@@ -7,6 +7,7 @@ SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
                 t2.agentnum,
                 t1.enterprisename,
+                t4.areaname,
                 m1.target_l + m2.target_l + m3.target_l + m4.target_l + m5.target_l + m6.target_l +
                 m7.target_l + m8.target_l + m9.target_l + m10.target_l + m11.target_l +
                 m12.target_l                               y1l,
@@ -60,4 +61,6 @@ from sa_salestarget m
          LEFT JOIN sa_salestarget m12 ON m12.year = m.year and m12.point = 12 and m.sys_enterpriseid = m12.sys_enterpriseid
          LEFT JOIN sys_enterprise t1 on t1.sys_enterpriseid=m.sys_enterpriseid
          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

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

@@ -10,30 +10,30 @@ SELECT  t1.sa_orderitemsid,t1.siteid,
 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 group by t1.sa_orderitemsid,t1.siteid) t5 on t5.sa_orderitemsid=t1.sa_orderitemsid and t5.siteid=t1.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
 GROUP BY point,sys_enterpriseid,year
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                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)  as y1a,
-                ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)  as s1a,
-                ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0)  as s2a,
-                ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0)  as s3a,
-                ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0) as s4a,
-                ifnull(m1.amount,0) as m1a,
-                ifnull(m2.amount,0) as m2a,
-                ifnull(m3.amount,0) as m3a,
-                ifnull(m4.amount,0) as m4a,
-                ifnull(m5.amount,0) as m5a,
-                ifnull(m6.amount,0) as m6a,
-                ifnull(m7.amount,0) as m7a,
-                ifnull(m8.amount,0) as m8a,
-                ifnull(m9.amount,0) as m9a,
-                ifnull(m10.amount,0) as m10a,
-                ifnull(m11.amount,0) as m11a,
-                ifnull(m12.amount,0) 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,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
 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

@@ -1,28 +1,28 @@
 with sa_salestarget as (
       select point,year,sys_enterpriseid,sum(amount) amount from (SELECT  0+CAST(if(isclose,t1.price*t1.deliedqty,amount) AS CHAR) amount, MONTH(t2.billdate) point,YEAR(t2.billdate) year,t2.sys_enterpriseid FROM sa_orderitems t1
     INNER JOIN sa_order t2 ON t1.sa_orderid=t2.sa_orderid AND t1.siteid=t2.siteid
-WHERE t1.siteid = $siteid$ and t2.sys_enterpriseid in $sys_enterpriseid$ and t2.status in('提交','审核','手工关闭','关闭') and YEAR(t2.billdate)=$year$) a
+WHERE t1.siteid = $siteid$ and t2.sys_enterpriseid in $sys_enterpriseid$ and $where1$ and YEAR(t2.billdate)=$year$) a
 GROUP BY point,year,sys_enterpriseid
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                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)  as y1a,
-                ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)  as s1a,
-                ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0)  as s2a,
-                ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0)  as s3a,
-                ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0) as s4a,
-                ifnull(m1.amount,0) as m1a,
-                ifnull(m2.amount,0) as m2a,
-                ifnull(m3.amount,0) as m3a,
-                ifnull(m4.amount,0) as m4a,
-                ifnull(m5.amount,0) as m5a,
-                ifnull(m6.amount,0) as m6a,
-                ifnull(m7.amount,0) as m7a,
-                ifnull(m8.amount,0) as m8a,
-                ifnull(m9.amount,0) as m9a,
-                ifnull(m10.amount,0) as m10a,
-                ifnull(m11.amount,0) as m11a,
-                ifnull(m12.amount,0) 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,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
 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

@@ -1,27 +1,27 @@
 with sa_salestarget as (
    select point,year,sys_enterpriseid,sum(amount) amount from (SELECT 0+CAST(amount AS CHAR) amount, MONTH(billdate) point,YEAR(billdate) year,sys_enterpriseid FROM sa_cashbill
-    WHERE siteid =$siteid$ AND status in('审核') and type=1 and YEAR (billdate)=$year$ and sys_enterpriseid in $sys_enterpriseid$) a
+    WHERE siteid =$siteid$ AND status in('审核') and ($where1$) and type=1 and YEAR (billdate)=$year$ and sys_enterpriseid in $sys_enterpriseid$) a
     GROUP BY point,year,sys_enterpriseid
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                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)  as y1a,
-                ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)  as s1a,
-                ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0)  as s2a,
-                ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0)  as s3a,
-                ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0) as s4a,
-                ifnull(m1.amount,0) as m1a,
-                ifnull(m2.amount,0) as m2a,
-                ifnull(m3.amount,0) as m3a,
-                ifnull(m4.amount,0) as m4a,
-                ifnull(m5.amount,0) as m5a,
-                ifnull(m6.amount,0) as m6a,
-                ifnull(m7.amount,0) as m7a,
-                ifnull(m8.amount,0) as m8a,
-                ifnull(m9.amount,0) as m9a,
-                ifnull(m10.amount,0) as m10a,
-                ifnull(m11.amount,0) as m11a,
-                ifnull(m12.amount,0) 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,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
 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

@@ -1,28 +1,28 @@
 with sa_salestarget as (
       select point,year,sys_enterpriseid,sum(amount) amount from (SELECT  0+CAST(if(isclose,t1.price*t1.deliedqty,amount) AS CHAR) amount, MONTH(t2.billdate) point,YEAR(t2.billdate) year,t2.sys_enterpriseid FROM sa_orderitems t1
     INNER JOIN sa_order t2 ON t1.sa_orderid=t2.sa_orderid AND t1.siteid=t2.siteid
-WHERE t1.siteid = $siteid$ and t2.sys_enterpriseid in $sys_enterpriseid$ and t2.status in('提交','审核','手工关闭','关闭') and YEAR(t2.billdate)=$year$ ) a
+WHERE t1.siteid = $siteid$ and t2.sys_enterpriseid in $sys_enterpriseid$ and $where1$ and YEAR(t2.billdate)=$year$ ) a
 GROUP BY point,year,sys_enterpriseid
     )
 SELECT DISTINCT m.year,
                 m.sys_enterpriseid,
-                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)  as y1a,
-                ifnull(m1.amount,0)+ ifnull(m2.amount,0)+ifnull(m3.amount,0)  as s1a,
-                ifnull(m4.amount,0)+ ifnull(m5.amount,0)+ifnull(m6.amount,0)  as s2a,
-                ifnull(m7.amount,0)+ ifnull(m8.amount,0)+ifnull(m9.amount,0)  as s3a,
-                ifnull(m10.amount,0)+ ifnull(m11.amount,0)+ifnull(m12.amount,0) as s4a,
-                ifnull(m1.amount,0) as m1a,
-                ifnull(m2.amount,0) as m2a,
-                ifnull(m3.amount,0) as m3a,
-                ifnull(m4.amount,0) as m4a,
-                ifnull(m5.amount,0) as m5a,
-                ifnull(m6.amount,0) as m6a,
-                ifnull(m7.amount,0) as m7a,
-                ifnull(m8.amount,0) as m8a,
-                ifnull(m9.amount,0) as m9a,
-                ifnull(m10.amount,0) as m10a,
-                ifnull(m11.amount,0) as m11a,
-                ifnull(m12.amount,0) 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,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
 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

@@ -1,5 +1,6 @@
 package restcontroller.sale.salestarget;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import common.Controller;
 import common.YosException;
@@ -8,6 +9,7 @@ import common.annotation.CACHEING;
 import common.data.Row;
 import common.data.Rows;
 import common.data.SQLFactory;
+import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 
 import java.math.BigDecimal;
@@ -86,10 +88,16 @@ public class enterprise extends Controller {
 
         //考核指标类型
         String assessmentindicators="";
+        //统计维度
+        String statisticaldimension="";
+        //统计维度
+        String sa_accountclassids="";
         if(curryear!=0){
-            Rows rows =dbConnect.runSqlQuery("SELECT assessmentindicators FROM sa_salestargetbill WHERE `year` = " + curryear + " AND targettype ='企业目标' AND siteid = '" + siteid + "'");
+            Rows rows =dbConnect.runSqlQuery("SELECT assessmentindicators,statisticaldimension,sa_accountclassids FROM sa_salestargetbill WHERE `year` = " + curryear + " AND targettype ='企业目标' AND siteid = '" + siteid + "'");
             if(rows.isNotEmpty()){
                 assessmentindicators=rows.get(0).getString("assessmentindicators");
+                statisticaldimension=rows.get(0).getString("statisticaldimension");
+                sa_accountclassids=rows.get(0).getString("sa_accountclassids");
             }
         }
 
@@ -103,20 +111,88 @@ public class enterprise extends Controller {
         Rows actualRows = new Rows();
         //开票
         if (assessmentindicators.equals("开票")) {
+            String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-开票");
+            if(statisticaldimension.equals("订单审核")){
+                where1=where1+" and t2.status='审核' ";
+            }else{
+                where1=where1+" and t2.status='提交' ";
+            }
+            if(StringUtils.isNotBlank(sa_accountclassids)){
+                if(isJSONArray(sa_accountclassids)){
+                    JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
+                    if(!jsonArrayResult.isEmpty()){
+                        where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
+                        where1 = where1.replace("[", "(").replace("]", ")");
+                    }
+
+                }
+            }
+            sqlFactory.addParameter_SQL("where1",where1);
         }
         //订单
         if (assessmentindicators.equals("订单")) {
+            String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-订单");
+            if(statisticaldimension.equals("订单审核")){
+                where1=where1+" and t2.status='审核' ";
+            }else{
+                where1=where1+" and t2.status='提交' ";
+            }
+            if(StringUtils.isNotBlank(sa_accountclassids)){
+                if(isJSONArray(sa_accountclassids)){
+                    JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
+                    if(!jsonArrayResult.isEmpty()){
+                        where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
+                        where1 = where1.replace("[", "(").replace("]", ")");
+                    }
+
+                }
+            }
+            sqlFactory.addParameter_SQL("where1",where1);
         }
         //出货
         if (assessmentindicators.equals("出货")) {
+            String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-出货");
+            if(StringUtils.isNotBlank(sa_accountclassids)){
+                if(isJSONArray(sa_accountclassids)){
+                    JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
+                    if(!jsonArrayResult.isEmpty()){
+                        where1=where1+ " and t2.sa_accountclassid in"+jsonArrayResult;
+                        where1 = where1.replace("[", "(").replace("]", ")");
+                    }
+
+                }
+            }
+            sqlFactory.addParameter_SQL("where1",where1);
         }
-        //出货
+        //收款
         if (assessmentindicators.equals("收款")) {
+            String where1=" 1=1 ";
             sqlFactory = new SQLFactory(this, "企业-收款");
-        }
+            if(StringUtils.isNotBlank(statisticaldimension)){
+                if(isJSONArray(statisticaldimension)){
+                    JSONArray jsonArrayResult = JSONArray.parseArray(statisticaldimension);
+                    if(!jsonArrayResult.isEmpty()){
+                        where1=where1+" and (class in"+jsonArrayResult+" or subclass in"+jsonArrayResult+")";
+                        where1 = where1.replace("[", "(").replace("]", ")");
+                    }
+
+                }
+            }
+            if(StringUtils.isNotBlank(sa_accountclassids)){
+                if(isJSONArray(sa_accountclassids)){
+                    JSONArray jsonArrayResult = JSONArray.parseArray(sa_accountclassids);
+                    if(!jsonArrayResult.isEmpty()){
+                        where1=where1+ " and sa_accountclassid in"+jsonArrayResult;
+                        where1 = where1.replace("[", "(").replace("]", ")");
+                    }
+
+                }
+            }
+            sqlFactory.addParameter_SQL("where1",where1);
+    }
         sqlFactory.addParameter_in("sys_enterpriseid", rows.toArrayList("sys_enterpriseid",new ArrayList<Long>()));
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("year", curryear);

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

@@ -61,6 +61,8 @@ public class personnel extends Controller {
             sqlFactory.addParameter("targettype", "人员目标");
             sqlFactory.addParameter("tradefield", "");
             sqlList.add(sqlFactory.getSQL());
+            sqlList.add(DataContrlLog.createLog(this, "sa_salestargetbill", sa_salestargetbillid, "人员目标新增", "人员目标新增"+year ).getSQL());
+
 
             //获取所有启用业务员
             SQLFactory saleareahrsqlFactory = new SQLFactory(this, "通用-人员范围查询");