From 2b24e6bb34f5fe816c932d9811b82e12f460e40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Wed, 8 Sep 2021 10:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=B8=8B=E5=A7=93=E5=90=8D=E9=87=8D=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayContactsManagementController.java | 68 +++++++++++++++++-- .../jero/project/common/PayProjectCommon.java | 4 ++ .../PayCommonProjectController.java | 17 ++++- 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 52222e72..3699a060 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -123,13 +123,12 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayContactsManagement::getPhone,phone); - payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); + PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); // 手机号存在，并且编辑id与查询不同，则校验不通过 if(!Objects.isNull(payContactsManagementNew)) { return Result.error("手机号已存在！"); @@ -138,6 +137,20 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName()); + queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId()); + PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); + // 姓名存在，则校验不通过 + if(!Objects.isNull(payContactsManagementNew)) { + return Result.error("联系人姓名已存在！"); + } + }catch (Exception e){ + log.info("联系人管理-添加异常",e); + return Result.error("联系人姓名已存在！"); + } // 存在数据 try { if (!StringUtils.isBlank(payContactsManagement.getPhone())){ @@ -185,6 +198,20 @@ public class PayContactsManagementController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getName,payContactsManagement.getName()); + queryWrapper.eq(PayContactsManagement::getCompanyId,payContactsManagement.getCompanyId()); + PayContactsManagement payContactsManagementNew = payContactsManagementService.getOne(queryWrapper); + // 姓名存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payContactsManagementNew) && !Objects.equals(payContactsManagementNew.getId(),payContactsManagement.getId())) { + return Result.error("联系人姓名已存在！"); + } + }catch (Exception e){ + log.info("联系人管理-编辑异常",e); + return Result.error("联系人姓名已存在！"); + } try { if (!StringUtils.isBlank(payContactsManagement.getPhone())){ payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone())); @@ -266,9 +293,42 @@ public class PayContactsManagementController extends JeroController queryByName(@RequestParam(name="name") String name,@RequestParam(name="companyId") String companyId) { + if(StringUtils.isBlank(name)){ + return Result.error("联系人姓名不能为空！"); + } + if(StringUtils.isBlank(companyId)){ + return Result.error("企业id不能为空！"); + } + if(name.length() > 20){ + return Result.error("姓名长度不能大于20个字符!"); + } + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayContactsManagement::getName,name); + queryWrapper.eq(PayContactsManagement::getCompanyId,companyId); + queryWrapper.eq(PayContactsManagement::getDataSource,PayContactsManagementCommon.DATA_SOURCE1); + PayContactsManagement payContactsManagement = payContactsManagementService.getOne(queryWrapper); + if(Objects.isNull(payContactsManagement)) { + return Result.OK("没有该联系人姓名！"); + } + }catch (Exception e){ + log.info("联系人管理-通过联系人姓名查询异常",e); + return Result.error("该联系人姓名已存在！"); + } + return Result.error("该联系人姓名已存在！"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index a3d6e3e3..0f5da1a6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -6,6 +6,10 @@ public class PayProjectCommon { * 打包（1：是，0：否） */ public final static Integer PACKAGING0 = 0; + /** + * 打包（1：是，0：否） + */ + public final static Integer PACKAGING1 = 1; /** * 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）） */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 8473478c..1519f2f1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -19,8 +19,11 @@ import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.ValidUtil; +import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; +import com.jero.contract.service.IPayIncomeContractService; +import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.service.IPayCommonProjectService; @@ -56,6 +59,10 @@ public class PayCommonProjectController extends JeroController listAll(PayCommonProject payCommonProject,HttpServletRequest req) { + public Result listAll(PayCommonProject payCommonProject,String contractId,HttpServletRequest req) { if(StringUtils.isBlank(payCommonProject.getChargeCompanyId())){ return Result.error("企业id不能为空！"); } + PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId); + if(Objects.isNull(payIncomeContract)){ + return Result.error("合同不存在！"); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap()); List list = payCommonProjectService.list(queryWrapper); List listNew = new ArrayList<>(); List listPayCommonProjectOutputNew = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ + // todo 获取打包项目对比数据 + // payPackCompanyService.list(); List listProjectId = list.stream().map(PayCommonProject::getId).collect(Collectors.toList()); // 获取已经关联合同的普通项目 LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); @@ -113,6 +127,7 @@ public class PayCommonProjectController extends JeroController finalListProjectId = listProjectIdNew; listNew.forEach(p->{ + // 没有关联合同 if(!CollectionUtils.isEmpty(finalListProjectId) && finalListProjectId.contains(p.getId())){ return;