|
|
@@ -365,14 +365,14 @@ public class personnelstatistics extends Controller {
|
|
|
}
|
|
|
Row rowResult = new Row();
|
|
|
rowResult.put("y1l",rowsResult.sum("y1l"));
|
|
|
- rowResult.put("y1h",rowsResult.sum("y1h"));
|
|
|
+ rowResult.put("y1a",rowsResult.sum("y1a"));
|
|
|
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"));
|
|
|
+ rowResult.put("s" + i + "a",rowsResult.sum("s" + i + "a"));
|
|
|
}
|
|
|
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"));
|
|
|
+ rowResult.put("m" + i + "a",rowsResult.sum("m" + i + "a"));
|
|
|
}
|
|
|
rowsResult = new Rows();
|
|
|
rowsResult.add(rowResult);
|