月,季度指标部分字段逻辑修改

src/custom/restcontroller/webmanage/sale/salestarget_cucu/performancetargetboard.java

@@ -125,9 +125,14 @@ public class performancetargetboard extends Controller {
         }else{
             jsonObject.put("rw_month",BigDecimal.ZERO);
         }
+
+        ArrayList<Long> list = new ArrayList<>();
+        list.add(sa_saleareaid);
+        list.addAll(getSubSaleAreaIds(this,list));
+
         SQLFactory paymentsqlFactory = new SQLFactory(this, "账户回款统计");
         paymentsqlFactory.addParameter("year", year);
-        paymentsqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        paymentsqlFactory.addParameter_in("sa_saleareaids", list);
         paymentsqlFactory.addParameter_SQL("where"," 1=1 ");
         paymentsqlFactory.addParameter("siteid", siteid);
         Rows paymentRows = dbConnect.runSqlQuery(paymentsqlFactory.getSQL());
@@ -135,7 +140,7 @@ public class performancetargetboard extends Controller {
 
         SQLFactory rebatesqlFactory = new SQLFactory(this, "账户返利统计");
         rebatesqlFactory.addParameter("year", year);
-        rebatesqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        rebatesqlFactory.addParameter_in("sa_saleareaids", list);
         rebatesqlFactory.addParameter_SQL("where"," 1=1 ");
         rebatesqlFactory.addParameter("siteid", siteid);
         Rows rebateRows = dbConnect.runSqlQuery(rebatesqlFactory.getSQL());
@@ -217,8 +222,6 @@ public class performancetargetboard extends Controller {
             gcproportion=rows.get(0).getBigDecimal("gcproportion").divide(BigDecimal.valueOf(100));
             zzproportion=rows.get(0).getBigDecimal("zzproportion").divide(BigDecimal.valueOf(100));
         }
-
-
         long sa_salestargetbillid=0;
         if(salestargetbillrows.isNotEmpty()){
             sa_salestargetbillid=salestargetbillrows.get(0).getLong("sa_salestargetbillid");
@@ -244,11 +247,14 @@ public class performancetargetboard extends Controller {
                 rw_previousquarter=rw_previousquarter.add(salestargetrows.get(0).getBigDecimal("m"+previousmonth+"l"));
             }
         }
+        ArrayList<Long> list = new ArrayList<>();
+        list.add(sa_saleareaid);
+        list.addAll(getSubSaleAreaIds(this,list));
         //季度任务（万）
         jsonObject.put("rw_quarter",rw_quarter);
         SQLFactory paymentsqlFactory = new SQLFactory(this, "账户回款统计");
         paymentsqlFactory.addParameter("year", year);
-        paymentsqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        paymentsqlFactory.addParameter_in("sa_saleareaids",list);
         paymentsqlFactory.addParameter_SQL("where"," 1=1 ");
         paymentsqlFactory.addParameter("siteid", siteid);
         Rows paymentRows = dbConnect.runSqlQuery(paymentsqlFactory.getSQL());
@@ -256,7 +262,7 @@ public class performancetargetboard extends Controller {
 
         SQLFactory rebatesqlFactory = new SQLFactory(this, "账户返利统计");
         rebatesqlFactory.addParameter("year", year);
-        rebatesqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        rebatesqlFactory.addParameter_in("sa_saleareaids",list);
         rebatesqlFactory.addParameter_SQL("where"," 1=1 ");
         rebatesqlFactory.addParameter("siteid", siteid);
         Rows rebateRows = dbConnect.runSqlQuery(rebatesqlFactory.getSQL());
@@ -373,11 +379,14 @@ public class performancetargetboard extends Controller {
             }
             rw_year=salestargetrows.get(0).getBigDecimal("y1l");
         }
+        ArrayList<Long> list = new ArrayList<>();
+        list.add(sa_saleareaid);
+        list.addAll(getSubSaleAreaIds(this,list));
         //总任务（万）
         jsonObject.put("rw_all",rw_all);
         SQLFactory paymentsqlFactory = new SQLFactory(this, "账户回款统计");
         paymentsqlFactory.addParameter("year", year);
-        paymentsqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        paymentsqlFactory.addParameter_in("sa_saleareaids", list);
         paymentsqlFactory.addParameter_SQL("where"," 1=1 ");
         paymentsqlFactory.addParameter("siteid", siteid);
         Rows paymentRows = dbConnect.runSqlQuery(paymentsqlFactory.getSQL());
@@ -385,7 +394,7 @@ public class performancetargetboard extends Controller {
 
         SQLFactory rebatesqlFactory = new SQLFactory(this, "账户返利统计");
         rebatesqlFactory.addParameter("year", year);
-        rebatesqlFactory.addParameter_in("sa_saleareaids", getSubSaleAreaIds(this,sa_saleareaid).add(sa_saleareaid));
+        rebatesqlFactory.addParameter_in("sa_saleareaids", list);
         rebatesqlFactory.addParameter_SQL("where"," 1=1 ");
         rebatesqlFactory.addParameter("siteid", siteid);
         Rows rebateRows = dbConnect.runSqlQuery(rebatesqlFactory.getSQL());