From 486828f9f3693aa5295af98e8e00075e7448a41d Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Mon, 30 Dec 2024 19:03:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/bo/PsContractInfoQueryBo.java | 5 ++ .../domain/vo/PsContractBusinessVo.java | 2 + .../pusong/business/enums/TaskStatusEnum.java | 4 +- .../impl/PsContractInfoServiceImpl.java | 52 +++++++++++++------ .../service/impl/PsCustomInfoServiceImpl.java | 2 + .../business/PsContractBusinessMapper.xml | 3 +- 6 files changed, 49 insertions(+), 19 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java index 4a9c1d8..b892d17 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java @@ -92,5 +92,10 @@ public class PsContractInfoQueryBo { */ private String isDue; + /** + * 是否代账 + */ + private String isProxy; + } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java index 1cde4c3..8da06d4 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/PsContractBusinessVo.java @@ -92,4 +92,6 @@ public class PsContractBusinessVo implements Serializable { * 剩余天数 */ private int remainingDay; + + private String pdfId; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java index 640fcda..0e5a19d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/enums/TaskStatusEnum.java @@ -18,7 +18,9 @@ public enum TaskStatusEnum { FINISH("30","完成"), PAUSE("40","暂停"), CANCEL("50","作废"), - CANCELAPPO("55","作废审批中"); + CANCELAPPO("55","作废审批中") + ,DISABLED("60", "因合同修改失效") + ; private String code; private String text; diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index da427ca..1c1a00f 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.pusong.business.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -566,7 +567,9 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { } } - List psTaskMainList = new ArrayList<>(); + + + for (PsCompanyInfoBo companyInfoBo : addCompany) { //服务公司加，增加任务，重新计算合同是待分配还是已分配 companyInfoBo.setCompanyType("2"); @@ -580,20 +583,33 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { psContractBusinessBo.setCompanyId(companyInfoBo.getId()); } } - if(ContractStatusEnum.isReturn(old.getContractStatus())){ - //已回款的添加任务，没回款的等审批后再添加 - PsTaskMain psTaskMain = new PsTaskMain(); - psTaskMain.setContractCode(old.getContractCode()); - psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode()); - psTaskMain.setTaskStatus(TaskStatusEnum.INIT.getCode()); - psTaskMain.setCompanyId(updateBo.getCompanyInfoBo().getId()); - psTaskMain.setCustomId(updateBo.getCustomId()); - psTaskMain.setServiceCompanyId(companyInfoBo.getId()); - psTaskMainList.add(psTaskMain); - } + } - if (!psTaskMainList.isEmpty()){ - taskMainService.insertBatch(psTaskMainList); + + //标记所有任务为 失效。 合同号 + UpdateWrapper wrapper = new UpdateWrapper(); + wrapper.eq("contract_code", updateBo.getContractCode()); + wrapper.set("task_status", TaskStatusEnum.DISABLED.getCode()); + taskMainMapper.update(wrapper); + + if(!"1".equals(updateBo.getIsDue())){ + List psTaskMainList = new ArrayList<>(); + for (PsCompanyInfoBo companyInfoBo : updateBo.getServiceCompanyInfoList()){ + if(ContractStatusEnum.isReturn(old.getContractStatus())){ + //已回款的添加任务，没回款的等审批后再添加 + PsTaskMain psTaskMain = new PsTaskMain(); + psTaskMain.setContractCode(old.getContractCode()); + psTaskMain.setTaskType(TaskTypeEnum.CONTRACT.getCode()); + psTaskMain.setTaskStatus(TaskStatusEnum.INIT.getCode()); + psTaskMain.setCompanyId(updateBo.getCompanyInfoBo().getId()); + psTaskMain.setCustomId(updateBo.getCustomId()); + psTaskMain.setServiceCompanyId(companyInfoBo.getId()); + psTaskMainList.add(psTaskMain); + } + } + if (!psTaskMainList.isEmpty()){ + taskMainService.insertBatch(psTaskMainList); + } } @@ -1098,16 +1114,18 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { qw.exists("select 1 from ps_contract_business bus where info.contract_code = bus.contract_code and bus.business_type = 2"); }else{ //托管类服务类型编码集合 - qw.exists(bo.getServiceType() !=null && bo.getServiceType() == 1, "select 1 from ps_contract_business bus " + + qw.exists(bo.getServiceType() != null && bo.getServiceType() == 1, "select 1 from ps_contract_business bus " + "where bus.contract_code = info.contract_code and bus.business_type = 2"); //非托管服务类型编码集合 - qw.notExists(bo.getServiceType() !=null && bo.getServiceType() == 2, "select 1 from ps_contract_business bus " + + qw.notExists(bo.getServiceType() != null && bo.getServiceType() == 2, "select 1 from ps_contract_business bus " + "where bus.contract_code = info.contract_code and bus.business_type = 2"); } + qw.exists(bo.getIsProxy() != null, "select 1 from ps_contract_business bus " + + "where bus.contract_code = info.contract_code and bus.is_proxy = '" + bo.getIsProxy() + "'"); //服务项目编码集合 qw.exists(CollectionUtils.isNotEmpty(bo.getServiceProjects()), "select 1 from ps_contract_business detail " + "where detail.contract_code = info.contract_code and detail.business_type in ("+StringUtils.join(bo.getServiceProjects(),",")+")");//服务项目编码集合 - qw.between(bo.getMoneyEnd() != null && bo.getMoneyStart() !=null,"info.contract_amount",bo.getMoneyStart(),bo.getMoneyEnd()); + qw.between(bo.getMoneyEnd() != null && bo.getMoneyStart() != null,"info.contract_amount",bo.getMoneyStart(),bo.getMoneyEnd()); // qw.orderByDesc("info.create_time"); qw.orderByDesc("info.apply_date"); return qw; 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 bb0fa4f..df9b33d 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 @@ -316,6 +316,8 @@ public class PsCustomInfoServiceImpl implements IPsCustomInfoService { //app搜索 qw.and(StringUtils.isNotBlank(bo.getAppKeyWord()), wrapper -> wrapper + .like("usr.nick_name", bo.getAppKeyWord()) + .or() .like("psinfo.custom_name", bo.getAppKeyWord()) .or() .likeLeft("info.custom_mobile", bo.getAppKeyWord()) diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml index 35599f5..1c4588d 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsContractBusinessMapper.xml @@ -38,9 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"