From 77681edd9cd9d4059f48cf4e09a489cd93a052e3 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 30 Jan 2023 14:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=84=E7=AE=97=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/model/consts/BudgetLogOptFlag.java | 21 +++++++++++++++++++
 .../model/consts/BudgetLogRollbackFlag.java   |  8 +++++++
 .../controller/TbsCostApplyController.java    | 19 ++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java

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<TbsBudgetLog> logLqw = new LambdaQueryWrapper<>();
                     logLqw.eq(TbsBudgetLog::getCostApplyId,costApply.getId());
-                    tbsBudgetLogService.remove(logLqw);
+                    List<TbsBudgetLog> oldLogList = tbsBudgetLogService.list(logLqw);
+                    List<TbsBudgetLog> 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)){