|
|
@@ -654,7 +654,7 @@ public class salestargetstatistics extends Controller {
|
|
|
arearow.putIfAbsent(key + "_saleamount_mom", saleamount_mom);
|
|
|
arearow.putIfAbsent(key + "_saleamount_yoy", saleamount_yoy);
|
|
|
arearow.putIfAbsent(key + "_targetamount", targetamount);
|
|
|
- arearow.putIfAbsent(key+"_balanceamount", saleamount.subtract(targetamount));
|
|
|
+ arearow.putIfAbsent(key + "_balanceamount", saleamount.subtract(targetamount));
|
|
|
//计算达成率
|
|
|
arearow.put(key + "_rate_achieve", calculateAchieveRate(saleamount, targetamount));
|
|
|
//计算环比
|
|
|
@@ -792,7 +792,7 @@ public class salestargetstatistics extends Controller {
|
|
|
rows = dbConnect.runSqlQuery("SELECT sa_saleareaid from sa_salearea WHERE siteid='" + siteid + "' and level=1");
|
|
|
sa_saleareaids = rows.toArrayList("sa_saleareaid", new ArrayList<>());
|
|
|
}
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
sa_saleareaids.add(sa_saleareaid);
|
|
|
}
|
|
|
|
|
|
@@ -853,5 +853,11 @@ public class salestargetstatistics extends Controller {
|
|
|
return getSucReturnObject().setData(arearows).toString();
|
|
|
}
|
|
|
|
|
|
+ @API(title = "查询当前账号的营销区域", apiversion = R.ID2026010513574702.v1.class)
|
|
|
+ public String queryCurrentUserarea() throws YosException {
|
|
|
+ Rows rows = dbConnect.runSqlQuery("SELECT t1.*FROM sa_salearea t1 INNER JOIN sa_salearea_hr t2 ON t2.sa_saleareaid=t1.sa_saleareaid WHERE t2.hrid=" + hrid + " and t1.siteid='" + siteid + "'");
|
|
|
+ return getSucReturnObject().setData(rows).toString();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|