diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java index 10b2c01b7..9e4e07027 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java @@ -21,8 +21,10 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.resolver.ParamResolver; import com.bsd.pjcloud.common.data.tenant.TenantContextHolder; import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowEngineService; 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.constant.WalletBizRechargeEnum; import com.bsd.pjcloud.wallet.api.constant.WalletRechargeInvoiceStatusEnum; import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeBindInvoiceDto; @@ -81,6 +83,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl() .set(WalletRechargeInvoiceEntity::getPicUrl, null) + .set(WalletRechargeInvoiceEntity::getApplyTime, null) + .set(WalletRechargeInvoiceEntity::getProcessId, null) + .set(WalletRechargeInvoiceEntity::getProcessStatus, null) + .set(WalletRechargeInvoiceEntity::getProcessTime, null) + .set(WalletRechargeInvoiceEntity::getStampPicUrl, null) .eq(WalletRechargeInvoiceEntity::getId, id) ); } @@ -255,6 +263,12 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl创建的发票已经" + WalletRechargeInvoiceStatusEnum.codeOf(detail.getStatus()).getDesc() + "不能删除"); } + // 如果是审批中就取消审批 + if (ObjectUtil.equals(detail.getProcessStatus(), TaskCheckStatusEnum.PADDING.getCode())) { + TaskParamDto dto = new TaskParamDto(); + dto.setProcessInstanceIdList(List.of(detail.getProcessId())); + flowEngineService.stopProcessInstance(dto).getData(); + } // 删除申请记录 baseMapper.deleteById(v); // 删除申请记录条目 @@ -376,26 +390,31 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl and a.status = #{dto.status} - + and a.process_status = #{dto.processStatus} + + and a.process_id is null + and a.dept_or_user like concat('%', #{dto.deptOrUser}, '%')