From 20ebc0aecd7cad948a0caa46446f471ca39f1a57 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 14 Nov 2022 15:33:27 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A1=AE=E8=AE=A4=E6=94=B6=E5=85=A5=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPackCompanyController.java | 31 ++++++++++++++++--- .../com/jero/pack/entity/PayPackCompany.java | 5 +++ .../pack/mapper/PayPackCompanyMapper.java | 10 ++++-- .../pack/mapper/xml/PayPackCompanyMapper.xml | 29 +++++++++++++++++ .../pack/service/IPayPackCompanyService.java | 2 ++ .../impl/PayPackCompanyServiceImpl.java | 8 +++++ 6 files changed, 77 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index e686c84e..68369b69 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -90,6 +90,7 @@ public class PayPackCompanyController extends JeroController listPackIds = list.stream().map(PayPackCompany::getId).collect(Collectors.toList()); List listPayCommonProject = payPackCompanyService.queryPackListCount(listPackIds); + List listConfirmAmount = payPackCompanyService.queryConfirmAmount(listPackIds); list.forEach(p->{ if(!CollectionUtils.isEmpty(listPayCommonProject)){ List listCount = listPayCommonProject.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList()); @@ -97,6 +98,12 @@ public class PayPackCompanyController extends JeroController listCount = listConfirmAmount.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listCount)){ + p.setConfirmAmount(listCount.get(0).getPaidAmount()); + } + } if(!StringUtils.isEmpty(p.getPhone())){ p.setPhone(PasswordUtil.decrypt(p.getPhone())); } @@ -106,6 +113,9 @@ public class PayPackCompanyController extends JeroController hashMap = new HashMap<>(); hashMap.put("sumOfMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getAllMoney()); + hashMap.put("sumOfReallyMoney", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getComeAllMoney()); hashMap.put("sumOfConfirmAmount", ObjectUtils.isEmpty(allMoney) ? 0 : allMoney.getConfirmAmount()); hashMap.put("pageList", pageList); return Result.OK(hashMap); } - + /** * 添加 * @@ -140,7 +151,7 @@ public class PayPackCompanyController extends JeroController listPackIds = exportList.stream().map(PayPackCompany::getId).collect(Collectors.toList()); List listPayCommonProject = payPackCompanyService.queryPackListCount(listPackIds); + List listConfirmAmount = payPackCompanyService.queryConfirmAmount(listPackIds); exportList.forEach(p->{ if (!CollectionUtils.isEmpty(listPayCommonProject)) { List listCount = listPayCommonProject.stream().filter(item -> Objects.equals(p.getId(), item.getId())).collect(Collectors.toList()); @@ -316,6 +328,12 @@ public class PayPackCompanyController extends JeroController listCount = listConfirmAmount.stream().filter(item->Objects.equals(p.getId(),item.getId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listCount)){ + p.setConfirmAmount(listCount.get(0).getPaidAmount()); + } + } if(!StringUtils.isEmpty(p.getPhone())){ p.setPhone(PasswordUtil.decrypt(p.getPhone())); } @@ -325,6 +343,9 @@ public class PayPackCompanyController extends JeroController { /** * @Description 查询金额 - * @Author lqt - * @Date 2021/9/13 + * @Author lqt + * @Date 2021/9/13 * @Param * @Return * @Exception */ - List queryPackListCount(List listPackIds); + List queryPackListCount(@Param("listPackIds") List listPackIds); + + List queryConfirmAmount(@Param("listPackIds") List listPackIds); /** * @Description 打包列表excel导出 @@ -52,4 +54,6 @@ public interface PayPackCompanyMapper extends BaseMapper { String getSumMoney(@Param("payPackCompany") PayPackCompany payPackCompany); String getConfirmAmountMoney(@Param("payPackCompany") PayPackCompany payPackCompany); + + String getComeAllMoney(@Param("payPackCompany") PayPackCompany payPackCompany); } 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 873d117b..c054d1af 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 @@ -14,6 +14,19 @@ group by ppcp.pack_id + + + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java index 3183315e..8c42212b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java @@ -54,6 +54,8 @@ public interface IPayPackCompanyService extends IService { */ List queryPackListCount(List listPackIds); + List queryConfirmAmount(List listPackIds); + /** * @Description 打包列表excel导出 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index e1b984e7..3275fecd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -102,6 +102,11 @@ public class PayPackCompanyServiceImpl extends ServiceImpl queryConfirmAmount(List listPackIds) { + return payPackCompanyMapper.queryConfirmAmount(listPackIds); + } + @Override public List queryPageListExport(PayPackCompany payPackCompany) { return payPackCompanyMapper.queryPageListExport(payPackCompany) ; @@ -114,6 +119,9 @@ public class PayPackCompanyServiceImpl extends ServiceImpl