|
|
|
@ -283,7 +283,7 @@ public class ZbdcModel {
|
|
|
|
|
replaceList.add(replaceRecord);
|
|
|
|
|
|
|
|
|
|
replaceRecord = new Record();
|
|
|
|
|
replaceRecord.set("k1", "科学").set("k2", "xxkx_yqyppz").set("k3", "hx_yqypjs");
|
|
|
|
|
replaceRecord.set("k1", "科学").set("k2", "xxkx_yqyppz").set("k3", "xxkx_yqypjs");
|
|
|
|
|
replaceList.add(replaceRecord);
|
|
|
|
|
|
|
|
|
|
replaceRecord = new Record();
|
|
|
|
@ -310,9 +310,9 @@ public class ZbdcModel {
|
|
|
|
|
String km_name = r2.getStr("k1");
|
|
|
|
|
sql = sql.replace("{{km_name}}", km_name);
|
|
|
|
|
List<Record> records = Db.find(sql, bureau_id, year);
|
|
|
|
|
int sum = 0;
|
|
|
|
|
double sum = 0;
|
|
|
|
|
for (Record r1 : records) {
|
|
|
|
|
sum += r1.getInt("xysl");
|
|
|
|
|
sum += r1.getDouble("xysl");
|
|
|
|
|
}
|
|
|
|
|
r.set(r2.getStr("k2"), records.size());
|
|
|
|
|
r.set(r2.getStr("k3"), sum);
|
|
|
|
|