From 30d9abb786269a6cde71a09a42225d06d7a2ed30 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 30 Jan 2023 14:26:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=B1=BB=E5=9E=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=9D=99=E6=80=81=E5=AD=97=E6=AE=B5=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/model/consts/BudgetLogOptFlag.java | 11 ++++------- .../modules/tbs/controller/TbsBudgetController.java | 5 +++-- .../tbs/controller/TbsCostApplyController.java | 3 ++- .../tbs/service/impl/TbsCostApplyServiceImpl.java | 7 ++++--- .../vtb/service/impl/VtbVerificationServiceImpl.java | 3 ++- 5 files changed, 15 insertions(+), 14 deletions(-) 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 index ef9d32e7..06b20699 100644 --- a/src/main/java/com/qs/serve/common/model/consts/BudgetLogOptFlag.java +++ b/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; } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 3bcd639d..e8a59f83 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/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); 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 2bddb337..11218721 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 @@ -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(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index a3f459f6..d0d44ea7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/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 ServiceImpla.setOptType(6)); + budgetLogList.forEach(a->a.setOptType(BudgetLogOptFlag.State_6)); budgetLogService.saveBatch(budgetLogList); } //创建流程后回调 @@ -179,7 +180,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl