From 8a86d6bbab0d877b979fd0dea04fdfae4f54ba3d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 27 Dec 2023 15:29:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=B6=E5=A4=84=E7=90=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=EF=BC=88=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayCompanyManagementServiceImpl.java | 74 ++++++++++++++++--- .../mapper/PayMemberProjectSubitemMapper.java | 4 + .../IPayMemberProjectSubitemService.java | 2 + ...PayPayMemberProjectSubitemServiceImpl.java | 5 ++ .../mapper/PayWorkingGroupSubItemMapper.java | 5 ++ .../xml/PayWorkingGroupSubItemMapper.xml | 5 ++ .../IPayWorkingGroupSubItemService.java | 4 + .../PayWorkingGroupSubItemServiceImpl.java | 7 ++ 8 files changed, 94 insertions(+), 12 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index d4b1de9e..14d84c25 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -787,19 +787,69 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()); - updatePayWorkingGroupSubItem.exists(" select 1 from pay_company_management_temporary where " + - "pay_working_group_subitem.charge_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); - updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); - payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + QueryWrapper queryPayWorkingGroupSubItem = new QueryWrapper<>(); + queryPayWorkingGroupSubItem.eq("pwg.year",thisYear); + queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()) + .and( + a -> { + a.eq(PayWorkingGroupSubItem::getPaidAmount, BigDecimal.ZERO) + .or() + .isNull(PayWorkingGroupSubItem::getPaidAmount); + }) + .and( + a -> { + a.eq(PayWorkingGroupSubItem::getInvoiceAmount, BigDecimal.ZERO) + .or() + .isNull(PayWorkingGroupSubItem::getInvoiceAmount); + }) + .and( + a -> { + a.eq(PayWorkingGroupSubItem::getConfirmAmount, BigDecimal.ZERO) + .or() + .isNull(PayWorkingGroupSubItem::getConfirmAmount); + }); + List workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem); + List collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect1); + if (!collect1.isEmpty()){ + LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getChargeCompanyId,collect1); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeCompanyTemporaryName,payCompanyManagement.getCompanyName()); + payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + } + // 更新会员 - LambdaUpdateWrapper updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>(); - updatePayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); - updatePayMemberProjectSubitem.exists(" select 1 from pay_company_management_temporary where " + - "pay_member_project_subitem.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); - updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName()); - memberProjectSubitemService.update(updatePayMemberProjectSubitem); + QueryWrapper queryPayMemberProjectSubitem = new QueryWrapper<>(); + queryPayMemberProjectSubitem.eq("pmp.particular_year",thisYear); + queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()) + .and( + a -> { + a.eq(PayMemberProjectSubitem::getPaidAmount, BigDecimal.ZERO) + .or() + .isNull(PayMemberProjectSubitem::getPaidAmount); + }) + .and( + a -> { + a.eq(PayMemberProjectSubitem::getInvoiceAmount, BigDecimal.ZERO) + .or() + .isNull(PayMemberProjectSubitem::getInvoiceAmount); + }) + .and( + a -> { + a.eq(PayMemberProjectSubitem::getConfirmAmount, BigDecimal.ZERO) + .or() + .isNull(PayMemberProjectSubitem::getConfirmAmount); + }); + List payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem); + List collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect2); + if (!collect2.isEmpty()){ + LambdaUpdateWrapper updatePayMemberProjectSubitem = new LambdaUpdateWrapper<>(); + updatePayMemberProjectSubitem.in(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + updatePayMemberProjectSubitem.set(PayMemberProjectSubitem::getCompanyName,payCompanyManagement.getCompanyName()); + memberProjectSubitemService.update(updatePayMemberProjectSubitem); + } + // 更新临时数据 if (!companyTemporaryIdList.isEmpty()) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java index e1db65e8..d6df6678 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java @@ -8,6 +8,8 @@ import com.jero.member.entity.PayMemberProjectSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @Description: 会员项目_subitem * @Author: jero-boot @@ -18,5 +20,7 @@ public interface PayMemberProjectSubitemMapper extends BaseMapper queryPageListCompany(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List queryPageListCompany(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage getPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java index 06e34c8d..0dce1342 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java @@ -70,6 +70,8 @@ public interface IPayMemberProjectSubitemService extends IService queryPageListCompany(Page page, QueryWrapper queryWrapper); + List queryPageListCompany(QueryWrapper queryWrapper); + IPage getPage(Page page, QueryWrapper queryWrapper); void check(String subitemId, String permission); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 9bff200e..53ba3f73 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -497,6 +497,11 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl queryPageListCompany(QueryWrapper queryWrapper) { + return baseMapper.queryPageListCompany(queryWrapper); + } + @Override public IPage getPage(Page page, QueryWrapper queryWrapper) { return baseMapper.getPage(page, queryWrapper); 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 ee767266..1bada09c 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 @@ -1,6 +1,9 @@ package com.jero.project.mapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; import com.jero.project.entity.PayWorkGroupSubletStatistics; @@ -59,4 +62,6 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper publishReminderList(Page page, @Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem); + + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryPayWorkingGroupSubItem); } 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 b21dc889..b7c3b524 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 @@ -346,4 +346,9 @@ + 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 a98157ae..ba8ac742 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 @@ -1,5 +1,7 @@ package com.jero.project.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.baomidou.mybatisplus.extension.service.IService; @@ -123,4 +125,6 @@ public interface IPayWorkingGroupSubItemService extends IService queryList(QueryWrapper queryPayWorkingGroupSubItem); } 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 4973dc40..b3a30220 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 @@ -2,6 +2,7 @@ package com.jero.project.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -1040,6 +1041,12 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl queryList(QueryWrapper queryPayWorkingGroupSubItem) { + + return payWorkingGroupSubItemMapper.queryList(queryPayWorkingGroupSubItem); + } + /** * @Description 删除项目打包关联，临时企业、联系信息 * @Author lqt