mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-09-30 10:15:10 +08:00
parent dcb4c9188e
commit 50eb74ae1e
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java
View File

@ -103,6 +103,12 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
//销售经理姓名
.exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = info.custom_manager and su.nick_name like '%"+bo.getCustomManagerName()+"%'")
.orderByAsc("app.approver_status").orderByDesc("app.apply_date");
if (ApproverTypeEnum.PAY.getCode().equals( bo.getBusinessType()) || ApproverTypeEnum.RETURN.getCode().equals( bo.getBusinessType()) ){
if (bo.getPay() == null){
bo.setPay("1");
}
}
Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay());
if(CollectionUtils.isNotEmpty(res.getRecords())){

18
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ReturnApproverServiceImpl.java
View File

@ -74,13 +74,13 @@ public class ReturnApproverServiceImpl extends ApproverAbstractServiceImpl {
}
@Override
public Page<PsApproverRecordVo> queryList(PsApproverRecordBo bo, PageQuery pageQuery){
Page<PsApproverRecordVo> res = super.queryList(bo, pageQuery);
for (PsApproverRecordVo record : res.getRecords()) {
PsContractPayVo psContractPayVo = payMapper.selectVoById(record.getBusinessId());
record.setPsContractPayVo(psContractPayVo);
}
return res;
}
// @Override
// public Page<PsApproverRecordVo> queryList(PsApproverRecordBo bo, PageQuery pageQuery){
// Page<PsApproverRecordVo> res = super.queryList(bo, pageQuery);
// for (PsApproverRecordVo record : res.getRecords()) {
// PsContractPayVo psContractPayVo = payMapper.selectVoById(record.getBusinessId());
// record.setPsContractPayVo(psContractPayVo);
// }
// return res;
// }
}

4
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
View File

@ -471,6 +471,8 @@ public class PsTaskServiceImpl implements IPsTaskService {
lqw.eq(bo.getId() != null,"main.id",bo.getId());
lqw.like(StringUtils.isNotBlank(bo.getContractCode()), "main.contract_code", bo.getContractCode());
lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), "com.company_name", bo.getCompanyName());//公司名称
lqw.like(StringUtils.isNotBlank(bo.getCustomerNum()), "com.customer_num", bo.getCustomerNum());//纳税人识别号
lqw.eq(StringUtils.isNotBlank(bo.getCustomerCert()), "com.customer_cert", bo.getCustomerCert());//纳税人资格
@ -483,6 +485,8 @@ public class PsTaskServiceImpl implements IPsTaskService {
lqw.like(StringUtils.isNotBlank(bo.getCustomMobile()), "cus.custom_mobile", bo.getCustomMobile());//客户电话
lqw.eq(StringUtils.isNotBlank(bo.getCustomScene()), "con.custom_scene", bo.getCustomScene());//是否到达现场
lqw.eq(StringUtils.isNotBlank(bo.getIsProxy()), "con.is_proxy", bo.getIsProxy());//是否代账
//服务项目编码集合
lqw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjectCode()), "select 1 from ps_contract_business detail " +
"where detail.contract_code = con.contract_code and detail.business_type in ("+StringUtils.join(bo.getServiceProjectCode(),",")+")");//服务项目编码集合

18
pusong-modules/pusong-business/src/main/resources/mapper/business/PsApproverRecordMapper.xml
View File

@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap id="resultMap" type="com.pusong.business.domain.vo.PsApproverRecordVo">
<association columnPrefix="pay_" property="psContractPayVo" javaType="com.pusong.business.domain.vo.PsContractPayVo" >
</association>
<collection property="psCompanyInfoVo" ofType="com.pusong.business.domain.vo.PsCompanyInfoVo" >
<collection columnPrefix="com_" property="psCompanyInfoVo" ofType="com.pusong.business.domain.vo.PsCompanyInfoVo" >
</collection>
</resultMap>
@ -38,14 +38,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)-(select IFNULL(sum(pay.money),0) from ps_contract_pay pay where pay.pay_status = 1 and pay.business_type = 2 and pay.contract_code = info.contract_code)
as pay_money
<if test="pay != null">
,pay.*
,pay.pay_status pay_pay_status
,pay.money pay_money
,pay.pay_date pay_pay_date
,pay.pay_type pay_pay_type
,pay.pay_mode pay_pay_mode
,pay.gath_main pay_gath_main
,pay.pay_certification pay_pay_certification
,pay.pay_desc pay_pay_desc
</if>
from ps_approver_record app
left join ps_contract_info info on app.contract_code = info.contract_code and app.del_flag = 0
left join ps_company_info com on info.company_id = com.id
left join ps_custom_info cus on cus.id = info.custom_id
<if test="pay != null">
inner join ps_contract_pay pay on pay.id = app.business_id and pay.pay_mode = ${pay}
<if test="pay == 1">
inner join ps_contract_pay pay on pay.id = app.business_id
</if>
<if test="pay != 1">
inner join ps_contract_pay pay on pay.id = app.business_id and pay.pay_mode = ${pay}
</if>
</if>
${ew.getCustomSqlSegment}