diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java index 57e76e3..dd3220d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/truck/truckweightlimit/TruckWeightLimitSyncService.java @@ -120,7 +120,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService { return false; } - synctask.addUpdateData(oldobj); // 有自增长主键的,在保存 model 后会自动填充主键的值,然后才能加到 synctask 里面 + synctask.addUpdateData(oldobj); synctask.addSaveData(modifyLog); return SyncTaskService.me.save(synctask) @@ -158,44 +158,24 @@ public class TruckWeightLimitSyncService extends BaseSyncService { @Override public boolean run() { try { - List modifyLogList = TruckWeightLimitModifyLog.dao.find("select * from truck_weight_limit_modify_log where state != 3 and truck_license = ?", truck_license); - if (modifyLogList.size() > 0) { - List mdList = new ArrayList<>(); - for (TruckWeightLimitModifyLog md : modifyLogList) { - TruckWeightLimitModifyLog tlm = new TruckWeightLimitModifyLog(); - tlm.setTruckLicense(md.getTruckLicense()); - tlm.setWeightLimit(md.getWeightLimit()); - tlm.setAttachment(md.getAttachment()); - tlm.setState(3); - tlm.setChangeUserName(sysuser.getName()); - tlm.setChangeUserId(sysuser.getId()); - tlm.setChangeTime(new Date()); - mdList.add(tlm); - } - int[] ret = Db.batchSave(mdList, mdList.size()); + TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); + modifyLog.setTruckLicense(model.getTruckLicense()); + modifyLog.setWeightLimit(model.getWeightLimit()); + modifyLog.setAttachment(model.getAttachment()); + modifyLog.setState(3); + modifyLog.setChangeUserId(sysuser.getId()); + modifyLog.setChangeUserName(sysuser.getName()); + modifyLog.setChangeTime(new Date()); - // 没有的记录更新影响的行数应该是 0 - if (ret.length != modifyLogList.size()) { - return false; - } - - for (int i : ret) { - // 必须是每条 sql 修改一条记录 - if (i != 1) { - return false; - } - } - - modifyLogList.stream().forEach(s -> synctask.addSaveData(s)); - } - - boolean ret = oldobj.update(); + boolean ret = oldobj.update() && modifyLog.save(); if (!ret) return false; synctask.addUpdateData(oldobj); + synctask.addSaveData(modifyLog); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) + && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false; @@ -232,13 +212,24 @@ public class TruckWeightLimitSyncService extends BaseSyncService { @Override public boolean run() { try { - boolean ret = oldobj.update(); + TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog(); + modifyLog.setTruckLicense(model.getTruckLicense()); + modifyLog.setWeightLimit(model.getWeightLimit()); + modifyLog.setAttachment(model.getAttachment()); + modifyLog.setState(4); + modifyLog.setChangeUserId(sysuser.getId()); + modifyLog.setChangeUserName(sysuser.getName()); + modifyLog.setChangeTime(new Date()); + + boolean ret = oldobj.update() && modifyLog.save(); if (!ret) return false; synctask.addUpdateData(oldobj); + synctask.addSaveData(modifyLog); return SyncTaskService.me.save(synctask) - && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser); + && ModifyLogService.me.save(model, oldobj, Enums.DataOpType.UPDATE.getId(), sysuser) + && ModifyLogService.me.save(modifyLog, null, Enums.DataOpType.SAVE.getId(), sysuser); } catch (Exception e) { log.error(e.getMessage(), e); return false;