From 6e5f37804803a7a88944cc6c0fe69299df36c0ff Mon Sep 17 00:00:00 2001 From: mx <1@qq.com> Date: Fri, 10 Jan 2025 18:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA=E8=B4=A6?= =?UTF-8?q?=E5=A5=97=E5=8F=B7=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=EF=BC=8C=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9=E5=90=88=E5=90=8C=E6=9C=89=E6=89=98=E7=AE=A1=E4=B9=8B?= =?UTF-8?q?=E5=A4=96=E4=B8=9A=E5=8A=A1=E4=B9=9F=E7=94=9F=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayContractApproverServiceImpl.java | 13 ++++++++++++- .../service/impl/PsCustomInfoServiceImpl.java | 6 ++++++ .../business/service/impl/PsTaskServiceImpl.java | 4 ---- .../resources/mapper/business/PsTaskMainMapper.xml | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index 48addce..01d9913 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -5,6 +5,7 @@ import com.pusong.business.domain.PsContractInfo; import com.pusong.business.domain.PsContractPay; import com.pusong.business.domain.PsTaskMain; 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.PsContractPayVo; import com.pusong.business.enums.*; @@ -83,7 +84,17 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl // log.info("查询回款记录数量{}任务状态{}", list.size(),info.getContractStatus()); List 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("任务未初始化，初始化任务主表"); List psTaskMainList = new ArrayList<>(); for (PsCompanyInfoVo psCompanyInfoVo : info.getPsCompanySerivceVo()) { diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java index df9b33d..43146a8 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCustomInfoServiceImpl.java @@ -447,6 +447,12 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { */ private void validEntityBeforeSave(PsCustomInfo entity){ //TODO 校验状态 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("custom_mobile", entity.getCustomMobile()); + List list = baseMapper.selectList(queryWrapper); + if (!list.isEmpty()){ + throw new ServiceException("该手机号已录入客户，不能重复录入"); + } } /** diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java index 76b1034..d0ff5ce 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java @@ -133,13 +133,9 @@ public class PsTaskServiceImpl implements IPsTaskService { record.setPsTaskAppointVoList(collect.get(record.getId())); } } - - } fillInfo(page); - - return TableDataInfo.build(page); } diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml index b8abab6..f7f2386 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsTaskMainMapper.xml @@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" scom.customer_num scom_customer_num, scom.customer_cert scom_customer_cert, scom.first_filing_time scom_first_filing_time, + scom.finance_account_no scom_finance_account_no, com.id com_id, com.company_name com_company_name, usr.nick_name scom_custom_manager_name,