From 2be69419566bd285e8d69609e61fef7983d3e0d2 Mon Sep 17 00:00:00 2001 From: 1073413548 <14628403+gjb0917@user.noreply.gitee.com> Date: Thu, 29 Aug 2024 17:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ApproverAbstractServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index 4b88468..2bb5a79 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -1,6 +1,7 @@ package com.pusong.business.service.approver.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -52,12 +53,15 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { */ public void apply(String bussinessId,String contractCode, String desc, String updateData){ //退款,回款审批时用 合同编号进行查询校验 - List list = approverRecordMapper.selectList(Wrappers.lambdaQuery().eq(PsApproverRecord::getDelFlag, "0") - .eq(PsApproverRecord::getBusinessId, - StringUtils.equals(approverType(),ApproverTypeEnum.RETURN.getCode()) || StringUtils.equals(approverType(),ApproverTypeEnum.PAY.getCode()) - ?contractCode:bussinessId) - .eq(PsApproverRecord::getBusinessType,approverType()) - .eq(PsApproverRecord::getApproverStatus, ApproverStatusEnum.INIT.getCode())); + LambdaQueryWrapper wq = Wrappers.lambdaQuery().eq(PsApproverRecord::getDelFlag, "0") + .eq(PsApproverRecord::getBusinessType, approverType()) + .eq(PsApproverRecord::getApproverStatus, ApproverStatusEnum.INIT.getCode()); + if(StringUtils.equals(approverType(), ApproverTypeEnum.RETURN.getCode()) || StringUtils.equals(approverType(), ApproverTypeEnum.PAY.getCode())){ + wq.eq(PsApproverRecord::getContractCode,contractCode); + }else{ + wq.eq(PsApproverRecord::getBusinessId,bussinessId); + } + List list = approverRecordMapper.selectList(wq); if(CollectionUtils.isNotEmpty(list)){ throw new ServiceException("已存在同类型审批，请勿重复提交"); }