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

任务显示账套号，客户手机号不能重复，续费合同有托管之外业务也生成任务

Browse Source
This commit is contained in:
mx 2025-01-10 18:27:01 +08:00
parent 6f258e06e4
commit 6e5f378048
4 changed files with 19 additions and 5 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/service/approver/impl/PayContractApproverServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.pusong.business.domain.PsContractInfo;
import com.pusong.business.domain.PsContractPay; import com.pusong.business.domain.PsContractPay;
import com.pusong.business.domain.PsTaskMain; import com.pusong.business.domain.PsTaskMain;
import com.pusong.business.domain.vo.PsCompanyInfoVo; import com.pusong.business.domain.vo.PsCompanyInfoVo;
import com.pusong.business.domain.vo.PsContractBusinessVo;
import com.pusong.business.domain.vo.PsContractInfoVo; import com.pusong.business.domain.vo.PsContractInfoVo;
import com.pusong.business.domain.vo.PsContractPayVo; import com.pusong.business.domain.vo.PsContractPayVo;
import com.pusong.business.enums.*; import com.pusong.business.enums.*;
@ -83,7 +84,17 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
// log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus()); // log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus());
List<PsTaskMain> tasks = taskMainService.queryByContractCode(psApproverRecord.getContractCode()); List<PsTaskMain> tasks = taskMainService.queryByContractCode(psApproverRecord.getContractCode());
if(!"1".equals(info.getIsDue()) && (tasks.isEmpty() || tasks.get(0).getId() == null)){
boolean hasTaskBus = false;
for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) {
for (PsContractBusinessVo psContractBusinessVo : psCompanyInfoVo.getBusinessVoList()) {
if (!"2".equals(psContractBusinessVo.getBusinessType())){
hasTaskBus = true;
}
}
}
//不是续费合同 或者 是续费但是有除了托管之外其他的项目
if((!"1".equals(info.getIsDue()) || hasTaskBus)&& (tasks.isEmpty() || tasks.get(0).getId() == null)){
log.info("任务未初始化，初始化任务主表"); log.info("任务未初始化，初始化任务主表");
List<PsTaskMain> psTaskMainList = new ArrayList<>(); List<PsTaskMain> psTaskMainList = new ArrayList<>();
for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) { for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) {

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

@ -447,6 +447,12 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService {
*/ */
private void validEntityBeforeSave(PsCustomInfo entity){ private void validEntityBeforeSave(PsCustomInfo entity){
//TODO 校验状态 //TODO 校验状态
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("custom_mobile", entity.getCustomMobile());
List list = baseMapper.selectList(queryWrapper);
if (!list.isEmpty()){
throw new ServiceException("该手机号已录入客户，不能重复录入");
}
} }
/** /**

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

@ -133,13 +133,9 @@ public class PsTaskServiceImpl implements IPsTaskService {
record.setPsTaskAppointVoList(collect.get(record.getId())); record.setPsTaskAppointVoList(collect.get(record.getId()));
} }
} }
} }
fillInfo(page); fillInfo(page);
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }

1
pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml
View File

@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
scom.customer_num scom_customer_num, scom.customer_num scom_customer_num,
scom.customer_cert scom_customer_cert, scom.customer_cert scom_customer_cert,
scom.first_filing_time scom_first_filing_time, scom.first_filing_time scom_first_filing_time,
scom.finance_account_no scom_finance_account_no,
com.id com_id, com.id com_id,
com.company_name com_company_name, com.company_name com_company_name,
usr.nick_name scom_custom_manager_name, usr.nick_name scom_custom_manager_name,