|
|
@@ -90,12 +90,11 @@ public class performancetargetboard extends Controller {
|
|
|
public String queryperformancetarget() throws YosException {
|
|
|
//long hrid= content.getLong("hrid");
|
|
|
//long sa_saleareaid= content.getLong("sa_saleareaid");
|
|
|
- StringBuffer where = new StringBuffer(" 1=1 ");
|
|
|
-
|
|
|
+ String areaname="";
|
|
|
if (content.containsKey("where")) {
|
|
|
JSONObject whereObject = content.getJSONObject("where");
|
|
|
if (whereObject.containsKey("areaname") && !"".equals(whereObject.getString("areaname"))) {
|
|
|
- where.append(" and t3.areaname ='").append(whereObject.getString("areaname")).append("' ");
|
|
|
+ areaname=whereObject.getString("areaname");
|
|
|
}
|
|
|
}
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_hr","name","hrid");
|
|
|
@@ -105,7 +104,6 @@ public class performancetargetboard extends Controller {
|
|
|
|
|
|
querySQL.setWhere("t1.siteid", siteid);
|
|
|
querySQL.setWhere("t1.hrid", hrid);
|
|
|
- querySQL.setWhere(where.toString());
|
|
|
|
|
|
|
|
|
Rows arearows = querySQL.query();
|
|
|
@@ -118,6 +116,15 @@ public class performancetargetboard extends Controller {
|
|
|
arearows1 =getSubSaleAreas(this,saleareaidlist);
|
|
|
arearows.addAll(arearows1);
|
|
|
|
|
|
+ if(areaname!=""){
|
|
|
+ for(Row row :arearows){
|
|
|
+ if(row.getString("areaname").equals(areaname)){
|
|
|
+ arearows=new Rows();
|
|
|
+ arearows.add(row);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
long year= content.getLong("year");
|
|
|
long month= content.getLong("month");
|