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-09-06 15:26:06 +08:00
parent d7781e355f
commit 4ba3aa03d6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/HomeController.java
View File

@ -36,7 +36,7 @@ public class HomeController extends BaseController {
private final HomeService homeService;
/**
* 首页大盘数据
* 首页大盘数据：本月成交总金额
* @param type 1本月 2上月 3本季度 4本年 5所有
* @return
*/
@ -46,5 +46,16 @@ public class HomeController extends BaseController {
return R.ok(homeService.selectMakeAmount(type));
}
// /**
// * 首页大盘数据：本月回款情况
// * @param type 1本月 2上月 3本季度 4本年 5所有
// * @return
// */
// @SaCheckPermission("business:salary:list")
// @GetMapping("/returnMoney")
// public R<MakeAmountVo> selectMakeAmount(@RequestParam() Integer type) {
// return R.ok(homeService.selectMakeAmount(type));
// }
}

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

@ -82,7 +82,7 @@ public class PsApproverRecordBo {
/**
* 客户姓名
*/
private String customName;
private String customerName;
/**
* 客户电话
*/

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

@ -93,7 +93,7 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService {
.eq(bo.getId()!=null,"app.id",bo.getId())
.eq("app.del_flag","0")
.like(StringUtils.isNotBlank(bo.getApproverStatus()),"app.approver_status",bo.getApproverStatus())
.like(StringUtils.isNotBlank(bo.getCustomName()),"cus.custom_name",bo.getCustomName())
.like(StringUtils.isNotBlank(bo.getCustomerName()),"cus.custom_name",bo.getCustomerName())
.like(StringUtils.isNotBlank(bo.getCompanyName()),"com.company_name",bo.getCompanyName())
//销售经理姓名
.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()+"%'")

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java
View File

@ -370,7 +370,10 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
qw.exists(StringUtils.isNotBlank(queryBo.getCustomIntroducerName()),"select 1 from ps_custom_info pc where pc.id = custom.custom_introducer and pc.custom_name like '%"+queryBo.getCustomIntroducerName()+"%'");
qw.exists(StringUtils.isNotBlank(queryBo.getCustomManagerName()),"select 1 from sys_user su where su.user_id = custom.custom_manager and su.nick_name like '%"+queryBo.getCustomManagerName()+"%'");
if(queryBo.getType() !=null && queryBo.getType() == 2){
qw.eq("con.contract_status", ContractStatusEnum.SUCCESS.getCode());
// qw.eq("con.contract_status", ContractStatusEnum.SUCCESS.getCode());
//已完成合同列表：客户下不存在未完成的合同信息（不包括作废和暂存的合同）
qw.notExists("select 1 from ps_contract_info pscon where pscon.custom_id = custom.id and pscon.contract_status not in ('"+ContractStatusEnum.SUCCESS.getCode()+"','"
+ContractStatusEnum.INIT.getCode()+"' and pscon.is_cancel != '03')");
}else if (queryBo.getType() !=null && queryBo.getType() == 1) {
//托管类服务类型编码集合
qw.exists(queryBo.getServiceType() !=null && queryBo.getServiceType() == 1, "select 1 from ps_contract_business bus " +