查询业务员月指标增加导出

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

@@ -297,21 +297,21 @@ public class performancetargetboard extends Controller {
                 row.put("completedamount_total",0);
             }
         }
-        if(isexport){
-            ExcelFactory excelFactory = new ExcelFactory("人员业绩导出");
-            RowsMap arearowsMap = arearows.toRowsMap("sa_saleareaid");
-            SQLFactory areasqlFactory = new SQLFactory(this, "区域查询(导出)");
-            areasqlFactory.addParameter_in("sa_saleareaid",arearows.toArrayList("sa_saleareaid", new ArrayList<>()));
-            areasqlFactory.addParameter("siteid", siteid);
-            Rows arearows_export = dbConnect.runSqlQuery(areasqlFactory.getSQL());
-            Rows arearows_exportReault = new Rows();
-            for(Row row : arearows_export){
-                if(arearowsMap.containsKey(row.getString("sa_saleareaid"))){
-                    row.putAll(arearowsMap.get(row.getString("sa_saleareaid")).get(0));
-                    arearows_exportReault.add(row);
-                }
+        ExcelFactory excelFactory = new ExcelFactory("人员业绩导出");
+        RowsMap arearowsMap = arearows.toRowsMap("sa_saleareaid");
+        SQLFactory areasqlFactory = new SQLFactory(this, "区域查询(导出)");
+        areasqlFactory.addParameter_in("sa_saleareaid",arearows.toArrayList("sa_saleareaid", new ArrayList<>()));
+        areasqlFactory.addParameter("siteid", siteid);
+        Rows arearows_export = dbConnect.runSqlQuery(areasqlFactory.getSQL());
+        Rows arearows_exportReault = new Rows();
+        for(Row row : arearows_export){
+            if(arearowsMap.containsKey(row.getString("sa_saleareaid"))){
+                row.putAll(arearowsMap.get(row.getString("sa_saleareaid")).get(0));
+                arearows_exportReault.add(row);
             }
+        }
 
+        if(isexport){
 
             XSSFSheet sheet = excelFactory.getXssfWorkbook().createSheet("Sheet1");
             XSSFWorkbook xssfFWorkbook = excelFactory.getXssfWorkbook();
@@ -341,7 +341,7 @@ public class performancetargetboard extends Controller {
             return getSucReturnObject().setData(url).toString();
         }
 
-        return getSucReturnObject().setData(arearows).toString();
+        return getSucReturnObject().setData(arearows_exportReault).toString();
     }
 
     /**