From 3ead712e316198a8e23c6f8e59de949138f23a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 2 Sep 2021 18:54:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=98=AF=E5=90=A6=E6=94=B6=E8=B4=B9=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/common/PayProjectCommon.java | 20 ++--- .../PayWorkingGroupSubItemController.java | 86 +++++++++++++++++-- 2 files changed, 86 insertions(+), 20 deletions(-) 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 75a879b8..4d6f18cf 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 @@ -2,10 +2,6 @@ package com.jero.project.common; public class PayProjectCommon { - /** - * 打包（1：是，0：否） - */ - public final static Integer PACKAGING1 = 1; /** * 打包（1：是，0：否） */ @@ -48,20 +44,16 @@ public class PayProjectCommon { public final static Integer MAIL2 = 2; /** - * 普通项目 + * 来款方式（1：无，2：合同，3：收费通知） */ - public final static String PROJECT_TYPE1 = "1"; + public final static Integer CHARGE_WAY1 = 1; /** - * 工作组项目 + * 来款方式（1：无，2：合同，3：收费通知） */ - public final static String PROJECT_TYPE2 = "2"; + public final static Integer CHARGE_WAY2 = 2; /** - * + * 来款方式（1：无，2：合同，3：收费通知） */ - public final static String PROJECT_TYPE3 = "3"; - /** - * - */ - public final static String PROJECT_TYPE4 = "4"; + public final static Integer CHARGE_WAY3 = 3; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index ab9106fe..ac96bcfe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -4,18 +4,13 @@ import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.service.ProjectDetailService; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -25,7 +20,6 @@ import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.project.vo.SetChargeInput; @@ -114,6 +108,23 @@ public class PayWorkingGroupSubItemController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); @@ -155,6 +166,22 @@ public class PayWorkingGroupSubItemController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); @@ -267,6 +294,37 @@ public class PayWorkingGroupSubItemController extends JeroController getCharge(@RequestParam(name = "ids") String ids) { + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if(StringUtils.isBlank(s1)){ + return Result.error("id不能为空!"); + } + } + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.in(PayWorkingGroupSubItem::getId,Arrays.asList(ids.split(","))); + List list = payWorkingGroupSubItemService.list(); + if(!CollectionUtils.isEmpty(list)){ + List listNew = list.stream().filter(p->Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listNew)){ + return Result.error("存在来款方式不是收费通知的选项!"); + } + }else{ + return Result.error("请选择项目！"); + } + return Result.OK("设置收费通知成功!"); + } /** * 设置收费通知 @@ -402,6 +460,22 @@ public class PayWorkingGroupSubItemController extends JeroController{ p.setWorkingGroupId(workGroupId); int count = list.indexOf(p); + if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + if(Objects.isNull(p.getReceivableAmount())){ + msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); + } + if(StringUtils.isBlank(p.getContractNum())){ + msg.append("第 ").append(count + 3).append(" 行：合同号不能为空，请修改。
"); + } + } + if(Objects.equals(p.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){ + if(Objects.isNull(p.getChargeNoticeNo())){ + msg.append("第 ").append(count + 3).append(" 行：收费通知号不能为空，请修改。
"); + } + if(Objects.isNull(p.getReceivableAmount())){ + msg.append("第 ").append(count + 3).append(" 行：应收金额不能为空，请修改。
"); + } + } // 校验企业名称 List listCompany = new ArrayList<>(); if(StringUtils.isBlank(p.getChargeCompanyTemporaryName())){