diff --git a/src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java b/src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java new file mode 100644 index 00000000..ef9d32e7 --- /dev/null +++ b/src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java @@ -0,0 +1,21 @@ +package com.qs.serve.common.model.consts; + +/** + * @author YenHex + * @since 2023/1/30 + */ +public interface BudgetLogOptFlag { + + /** 正常(标记为最新记录) */ + Integer State_0 = 0; + + /** 回退 */ + Integer State_1 = 1; + + /** 回退已处理 */ + Integer State_2 = 2; + + /** 删除已处理 */ + Integer State_3 = 3; + +} diff --git a/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java b/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java index 0e62d442..4d5772c2 100644 --- a/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java +++ b/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java @@ -6,8 +6,16 @@ package com.qs.serve.common.model.consts; */ public interface BudgetLogRollbackFlag { + /** 正常(标记为最新记录) */ Integer State_0 = 0; + + /** 回退 */ Integer State_1 = 1; + + /** 回退已处理 */ Integer State_2 = 2; + /** 删除已处理 */ + Integer State_3 = 3; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index f4cbdc08..2bddb337 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -419,7 +419,24 @@ public class TbsCostApplyController { //移除日志 LambdaQueryWrapper logLqw = new LambdaQueryWrapper<>(); logLqw.eq(TbsBudgetLog::getCostApplyId,costApply.getId()); - tbsBudgetLogService.remove(logLqw); + List oldLogList = tbsBudgetLogService.list(logLqw); + List oldLogList4Upd = oldLogList.stream().map(a->{ + TbsBudgetLog budgetLog = new TbsBudgetLog(); + budgetLog.setId(a.getId()); + budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_3); + return budgetLog; + }).collect(Collectors.toList()); + tbsBudgetLogService.updateBatchById(oldLogList4Upd); + for (TbsBudgetLog budgetLog : oldLogList) { + budgetLog.setCreateBy(null); + budgetLog.setCreateTime(null); + budgetLog.setUpdateBy(null); + budgetLog.setUpdateTime(null); + budgetLog.setId(null); + budgetLog.setAmount(budgetLog.getAmount().negate()); + budgetLog.setOptType(5); + } + tbsBudgetLogService.saveBatch(oldLogList); return R.ok(); } }else if ("next".equals(flag)){