dev
parent
8afc128f4d
commit
01953ff83d
|
|
@ -201,30 +201,32 @@ public class ModifyLogService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Transport> transports = Transport.dao.find("select * from transport t where t.id in(" + StrKit.join(sqlparams, ",") + ")", params.toArray());
|
if(!params.isEmpty()){
|
||||||
|
List<Transport> transports = Transport.dao.find("select * from transport t where t.id in(" + StrKit.join(sqlparams, ",") + ")", params.toArray());
|
||||||
|
|
||||||
for (Record record : list) {
|
for (Record record : list) {
|
||||||
try {
|
try {
|
||||||
String content = record.getStr("editdata");
|
String content = record.getStr("editdata");
|
||||||
|
|
||||||
if (content == null) {
|
if (content == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
JSONObject obj = JSONObject.parseObject(content);
|
|
||||||
String id = obj.getString("id");
|
|
||||||
|
|
||||||
for (Transport transport : transports) {
|
|
||||||
if (transport.getId().equals(id)) {
|
|
||||||
record.set("truck_license", transport.getTruckLicense());
|
|
||||||
record.set("order_sn", transport.getOrderSn());
|
|
||||||
record.set("state", transport.getState());
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
record.remove("editdata");
|
JSONObject obj = JSONObject.parseObject(content);
|
||||||
} catch (Exception e) {
|
String id = obj.getString("id");
|
||||||
log.error(e.getMessage(), e);
|
|
||||||
|
for (Transport transport : transports) {
|
||||||
|
if (transport.getId().equals(id)) {
|
||||||
|
record.set("truck_license", transport.getTruckLicense());
|
||||||
|
record.set("order_sn", transport.getOrderSn());
|
||||||
|
record.set("state", transport.getState());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
record.remove("editdata");
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.getMessage(), e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue