异动测试；作废功能测试

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),

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}")
+    @PostMapping("/listById/{id}")
-    public R<?> getChangeList(@PathVariable("code") String code){
+    public R<?> getChangeList(@PathVariable("id") String id){
+        TbsCostApply costApply = tbsCostApplyService.getById(id);
         LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(TbsCostApply::getCode,code);
+        lqw.eq(TbsCostApply::getCode,costApply.getCode());
         lqw.orderByAsc(TbsCostApply::getCreateTime);
         List<TbsCostApply> costApplyList = tbsCostApplyService.list(lqw);
         return R.ok(costApplyList);

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;
 

src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetLogMapper.java

@@ -29,7 +29,7 @@ public interface TbsBudgetLogMapper extends BaseMapper<TbsBudgetLog> {
      * @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);
 
 }

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());

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

@@ -113,6 +113,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void removeCostById(Long id) {
         TbsCostApply costApply = this.getById(id);
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){

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

@@ -169,7 +169,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         }
         activityCenterGoodsService.updateBatchById(centerGoodsList);
         //如果为最后的活动，更变费用申请状态
-        costApplyService.flushCostStatus(costApply.getId(),costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1));
+        if(costApply.getChargeState().equals(TbsCostApplyState.State_3_finished.getCode())){
+            TbsCostApply costApplyUpdate = new TbsCostApply();
+            costApplyUpdate.setId(activity.getCostApplyId());
+            costApplyUpdate.setChargeState(TbsCostApplyState.State_2_actioning.getCode());
+            costApplyService.updateById(costApplyUpdate);
+        }
+
     }
 
     private void removeWithVerification(Long verificationId){