|
@@ -342,9 +342,7 @@ public class personnelstatistics extends Controller {
|
|
|
}
|
|
|
Rows rowsResult =new Rows();
|
|
|
for (Row row : rows) {
|
|
|
- if(row.getLong("sa_saleareaid")==sa_saleareaid){
|
|
|
- rowsResult.add(row);
|
|
|
- }
|
|
|
+ rowsResult.add(row);
|
|
|
}
|
|
|
|
|
|
for (Row row : rowsResult) {
|
|
@@ -362,7 +360,19 @@ public class personnelstatistics extends Controller {
|
|
|
row.putAll(actualRow);
|
|
|
row.putAll(calculate(row, actualRow));
|
|
|
}
|
|
|
-
|
|
|
+ Row rowResult = new Row();
|
|
|
+ rowResult.put("y1l",rowsResult.sum("y1l"));
|
|
|
+ rowResult.put("y1h",rowsResult.sum("y1h"));
|
|
|
+ for (int i = 1; i < 5; i++) {
|
|
|
+ rowResult.put("s" + i + "l",rowsResult.sum("s" + i + "l"));
|
|
|
+ rowResult.put("s" + i + "h",rowsResult.sum("s" + i + "h"));
|
|
|
+ }
|
|
|
+ for (int i = 1; i < 13; i++) {
|
|
|
+ rowResult.put("m" + i + "l",rowsResult.sum("m" + i + "l"));
|
|
|
+ rowResult.put("m" + i + "h",rowsResult.sum("m" + i + "h"));
|
|
|
+ }
|
|
|
+ rowsResult = new Rows();
|
|
|
+ rowsResult.add(rowResult);
|
|
|
return getSucReturnObject().setData(rowsResult).toString();
|
|
|
}
|
|
|
|