From 85c24f89343440a57a01ba24781c178a2d642d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Sat, 9 Oct 2021 14:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/project/common/PayProjectCommon.java | 4 ++++ .../controller/PayCommonProjectController.java | 15 ++++++++++++--- .../PayWorkingGroupSubItemController.java | 15 +++++++++++++-- .../mapper/PayWorkingGroupSubItemMapper.java | 2 +- .../mapper/xml/PayWorkingGroupSubItemMapper.xml | 7 +++++-- .../service/IPayWorkingGroupSubItemService.java | 2 +- .../impl/PayWorkingGroupSubItemServiceImpl.java | 4 ++-- 7 files changed, 38 insertions(+), 11 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 3e052971..a2c90e07 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 @@ -100,4 +100,8 @@ public class PayProjectCommon { * 项目类型1:工作组，2：分标委 */ public final static Integer PROJECT_TYPE_FILE2 = 2; + /** + * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要）） + */ + public final static Integer NEED_INVOICE3 = 3; } 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 20523683..e03927ea 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 @@ -151,7 +151,8 @@ public class PayCommonProjectController extends JeroController listProjectIds = new ArrayList<>(); // 项目的企业联系人 LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); - queryPayCommonProject.eq(PayCommonProject::getContactsId,sysUser.getId()); + queryPayCommonProject.eq(PayCommonProject::getContactsId,sysUser.getId()).or() + .eq(PayCommonProject::getMailContactsId,sysUser.getId()); List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); if(!CollectionUtils.isEmpty(listPayCommonProject)){ List list = listPayCommonProject.stream().map(PayCommonProject::getId).collect(Collectors.toList()); @@ -210,10 +211,18 @@ public class PayCommonProjectController extends JeroController listNeedInvoice = new ArrayList<>(); if(!Objects.isNull(payCommonProject.getNeedInvoice())){ - queryWrapper.eq("needInvoice",payCommonProject.getNeedInvoice()); + // 需要发票 ： 3为 需要发票，小程序需要 + if(Objects.equals(payCommonProject.getNeedInvoice(),PayProjectCommon.NEED_INVOICE3)){ + listNeedInvoice.add(1); + listNeedInvoice.add(2); + }else{ + listNeedInvoice.add(payCommonProject.getNeedInvoice()); + } + queryWrapper.in("need_invoice",listNeedInvoice); } if(!Objects.isNull(payCommonProject.getPack())){ queryWrapper.eq("pack",payCommonProject.getPack()); 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 c63fbd51..e8578bec 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 @@ -146,7 +146,8 @@ public class PayWorkingGroupSubItemController extends JeroController queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,sysUser.getId()).or() .eq(PayWorkingGroupSubItem::getContactsIdTwo,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getContactsIdThree,sysUser.getId()); + .eq(PayWorkingGroupSubItem::getContactsIdThree,sysUser.getId()).or() + .eq(PayWorkingGroupSubItem::getMailContactsId,sysUser.getId()); List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ List listProjectId = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); @@ -204,7 +205,17 @@ public class PayWorkingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listProjectIdsNew); + List listNeedInvoice = new ArrayList<>(); + if(!Objects.isNull(payWorkingGroupSubItem.getNeedInvoice())){ + // 需要发票 ： 3为 需要发票，小程序需要 + if(Objects.equals(payWorkingGroupSubItem.getNeedInvoice(),PayProjectCommon.NEED_INVOICE3)){ + listNeedInvoice.add(1); + listNeedInvoice.add(2); + }else{ + listNeedInvoice.add(payWorkingGroupSubItem.getNeedInvoice()); + } + } + IPage pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew); if(!CollectionUtils.isEmpty(pageList.getRecords())){ List list = pageList.getRecords(); list.forEach(p->{ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java index 885effae..e416b3a0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java @@ -54,5 +54,5 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper queryCompanyPageList(Page page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listProjectIds") List listProjectIds); + IPage queryCompanyPageList(Page page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List listNeedInvoice,@Param("listProjectIds") List listProjectIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index e170290d..24566e65 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -137,8 +137,11 @@ AND pwgs.pack = #{payWorkingGroupSubItem.pack} - - AND pwgs.need_invoice = #{payWorkingGroupSubItem.needInvoice} + + AND pwgs.need_invoice in + + #{item} + AND pwgs.id in diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index 14d6927c..1cd497ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -106,6 +106,6 @@ public interface IPayWorkingGroupSubItemService extends IService queryCompanyPageList(Page page,PayWorkingGroupSubItem payWorkingGroupSubItem,List listProjectIds); + IPage queryCompanyPageList(Page page,PayWorkingGroupSubItem payWorkingGroupSubItem,List listNeedInvoice,List listProjectIds); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 8e1c25e7..d88fa7e5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -549,8 +549,8 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryCompanyPageList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem, List listProjectIds) { - return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem, listProjectIds); + public IPage queryCompanyPageList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem,List listNeedInvoice, List listProjectIds) { + return payWorkingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem,listNeedInvoice, listProjectIds); } /**