审批列表

This commit is contained in:
1073413548 2024-09-09 13:22:59 +08:00
parent f04ff3e24e
commit 64ef9d6c78
2 changed files with 6 additions and 1 deletions

View File

@ -92,7 +92,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
QueryWrapper<PsApproverRecord> lqw = Wrappers.<PsApproverRecord>query().eq("app.business_type",approverType()) QueryWrapper<PsApproverRecord> lqw = Wrappers.<PsApproverRecord>query().eq("app.business_type",approverType())
.eq(bo.getId()!=null,"app.id",bo.getId()) .eq(bo.getId()!=null,"app.id",bo.getId())
.eq("app.del_flag","0") .eq("app.del_flag","0")
.like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus()) .eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus())
.like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName()) .like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName())
.like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName()) .like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName())
//销售经理姓名 //销售经理姓名

View File

@ -22,6 +22,7 @@ import com.pusong.business.mapper.PsContractPayMapper;
import com.pusong.business.mapper.PsCustomInfoMapper; import com.pusong.business.mapper.PsCustomInfoMapper;
import com.pusong.common.core.service.UserService; import com.pusong.common.core.service.UserService;
import com.pusong.common.core.utils.DateUtils; import com.pusong.common.core.utils.DateUtils;
import com.pusong.common.core.utils.StringUtils;
import com.pusong.common.mybatis.core.page.PageQuery; import com.pusong.common.mybatis.core.page.PageQuery;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -85,6 +86,10 @@ public class PublicApproverServiceImpl extends ApproverAbstractServiceImpl {
public Page<PsApproverRecordVo> queryList(PsApproverRecordBo bo, PageQuery pageQuery){ public Page<PsApproverRecordVo> queryList(PsApproverRecordBo bo, PageQuery pageQuery){
QueryWrapper<PsApproverRecord> lqw = Wrappers.<PsApproverRecord>query().eq("app.business_type",approverType()) QueryWrapper<PsApproverRecord> lqw = Wrappers.<PsApproverRecord>query().eq("app.business_type",approverType())
.eq(bo.getId()!=null,"app.id",bo.getId()) .eq(bo.getId()!=null,"app.id",bo.getId())
.like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName())
.exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = app.update_data and su.nick_name like '%" + bo.getCustomManagerName() + "%'")
.exists(StringUtils.isNotBlank(bo.getCompanyName()),"select 1 from ps_company_info com where cus.id = com.custom_id and com.company_name like '%" + bo.getCompanyName() + "%'")
.eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus())
.orderByAsc("app.approver_status").orderByAsc("app.approver_date");; .orderByAsc("app.approver_status").orderByAsc("app.approver_date");;
Page<PsApproverRecordVo> res = recordMapper.selectPagePublicList(pageQuery.build(), lqw); Page<PsApproverRecordVo> res = recordMapper.selectPagePublicList(pageQuery.build(), lqw);
if(CollectionUtils.isEmpty(res.getRecords())){ if(CollectionUtils.isEmpty(res.getRecords())){