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()+""); + + } + + } }