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

生成合同

Browse Source
This commit is contained in:
1073413548 2024-08-30 18:40:16 +08:00
parent 72aa2164a2
commit 7e74f38ac4
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsApproverRecordBo.java
View File

@ -82,7 +82,11 @@ public class PsApproverRecordBo {
/**
* 客户姓名
*/
private String customerName;
private String customName;
/**
* 客户电话
*/
private String customMobile;
/**
* 公司姓名
*/
@ -90,6 +94,6 @@ public class PsApproverRecordBo {
/**
* 销售经理姓名
*/
private String customerManageName;
private String customManagerName;
}

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsRefundVo.java
View File

@ -31,6 +31,11 @@ public class PsRefundVo {
* 所属客户经理
*/
private String customManager;
/**
* 所属客户经理
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME,mapper = "customManager")
private String customManagerName;
/**
* 客户姓名

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

@ -92,11 +92,11 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
QueryWrapper<PsApproverRecord> lqw = Wrappers.<PsApproverRecord>query().eq("app.business_type",approverType())
.eq(bo.getId()!=null,"app.id",bo.getId())
.eq("app.del_flag","0")
.eq(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus())
.eq(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName())
.eq(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName())
.like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus())
.like(StringUtils.isNotBlank(bo.getCustomName()),"cus.custom_name",bo.getCustomName())
.like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName())
//销售经理姓名
.exists(StringUtils.isNotBlank(bo.getCustomerManageName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+bo.getCustomerManageName()+"%")
.exists(StringUtils.isNotBlank(bo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+bo.getCustomManagerName()+"%")
.orderByAsc("app.approver_status").orderByDesc("app.apply_date");
Page<PsApproverRecordVo> res = recordMapper.selectPageApproverList(pageQuery.build(), lqw);
if(CollectionUtils.isNotEmpty(res.getRecords())){

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

@ -174,7 +174,9 @@ public class PsContractPayServiceImpl implements IPsContractPayService {
.exists(StringUtils.isNotBlank(customManageName),"select 1 from sys_user su where su.user_id = cus.custom_manager and su.nick_name like %"+customManageName+"%")
.like(StringUtils.isNotBlank(companyName),"com.company_name",companyName)
.like(StringUtils.isNotBlank(mobile),"cus.custom_mobile",mobile)
.eq(StringUtils.isNotBlank(name),"cus.custom_name",name);
.eq(StringUtils.isNotBlank(name),"cus.custom_name",name)
.in("pay.pay_status",List.of(PayStatusEnum.SUCCESS.getCode(),PayStatusEnum.PAYING.getCode()))
.eq("pay.business_type","2");
Page<PsRefundVo> list = baseMapper.queryRefundList(pageQuery.build(), qw);
list.getRecords().forEach(info->{
List<PsContractPayVo> payList = queryListByContractCode(info.getContractCode(),null,PayStatusEnum.SUCCESS);

3
pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractPayMapper.xml
View File

@ -7,10 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="queryRefundList" resultType="com.pusong.business.domain.vo.PsRefundVo">
select pay.id,pay.money return_money,pay.pay_mode,pay.gath_main,pay.pay_status,pay.pay_certification,
com.company_name,cus.custom_name,cus.custom_mobile,cus.custom_manager,info.contract_code,info.pdf_id,
info.contract_amount,
(select GROUP_CONCAT(business.business_type SEPARATOR ',')
from ps_contract_business business where business.contract_code = info.contract_code and business.del_flag = '0') as business_type_name
from ps_contract_pay pay
left join ps_contract_info info on pay.contract_code = info.contract_code and pay.pay_status in (1,2,3) and pay.business_type = 2
left join ps_contract_info info on pay.contract_code = info.contract_code
left join ps_company_info com on com.id = info.company_id
left join ps_custom_info cus on cus.id = info.custom_id
${ew.getCustomSqlSegment}