From 42e14131041f2e77e361688579b4fdc6128d2e91 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Apr 2024 10:43:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8C=85=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=A1=B9=E7=9B=AE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E4=B8=BA0=20update=20?= =?UTF-8?q?=E6=8A=8A24=E5=B9=B4=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=BE=85=E7=A1=AE=E6=94=B6=E9=87=91=E9=A2=9D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayIncomeContractServiceImpl.java | 1 + .../PayPackCompanyProjectController.java | 9 ++++++ .../IPayPackCompanyProjectService.java | 5 ++++ .../PayPackCompanyProjectServiceImpl.java | 28 ++++++++++++++----- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 60841fc0..e570386e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -631,6 +631,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl updateHistory() { + payPackCompanyProjectService.updateHistory(); + return Result.OK(); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java index b97758ed..6457b359 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyProjectService.java @@ -41,6 +41,9 @@ public interface IPayPackCompanyProjectService extends IService getExportXls(List list,String companyId); + + void updateHistory(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java index 53a5a3e8..88676a38 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java @@ -3,8 +3,6 @@ package com.jero.pack.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; -import com.jero.common.common.RoleCommon; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; @@ -33,8 +31,6 @@ import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; import com.jero.pack.vo.PayPackCompanyProjectInput; import com.jero.pack.vo.PayProjectExcel; -import com.jero.payment.mapper.PayPaymentRecordMapper; -import com.jero.payment.service.IPayPaymentRecordService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; @@ -45,12 +41,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * @Description: pay_pack_company_project @@ -192,14 +188,15 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl listPayPackCompanyProject) { listPayPackCompanyProject.forEach(p -> { - setAmountReceivable(p.getProjectId(), String.valueOf(p.getProjectType())); + setAmountReceivableZero(p.getProjectId(), String.valueOf(p.getProjectType())); }); } /** * 根据项目id和项目类型将具体项目的待确收金额改为0 */ - private void setAmountReceivable(String projectId, String projectType){ + @Override + public void setAmountReceivableZero(String projectId, String projectType){ switch (projectType){ // 普通项目 case PayIncomeContractCommon.PROJECT_TYPE1: @@ -378,4 +375,21 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl getExportXls(List list,String companyId) { return payPackCompanyProjectMapper.getExportXls(list,companyId); } + + @Override + public void updateHistory() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPackCompany::getPackYear,"2024"); + List packCompanyList = payPackCompanyService.list(wrapper); + List packCompanyIdList = packCompanyList.stream().map(PayPackCompany::getId).collect(Collectors.toList()); + + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(PayPackCompanyProject::getPackId,packCompanyIdList); + List list = this.list(wrapper1); + for (PayPackCompanyProject project : list) { + setAmountReceivableZero(project.getProjectId(),project.getProjectType()+""); + + } + + } }