业绩目标逻辑修复

src/custom/restcontroller/webmanage/sale/salestarget/personnelstatistics.java

@@ -366,7 +366,7 @@ public class personnelstatistics extends Controller {
 
         if(!saleareas.isEmpty() && saleareas.size()==1){
             for (Row row :actualRows) {
-                if(row.getLong("parentid")==0){
+                if(row.getLong("parentid")==0 && row.getString("type").equals("区域汇总")){
                     row.put("y1a",actualRows.toRowsMap("parentid").get(sa_saleareaidtop.toString()).sum("y1a"));
                     row.put("s1a",actualRows.toRowsMap("parentid").get(sa_saleareaidtop.toString()).sum("s1a"));
                     row.put("s2a",actualRows.toRowsMap("parentid").get(sa_saleareaidtop.toString()).sum("s2a"));
@@ -405,6 +405,7 @@ public class personnelstatistics extends Controller {
 
         }
 
+
         for (Row row : rowsResult) {
             //初始化
             row = addActualRow(row);
@@ -421,6 +422,17 @@ public class personnelstatistics extends Controller {
             row.putAll(calculate(row, actualRow));
         }
 
+        Long sa_saleareaid1 =sa_saleareaidtop;
+        Row actualRow = new Row();
+        for (Row tempActualRow : actualRows) {
+            if (tempActualRow.getLong("sa_saleareaid") == sa_saleareaid1) {
+                actualRow.putAll(tempActualRow);
+            }
+        }
+        Row row =new Row();
+        row.putAll(actualRow);
+        row.putAll(calculate(row, actualRow));
+        rowsResult.add(row);
 
         Row rowResult = new Row();
         rowResult.put("y1l",sum1("y1l",rowsResult));