From 55ebacca4aa4491dec5a92609190e0d32f23cf43 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 31 Jul 2024 18:14:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=2087908=20=E6=89=80=E6=9C=89=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E6=9C=AA=E5=B0=81=E9=94=81=E7=9A=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E4=BC=81=E4=B8=9A=E5=8D=95=E4=BD=8D=E6=B2=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=2087913=20=E6=89=93=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=B0=81=E9=94=81=E6=9B=B4=E6=96=B0=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=81=9A=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayCompanyManagementServiceImpl.java | 57 +++++++++++++------ .../mapper/PayMeetingSituationMapper.java | 8 +++ .../mapper/xml/PayMeetingSituationMapper.xml | 15 +++++ .../pack/mapper/PayPackCompanyMapper.java | 3 +- .../pack/mapper/xml/PayPackCompanyMapper.xml | 10 ++++ 5 files changed, 76 insertions(+), 17 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 b4d082d1..5d64fd0f 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 @@ -32,6 +32,9 @@ import com.jero.company.vo.CompanyOrContactsCount; import com.jero.company.vo.UpdateInvoicePram; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.mapper.PayMeetingSituationMapper; +import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.TbMemberProjectSubitemMapper; @@ -40,6 +43,7 @@ import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.mapper.PayPackCompanyMapper; import com.jero.pack.service.IPayPackCompanyService; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -103,7 +107,15 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updatePayContactsManagement = new LambdaUpdateWrapper<>(); - updatePayContactsManagement.eq(PayContactsManagement::getCompanyId,payCompanyManagement.getId()); + updatePayContactsManagement.eq(PayContactsManagement::getCompanyId, companyManagementId); updatePayContactsManagement.set(PayContactsManagement::getCompanyName,payCompanyManagement.getCompanyName()); payContactsManagementService.update(updatePayContactsManagement); List allYear = annualDataLockingService.getAllYear(); @@ -763,7 +775,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl companyTemporaryIdList = new ArrayList<>(); // 更新普通项目 LambdaQueryWrapper quaryPayCommonProject = new LambdaQueryWrapper<>(); - quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId,payCompanyManagement.getId()); + quaryPayCommonProject.eq(PayCommonProject::getChargeCompanyId, companyManagementId); quaryPayCommonProject.notIn(PayCommonProject::getYear,allYear); @@ -781,7 +793,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryPayWorkingGroupSubItem = new QueryWrapper<>(); queryPayWorkingGroupSubItem.notIn("pwg.year",allYear); - queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId,payCompanyManagement.getId()); + queryPayWorkingGroupSubItem.lambda().eq(PayWorkingGroupSubItem::getChargeCompanyId, companyManagementId); List workingGroupSubItemList = payWorkingGroupSubItemService.queryList(queryPayWorkingGroupSubItem); List collect1 = workingGroupSubItemList.stream().map(PayWorkingGroupSubItem::getChargeCompanyTemporaryId).collect(Collectors.toList()); @@ -793,11 +805,21 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl meetingSituations = meetingSituationMapper.listByYearNotIn(allYear,companyManagementId); + List collect4 = meetingSituations.stream().map(PayMeetingSituation::getCompanyTemporaryId).collect(Collectors.toList()); + List idList4 = meetingSituations.stream().map(PayMeetingSituation::getId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect4); + if (!idList4.isEmpty()){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayMeetingSituation::getId,idList4); + updateWrapper.set(PayMeetingSituation::getCompanyName,payCompanyManagement.getCompanyName()); + meetingSituationService.update(updateWrapper); + } // 更新会员 QueryWrapper queryPayMemberProjectSubitem = new QueryWrapper<>(); queryPayMemberProjectSubitem.notIn("pmp.particular_year",allYear) ; - queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + queryPayMemberProjectSubitem.lambda().eq(PayMemberProjectSubitem::getCompanyId, companyManagementId); List payMemberProjectSubitems = memberProjectSubitemService.queryPageListCompany(queryPayMemberProjectSubitem); List collect2 = payMemberProjectSubitems.stream().map(PayMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); @@ -812,7 +834,7 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryTbMemberProjectSubitem = new QueryWrapper<>(); queryTbMemberProjectSubitem.notIn("tmp.year",allYear); - queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId,payCompanyManagement.getId()); + queryTbMemberProjectSubitem.lambda().eq(TbMemberProjectSubitem::getCompanyId, companyManagementId); List tbMemberProjectSubitems = tbMemberProjectSubitemMapper.queryListCompanyYear(queryTbMemberProjectSubitem); List collect3 = tbMemberProjectSubitems.stream().map(TbMemberProjectSubitem::getCompanyTemporaryId).collect(Collectors.toList()); @@ -824,6 +846,17 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl packCompanyList = packCompanyMapper.listByYearNotIn(allYear,companyManagementId); + List collect5 = packCompanyList.stream().map(PayPackCompany::getCompanyTemporaryId).collect(Collectors.toList()); + List idList6 = packCompanyList.stream().map(PayPackCompany::getId).collect(Collectors.toList()); + companyTemporaryIdList.addAll(collect5); + if (!idList6.isEmpty()){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PayPackCompany::getId,idList6); + updateWrapper.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName()); + packCompanyService.update(updateWrapper); + } // 更新临时数据 if (!companyTemporaryIdList.isEmpty()) { LambdaUpdateWrapper updatePayCompanyManagementTemporary = new LambdaUpdateWrapper<>(); @@ -846,19 +879,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updatePayIncomeContract = new LambdaUpdateWrapper<>(); - updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId,payCompanyManagement.getId()); + updatePayIncomeContract.eq(PayIncomeContract::getSignedCompanyId, companyManagementId); //updatePayIncomeContract.ge(PayIncomeContract::getCreateTime,payCompanyManagement.getEditTime()); updatePayIncomeContract.exists(" select 1 from pay_company_management_temporary where " + "pay_income_contract.signed_company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); updatePayIncomeContract.set(PayIncomeContract::getSignedCompanyTemporaryName,payCompanyManagement.getCompanyName()); payIncomeContractService.update(updatePayIncomeContract); - // 更新打包 - LambdaUpdateWrapper updatePayPackCompany = new LambdaUpdateWrapper<>(); - updatePayPackCompany.eq(PayPackCompany::getCompanyId,payCompanyManagement.getId()); - //updatePayPackCompany.ge(PayPackCompany::getCreateTime,payCompanyManagement.getEditTime()); - updatePayPackCompany.exists(" select 1 from pay_company_management_temporary where " + - "pay_pack_company.company_temporary_id = id and create_time >= '" + DateTime.of(payCompanyManagement.getEditTime()) + "'"); - updatePayPackCompany.set(PayPackCompany::getCompanyTemporaryName,payCompanyManagement.getCompanyName()); - payPackCompanyService.update(updatePayPackCompany); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java index bdc956de..3dafee03 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java @@ -45,4 +45,12 @@ public interface PayMeetingSituationMapper extends BaseMapper listByYear(@Param("year")String year); + /** + * 根据年份获取参会人 + * + * @param yearList 年份 + * @param companyManagementId + */ + List listByYearNotIn(@Param("yearList") List yearList, @Param("companyManagementId") String companyManagementId); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index f87edeed..c010b4d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -259,4 +259,19 @@ meeting_id in (select id from pay_meeting where particular_year = #{year}) + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java index 44cb16d9..61b2f578 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/PayPackCompanyMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.pack.entity.PayPackCompany; -import com.jero.pack.vo.PayPackCompanyProjectInput; import com.jero.project.entity.PayCommonProject; import org.apache.ibatis.annotations.Param; @@ -58,4 +57,6 @@ public interface PayPackCompanyMapper extends BaseMapper { String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany); List listByYear(@Param("year") String year); + + List listByYearNotIn(@Param("yearList") List yearList, @Param("companyManagementId") String companyManagementId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index 92871515..91006f04 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -113,4 +113,14 @@ select * from pay_pack_company where pack_year = #{year} + + \ No newline at end of file