日志类型添加静态字段引用

src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java

@@ -6,16 +6,13 @@ package com.qs.serve.common.model.consts;
  */
 public interface BudgetLogOptFlag {
 
-    /** 正常(标记为最新记录) */
+    /** 0-预算新增；1-费用申请；2-预算调增；3-预算调减；4-费用释放；5-费用申请调增；6-费用申请调减 */
     Integer State_0 = 0;
-
-    /** 回退 */
     Integer State_1 = 1;
-
-    /** 回退已处理 */
     Integer State_2 = 2;
-
-    /** 删除已处理 */
     Integer State_3 = 3;
+    Integer State_4 = 4;
+    Integer State_5 = 5;
+    Integer State_6 = 6;
 
 }

src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.tbs.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.framework.exception.BusinessException;
 import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
@@ -154,10 +155,10 @@ public class TbsBudgetController {
         BigDecimal amount = null;
         if(scheduleItemBudget.getBudgetAmount().compareTo(param.getBudgetAmount())>0){
             amount = scheduleItemBudget.getBudgetAmount().subtract(param.getBudgetAmount()).negate();
-            optType = 3;
+            optType = BudgetLogOptFlag.State_3;
         }else {
             amount = param.getBudgetAmount().subtract(scheduleItemBudget.getBudgetAmount());
-            optType = 2;
+            optType = BudgetLogOptFlag.State_2;
         }
         TbsBudgetLog budgetLog = tbsBudgetService.toTbsBudgetLog(sysUser,budget,scheduleItemBudget,optType, amount);
         tbsBudgetLogService.save(budgetLog);

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.annotation.SysLog;
+import com.qs.serve.common.model.consts.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.consts.SysConfigKey;
 import com.qs.serve.common.model.dto.PageVo;
@@ -434,7 +435,7 @@ public class TbsCostApplyController {
                         budgetLog.setUpdateTime(null);
                         budgetLog.setId(null);
                         budgetLog.setAmount(budgetLog.getAmount().negate());
-                        budgetLog.setOptType(5);
+                        budgetLog.setOptType(BudgetLogOptFlag.State_5);
                     }
                     tbsBudgetLogService.saveBatch(oldLogList);
                     return R.ok();

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.consts.BudgetLogOptFlag;
 import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
@@ -137,10 +138,10 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 budgetLog.setUpdateTime(null);
                 budgetLog.setId(null);
                 budgetLog.setAmount(budgetLog.getAmount().negate());
-                budgetLog.setOptType(5);
+                budgetLog.setOptType(BudgetLogOptFlag.State_5);
             }
             budgetLogService.saveBatch(oldLogList);
-            budgetLogList.forEach(a->a.setOptType(6));
+            budgetLogList.forEach(a->a.setOptType(BudgetLogOptFlag.State_6));
             budgetLogService.saveBatch(budgetLogList);
         }
         //创建流程后回调
@@ -179,7 +180,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                     currActivity = activity;
                 }
             }
-            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(1,sysUser, costApply, item, budget,item.getCenterGoodsAmount().negate(),currActivity);
+            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(BudgetLogOptFlag.State_1,sysUser, costApply, item, budget,item.getCenterGoodsAmount().negate(),currActivity);
             budgetLogList.add(budgetLog);
         }
         return budgetLogList;

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.consts.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
@@ -142,7 +143,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 }
             }
             BigDecimal amount = centerGoods.getCenterGoodsAmount().subtract(centerGoods.getUsedAmount());
-            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(4,sysUser,costApply,currCostItem,currentBudget,amount,activity);
+            TbsBudgetLog budgetLog = budgetLogService.buildTbsBudgetLog(BudgetLogOptFlag.State_4,sysUser,costApply,currCostItem,currentBudget,amount,activity);
             budgetLogList.add(budgetLog);
         }
         if(CollectionUtil.isNotEmpty(budgetLogList)){