车辆限重记录日志删除、恢复
parent
9830a774fd
commit
911f5e6656
|
|
@ -120,7 +120,7 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
synctask.addUpdateData(oldobj); // 有自增长主键的,在保存 model 后会自动填充主键的值,然后才能加到 synctask 里面
|
synctask.addUpdateData(oldobj);
|
||||||
synctask.addSaveData(modifyLog);
|
synctask.addSaveData(modifyLog);
|
||||||
|
|
||||||
return SyncTaskService.me.save(synctask)
|
return SyncTaskService.me.save(synctask)
|
||||||
|
|
@ -158,44 +158,24 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
|
||||||
@Override
|
@Override
|
||||||
public boolean run() {
|
public boolean run() {
|
||||||
try {
|
try {
|
||||||
List<TruckWeightLimitModifyLog> modifyLogList = TruckWeightLimitModifyLog.dao.find("select * from truck_weight_limit_modify_log where state != 3 and truck_license = ?", truck_license);
|
TruckWeightLimitModifyLog modifyLog = new TruckWeightLimitModifyLog();
|
||||||
if (modifyLogList.size() > 0) {
|
modifyLog.setTruckLicense(model.getTruckLicense());
|
||||||
List<TruckWeightLimitModifyLog> mdList = new ArrayList<>();
|
modifyLog.setWeightLimit(model.getWeightLimit());
|
||||||
for (TruckWeightLimitModifyLog md : modifyLogList) {
|
modifyLog.setAttachment(model.getAttachment());
|
||||||
TruckWeightLimitModifyLog tlm = new TruckWeightLimitModifyLog();
|
modifyLog.setState(3);
|
||||||
tlm.setTruckLicense(md.getTruckLicense());
|
modifyLog.setChangeUserId(sysuser.getId());
|
||||||
tlm.setWeightLimit(md.getWeightLimit());
|
modifyLog.setChangeUserName(sysuser.getName());
|
||||||
tlm.setAttachment(md.getAttachment());
|
modifyLog.setChangeTime(new Date());
|
||||||
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());
|
|
||||||
|
|
||||||
// 没有的记录更新影响的行数应该是 0
|
boolean ret = oldobj.update() && modifyLog.save();
|
||||||
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();
|
|
||||||
if (!ret) return false;
|
if (!ret) return false;
|
||||||
|
|
||||||
synctask.addUpdateData(oldobj);
|
synctask.addUpdateData(oldobj);
|
||||||
|
synctask.addSaveData(modifyLog);
|
||||||
|
|
||||||
return SyncTaskService.me.save(synctask)
|
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) {
|
} catch (Exception e) {
|
||||||
log.error(e.getMessage(), e);
|
log.error(e.getMessage(), e);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -232,13 +212,24 @@ public class TruckWeightLimitSyncService extends BaseSyncService {
|
||||||
@Override
|
@Override
|
||||||
public boolean run() {
|
public boolean run() {
|
||||||
try {
|
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;
|
if (!ret) return false;
|
||||||
|
|
||||||
synctask.addUpdateData(oldobj);
|
synctask.addUpdateData(oldobj);
|
||||||
|
synctask.addSaveData(modifyLog);
|
||||||
|
|
||||||
return SyncTaskService.me.save(synctask)
|
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) {
|
} catch (Exception e) {
|
||||||
log.error(e.getMessage(), e);
|
log.error(e.getMessage(), e);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue