From f9cb0f3f384279b2cbe87c35dde3ba573a0197f3 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 24 四月 2025 16:17:25 +0800
Subject: [PATCH] 煤矿缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 12 ++++++------
exam-system/src/main/resources/mapper/pay/CoalPayMapper.xml | 12 +++++++++++-
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
index d3a0cf8..e9c2923 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
@@ -81,12 +81,12 @@
List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(pay.getId());
pay.setCoalCategoryList(coalCategories);
//学员数据
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
- List<CoalPayStudent> havePay = coalPayStudents.stream()
- .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
- .collect(Collectors.toList());
- pay.setTotalNum(coalPayStudents.size());
- pay.setHavePayNum(havePay.size());
+// List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
+// List<CoalPayStudent> havePay = coalPayStudents.stream()
+// .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
+// .collect(Collectors.toList());
+// pay.setTotalNum(coalPayStudents.size());
+// pay.setHavePayNum(havePay.size());
// coalPayRepDtos.add(coalPayRepDto);
}
return coalPays;
diff --git a/exam-system/src/main/resources/mapper/pay/CoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/CoalPayMapper.xml
index 02c758a..547e83a 100644
--- a/exam-system/src/main/resources/mapper/pay/CoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/CoalPayMapper.xml
@@ -106,7 +106,17 @@
where id = #{id}
</update>
<select id="selectCoalPayList" resultType="com.gkhy.exam.pay.dto.rep.CoalPayRepDto">
- <include refid="selectCoalPayVo"/>
+ select id,
+ batch_name,
+ dept_id,
+ pay_type,
+ amount,
+ year,
+ quarter,
+ pay_person_type, pay_company_name, pay_company_card, update_by, update_time, create_by, create_time, del_flag ,
+ ( SELECT COUNT(cps.id) FROM coal_pay_student cps WHERE cps.del_flag = 0 AND cps.coal_pay_id = coal_pay.id ) AS total_num,
+ ( SELECT COUNT(cps.id) FROM coal_pay_student cps WHERE cps.del_flag = 0 AND cps.coal_pay_id = coal_pay.id AND cps.pay_status = 1 ) AS have_pay_num
+ from coal_pay
<where>
<if test="deptId != null ">
and dept_id = #{deptId}
--
Gitblit v1.9.2