|
@@ -417,15 +417,15 @@ public class personnelstatistics extends Controller {
|
|
|
|
|
|
|
|
|
Row rowResult = new Row();
|
|
|
- rowResult.put("y1l",rowsResult.sum("y1l"));
|
|
|
- rowResult.put("y1a",rowsResult.sum("y1a"));
|
|
|
+ rowResult.put("y1l",sum1("y1l",rowsResult));
|
|
|
+ rowResult.put("y1a",sum1("y1a",rowsResult));
|
|
|
for (int i = 1; i < 5; i++) {
|
|
|
- rowResult.put("s" + i + "l",rowsResult.sum("s" + i + "l"));
|
|
|
- rowResult.put("s" + i + "a",rowsResult.sum("s" + i + "a"));
|
|
|
+ rowResult.put("s" + i + "l",sum1("s" + i + "l",rowsResult));
|
|
|
+ rowResult.put("s" + i + "a",sum1("s" + i + "a",rowsResult));
|
|
|
}
|
|
|
for (int i = 1; i < 13; i++) {
|
|
|
- rowResult.put("m" + i + "l",rowsResult.sum("m" + i + "l"));
|
|
|
- rowResult.put("m" + i + "a",rowsResult.sum("m" + i + "a"));
|
|
|
+ rowResult.put("m" + i + "l",sum1("m" + i + "l",rowsResult));
|
|
|
+ rowResult.put("m" + i + "a",sum1("m" + i + "a",rowsResult));
|
|
|
}
|
|
|
rowsResult = new Rows();
|
|
|
rowsResult.add(rowResult);
|
|
@@ -1066,6 +1066,14 @@ public class personnelstatistics extends Controller {
|
|
|
BigDecimal bigDecimal = new BigDecimal(c);
|
|
|
return bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
}
|
|
|
-
|
|
|
+ public BigDecimal sum1(String column,Rows rows) {
|
|
|
+ BigDecimal value = new BigDecimal("0");
|
|
|
+ for (Row row : rows) {
|
|
|
+ if (row.containsKey(column)) {
|
|
|
+ value = value.add(new BigDecimal(row.getString(column)));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return value;
|
|
|
+ }
|
|
|
|
|
|
}
|