Browse Source

预算审批异常修复;添加导出接口;审批释放预算异常;

v1.0
Yen 2 years ago
parent
commit
9478e7dd98
  1. 2
      src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
  2. 2
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
  3. 2
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
  4. 7
      src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

2
src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java

@ -399,7 +399,7 @@ public class TbsActivityController {
@SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE) @SysLog(module = SystemModule.Budget, title = "费用活动", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:activity:release')") @PreAuthorize("hasRole('tbs:activity:release')")
public R<?> release(@PathVariable("id") Long id){ public R<?> release(@PathVariable("id") Long id){
verificationService.release(id); verificationService.release(id,true);
return R.ok(); return R.ok();
} }

2
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@ -280,7 +280,7 @@ public class VtbVerificationApplication {
//释放费用 //释放费用
boolean isRelease = affairCommit.getReleaseFlag()!=null&&affairCommit.getReleaseFlag().equals(1); boolean isRelease = affairCommit.getReleaseFlag()!=null&&affairCommit.getReleaseFlag().equals(1);
if( isRelease &&(isFinish||isStop)){ if( isRelease &&(isFinish||isStop)){
this.vtbVerificationService.release(verification.getActivityId()); this.vtbVerificationService.release(verification.getActivityId(),false);
} }
if(isNext){ if(isNext){
//判断是否直接跳过审批的申请 //判断是否直接跳过审批的申请

2
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java

@ -33,7 +33,7 @@ public interface VtbVerificationService extends IService<VtbVerification> {
* 释放活动费用 * 释放活动费用
* @param activityId * @param activityId
*/ */
void release(Long activityId); void release(Long activityId,Boolean throwEx);
/** /**
* 冻结 * 冻结

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

@ -158,6 +158,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
activity.setUsedAmount(finalAmt); activity.setUsedAmount(finalAmt);
if(finalAmt.compareTo(activity.getTotalAmount())==0) { if(finalAmt.compareTo(activity.getTotalAmount())==0) {
activity.setActivityState(TbsActivityState.STATE_1_Finished); activity.setActivityState(TbsActivityState.STATE_1_Finished);
activity.setFinishedFlag(1);
activity.setFinishedTime(LocalDateTime.now());
} }
activityService.updateById(activity); activityService.updateById(activity);
@ -413,10 +415,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void release(Long activityId) { public void release(Long activityId,Boolean throwEx) {
SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
TbsActivity activity = activityService.getById(activityId); TbsActivity activity = activityService.getById(activityId);
if(!activity.getActivityState().equals(TbsActivityState.STATE_0_Todo)){ if(!activity.getActivityState().equals(TbsActivityState.STATE_0_Todo)){
if(!throwEx){
return;
}
Assert.throwEx("活动状态非待核销状态,操作失败"); Assert.throwEx("活动状态非待核销状态,操作失败");
} }
if(activity.getCancelFlag().equals(1)){ if(activity.getCancelFlag().equals(1)){

Loading…
Cancel
Save