From 4f1187d757fd2098b88f667bfcf6dccb712d403e Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 28 Jul 2023 17:44:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=8A=A8=E6=B5=8B=E8=AF=95=EF=BC=9B?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/tbs/common/TbsCostApplyState.java | 2 +- .../tbs/controller/TbsCostApplyController.java | 11 ++++++----- .../serve/modules/tbs/entity/vo/TbsCostApplyVo.java | 2 ++ .../serve/modules/tbs/mapper/TbsBudgetLogMapper.java | 2 +- .../service/impl/TbsCostApplyPart1ServiceImpl.java | 4 ++-- .../tbs/service/impl/TbsCostApplyServiceImpl.java | 1 + .../vtb/service/impl/VtbVerificationServiceImpl.java | 8 +++++++- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java index 053eed2c..544e547f 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java +++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java @@ -15,7 +15,7 @@ import java.util.List; @AllArgsConstructor public enum TbsCostApplyState { - //状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回;5-中止;6-作废;7-异动；8-异动失败 + //状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回;5-中止;6-作废;7-异动；8-异动中止 State_0_unPublish(0), State_1_apply(1), State_2_actioning(2), 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 bdf3c337..330ccb4a 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 @@ -273,7 +273,7 @@ public class TbsCostApplyController { } /** - * 异动申请 + * 异动申请(取消) * @param id * @return */ @@ -287,13 +287,14 @@ public class TbsCostApplyController { /** * 通过编号加载费用 - * @param code + * @param id * @return */ - @PostMapping("/listByCode/{code}") - public R getChangeList(@PathVariable("code") String code){ + @PostMapping("/listById/{id}") + public R getChangeList(@PathVariable("id") String id){ + TbsCostApply costApply = tbsCostApplyService.getById(id); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(TbsCostApply::getCode,code); + lqw.eq(TbsCostApply::getCode,costApply.getCode()); lqw.orderByAsc(TbsCostApply::getCreateTime); List costApplyList = tbsCostApplyService.list(lqw); return R.ok(costApplyList); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 268ac757..27ebb5b8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -28,6 +28,8 @@ public class TbsCostApplyVo implements Serializable { /** id */ private Long id; + private String code; + /** 主题 */ private String chargeTheme; diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java index 73011175..e8ad1ceb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java @@ -29,7 +29,7 @@ public interface TbsBudgetLogMapper extends BaseMapper { * @param costApplyId * @param delState */ - @Update("update tbs_budget_log set del_flag = #{delState} WHERE cost_apply_id = #{costApplyId}}") + @Update("update tbs_budget_log set del_flag = #{delState} WHERE cost_apply_id = #{costApplyId}") void updateLogDelFlagByCostApply(@Param("costApplyId")Long costApplyId,@Param("delState")Integer delState); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index 656d5287..75d5ea21 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -116,10 +116,10 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { tbsActivityMapper.update(activity4Update,activityLqw); this.copyAboutActivityData(newCostApplyId, activityList); //更变旧记录 + orgCost.setChangeStateRecord(orgCost.getChargeState()); orgCost.setChargeState(TbsCostApplyState.State_7_changed.getCode()); orgCost.setCancelFlag(1); orgCost.setChangeExtendId(costApply.getId()); - orgCost.setChangeStateRecord(costApply.getChargeState()); orgCost.setChangeActionTime(LocalDateTime.now()); tbsCostApplyService.updateById(orgCost); return costApply; @@ -149,8 +149,8 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { } } extCost.setCancelFlag(1); - extCost.setChargeState(TbsCostApplyState.State_8_changed_fail.getCode()); extCost.setChangeStateRecord(extCost.getChargeState()); + extCost.setChargeState(TbsCostApplyState.State_8_changed_fail.getCode()); tbsCostApplyService.updateById(extCost); //恢复原来费用申请的状态 TbsCostApply costApply = tbsCostApplyService.getById(extCost.getChangeSourceId()); 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 585cdc44..2dc3463b 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 @@ -113,6 +113,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl