From 21185aa72637a4caac184f3ef28d9186a84897e5 Mon Sep 17 00:00:00 2001 From: mx <1@qq.com> Date: Thu, 26 Dec 2024 17:10:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-plus.xml | 4 +-- .../controller/PsCompanyInfoController.java | 2 +- .../business/mapper/PsCompanyInfoMapper.java | 4 +++ .../impl/ApproverAbstractServiceImpl.java | 31 ++++++++++++++----- .../impl/PsCompanyInfoServiceImpl.java | 8 +++-- .../mapper/business/PsCompanyInfoMapper.xml | 9 ++++++ 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/pusong-admin/src/main/resources/logback-plus.xml b/pusong-admin/src/main/resources/logback-plus.xml index be740db..b33f858 100644 --- a/pusong-admin/src/main/resources/logback-plus.xml +++ b/pusong-admin/src/main/resources/logback-plus.xml @@ -28,7 +28,7 @@ - INFO + DEBUG @@ -47,7 +47,7 @@ - INFO + DEBUG ACCEPT diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java index fcc3335..a6c0027 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsCompanyInfoController.java @@ -64,7 +64,7 @@ public class PsCompanyInfoController extends BaseController { * 服务公司列表 */ @SaCheckPermission("business:companyInfo:list") - @Log(title = "服务公司列表" ) +// @Log(title = "服务公司列表" ) @GetMapping("/serviceList") public TableDataInfo serviceList(PsCompanyQueryBo queryBo, PageQuery pageQuery) { return psCompanyInfoService.queryServiceCompany(queryBo, pageQuery); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java index 5e28eb5..8746a47 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsCompanyInfoMapper.java @@ -36,4 +36,8 @@ public interface PsCompanyInfoMapper extends BaseMapperPlus selectVoCustomManager(@Param(Constants.WRAPPER) Wrapper queryWrapper, @Param("contractCode")String contractCode); List selectFollowUser(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + + + List selectContractServiceCompany(@Param(Constants.WRAPPER) Wrapper queryWrapper); } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java index 72f0362..2ca74cb 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/ApproverAbstractServiceImpl.java @@ -15,6 +15,7 @@ import com.pusong.business.enums.ApproverStatusEnum; import com.pusong.business.enums.ApproverTypeEnum; import com.pusong.business.enums.PayStatusEnum; import com.pusong.business.mapper.PsApproverRecordMapper; +import com.pusong.business.mapper.PsCompanyInfoMapper; import com.pusong.business.mapper.PsContractPayMapper; import com.pusong.business.service.IPsCompanyInfoService; import com.pusong.business.service.approver.ApproverContainer; @@ -34,6 +35,8 @@ import jakarta.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 审批记录Service接口 @@ -54,6 +57,8 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { private IPsCompanyInfoService companyInfoService; @Resource private ISysNoticeService noticeService; + @Resource + private PsCompanyInfoMapper companyInfoMapper; /** * 通用申请方法 * @param bussinessId @@ -129,18 +134,28 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { } Page res = recordMapper.selectPageApproverList(pageQuery.build(), lqw, bo.getPay()); + List codes = res.getRecords().stream().map(PsApproverRecordVo::getContractCode).toList(); + + QueryWrapper wq = Wrappers.query() + .eq("com.del_flag", "0") + .eq("pcc.del_flag","0") + .in("pcc.contract_code", codes); + List list = companyInfoMapper.selectContractServiceCompany(wq); + Map> contractCompanyMap = list.stream().collect(Collectors.groupingBy(PsCompanyInfoVo::getContractCode)); + + if(CollectionUtils.isNotEmpty(res.getRecords())){ res.getRecords().forEach(item->{ if (item.getContractAmount() != null) item.setResidualMoney(item.getContractAmount().subtract(item.getPayMoney())); //装填回款周期 - List payList = queryListByContractCode(item.getContractCode(),"1", PayStatusEnum.SUCCESS); - if(CollectionUtils.isNotEmpty(payList)){ - item.setPeriod(DateUtils.calWorkDate(payList.get(0).getPayDate(),payList.get(payList.size()-1).getPayDate())); - } +// List payList = queryListByContractCode(item.getContractCode(),"1", PayStatusEnum.SUCCESS); +// if(CollectionUtils.isNotEmpty(payList)){ +// item.setPeriod(DateUtils.calWorkDate(payList.get(0).getPayDate(), payList.get(payList.size() - 1).getPayDate())); +// } //装填服务公司信息 - List list = companyInfoService.getServiceCompany(item.getContractCode()); - item.setServicePsCompanyInfoVo(list); +// List list = companyInfoService.getServiceCompany(item.getContractCode()); + item.setServicePsCompanyInfoVo(contractCompanyMap.get(item.getContractCode())); }); } return res; @@ -155,7 +170,9 @@ public abstract class ApproverAbstractServiceImpl implements ApproverService { * @return */ public List queryListByContractCode(String contractCode, String business, PayStatusEnum enu){ - if(StringUtils.isBlank(contractCode)){return new ArrayList<>();} + if(StringUtils.isBlank(contractCode)){ + return new ArrayList<>(); + } List list = baseMapper.selectVoList(Wrappers.lambdaQuery(). eq(PsContractPay::getContractCode, contractCode).eq(PsContractPay::getDelFlag,0) .eq(StringUtils.isNotBlank(business),PsContractPay::getBusinessType,business) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java index aaf5f68..7d67386 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsCompanyInfoServiceImpl.java @@ -191,20 +191,24 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { lqw.orderByAsc("CASE WHEN bus.min_end_date IS NULL THEN 1 ELSE 0 END, bus.min_end_date"); lqw.orderByDesc("finish_date"); - + logger.info("1222222222"); // lqw.groupBy("com.id"); Page result = baseMapper.selectPageList2(pageQuery.build(), lqw); + logger.info("333333333333333"); if (!result.getRecords().isEmpty()){ //填充代账服务项目 List companyIds = result.getRecords().stream().map(PsCompanyInfoVo::getId).collect(Collectors.toList()); QueryWrapper queryParam = Wrappers.query(); queryParam.in("cc.company_id", companyIds); + logger.info("44444444444"); List psContractBusinessVos = contractBusinessMapper.selectTuoGuanBusinessList(queryParam); Map> contractBusinessVoMap = psContractBusinessVos.stream().collect(Collectors.groupingBy(PsContractBusinessVo::getCompanyId, Collectors.toList())); QueryWrapper query = Wrappers.query(); query.in("cf.company_id", companyIds); + logger.info("5555555555555"); List sysUsers = baseMapper.selectFollowUser(query); + logger.info("666666666666"); Map> userMap = new HashMap<>(); for (SysUserVo sysUser : sysUsers) { List list = userMap.computeIfAbsent(sysUser.getCompanyId(), aLong -> new ArrayList<>()); @@ -229,7 +233,7 @@ public class PsCompanyInfoServiceImpl implements IPsCompanyInfoService { } } } - + logger.info("777777777777"); return TableDataInfo.build(result); } diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml index 8fcab12..6f456ef 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml @@ -130,6 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ps_contract_business_detail det on det.business_id = bus.id ${ew.getCustomSqlSegment} + + + +