diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java index 0c86c2ec9..724ccae89 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletFreezeController.java @@ -110,7 +110,6 @@ public class WalletFreezeController { return R.ok(walletFreezeService.create(dto)); } - @Operation(summary = "修改饭卡冻结记录表", description = "修改饭卡冻结记录表") @SysLog("修改饭卡冻结记录表") @PutMapping @@ -124,7 +123,8 @@ public class WalletFreezeController { @DeleteMapping @PreAuthorize("@pms.hasPermission('wallet_walletFreeze_del')") public R removeById(@RequestBody Long[] ids) { - return R.ok(walletFreezeService.removeBatchByIds(CollUtil.toList(ids))); + walletFreezeService.delByIds(CollUtil.toList(ids)); + return R.ok(); } @ResponseExcel diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java index d46eab41d..8e1fcd4a4 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletFreezeService.java @@ -8,6 +8,8 @@ import com.bsd.pjcloud.wallet.api.dto.WalletFreezeDto; import com.bsd.pjcloud.wallet.api.entity.WalletFreezeEntity; import com.bsd.pjcloud.wallet.api.vo.WalletFreezeVo; +import java.util.ArrayList; + public interface WalletFreezeService extends IService { Page pageJoin(Page page, WalletFreezeDto dto); @@ -19,4 +21,6 @@ public interface WalletFreezeService extends IService { void applyCallback(ProcessNodeRecordAssignUserParamDto dto); void applyFreeze(WalletFreezeDto dto, PjcloudUser user); + + void delByIds(ArrayList list); } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java index 8f952722d..7f80db09c 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java @@ -19,9 +19,11 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowEngineService; import com.bsd.pjcloud.flow.task.constant.NodeStatusEnum; import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto; +import com.bsd.pjcloud.flow.task.dto.TaskParamDto; import com.bsd.pjcloud.wallet.api.dto.WalletFreezeDto; import com.bsd.pjcloud.wallet.api.entity.*; import com.bsd.pjcloud.wallet.api.vo.WalletFreezeVo; @@ -63,6 +65,7 @@ public class WalletFreezeServiceImpl extends ServiceImpl pageJoin(Page page, WalletFreezeDto dto) { @@ -185,6 +188,20 @@ public class WalletFreezeServiceImpl extends ServiceImpl list) { + if (ObjectUtil.isEmpty(list)) return; + // 取消审批 + List walletFreezeList = this.baseMapper.selectByIds(list); + if (ObjectUtil.isNotEmpty(walletFreezeList)) { + TaskParamDto dto = new TaskParamDto(); + dto.setProcessInstanceIdList(walletFreezeList.stream().map(WalletFreezeEntity::getProcessId).toList()); + remoteFlowEngineService.stopProcessInstance(dto).getData(); + } + this.removeByIds(list); + } + @Transactional(rollbackFor = Exception.class) public void applyFlow(UserInfo userInfo, SysDept dept, WalletManageEntity wallet, WalletFreezeEntity obj) { // 发起审批