月,季度指标部分字段逻辑优化

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

@@ -356,6 +356,7 @@ public class performancetargetboard extends Controller {
         personnelsqlFactory.addParameter("siteid", siteid);
         Rows salestargetrows = dbConnect.runSqlQuery(personnelsqlFactory.getSQL());
         BigDecimal rw_all=BigDecimal.ZERO;
+        BigDecimal rw_year=BigDecimal.ZERO;
         BigDecimal completedamount=BigDecimal.ZERO;
         BigDecimal gcgccompletedamount=BigDecimal.ZERO;
         BigDecimal zzgccompletedamount=BigDecimal.ZERO;
@@ -363,12 +364,13 @@ public class performancetargetboard extends Controller {
             for(Object month : months){
                 rw_all=rw_all.add(salestargetrows.get(0).getBigDecimal("m"+ (Integer)month+"l"));
             }
+            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);
+        jsonObject.put("rw_all",rw_year);
         SQLFactory paymentsqlFactory = new SQLFactory(this, "账户回款统计");
         paymentsqlFactory.addParameter("year", year);
         paymentsqlFactory.addParameter_in("sa_saleareaids", list);