From 0bc94d86e0caf9112d83da02c1b91a3ea343cb0a Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 19 三月 2025 09:16:05 +0800
Subject: [PATCH] 修改非煤统计
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 6 ++++++
exam-system/src/main/resources/mapper/pay/NonCoalCategoryMapper.xml | 22 +++++++++++-----------
2 files changed, 17 insertions(+), 11 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 4326ab6..d3a0cf8 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
@@ -312,6 +312,12 @@
payStudent.setGovPayStatus(2);
payStudent.setPayCode(resultVo.getRespdata().getBillNo());
coalPayStudentService.updateByCoalPayIdAndStatus(payStudent);
+ CoalPay coalPay1 = new CoalPay();
+ coalPay1.setPayCompanyCard(coalTeamPayReq.getPayCompanyCard());
+ coalPay1.setPayCompanyName(coalTeamPayReq.getPayCompanyName());
+ coalPay1.setId(coalTeamPayReq.getCoalPayId());
+ coalPay1.setPayPersonType(2);
+ coalPayMapper.updateCoalPayById(coalPay1);
return resultVo.getRespdata().getOrderId();
} else {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "发起支付失败，请稍后重试");
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalCategoryMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalCategoryMapper.xml
index ff12ddc..8489cce 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalCategoryMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalCategoryMapper.xml
@@ -199,18 +199,18 @@
</select>
<select id="selectCountCategory" resultType="com.gkhy.exam.pay.dto.rep.NonCategoryCount">
SELECT
- cc.id,
- sot.name as subject_name,
- cc.amount,
- cc.category_type,
- COUNT( cps.`name` ) num
+ cc.operate_type_id,
+ MAX(sot.name) AS subject_name,
+ MAX(cc.amount) AS amount,
+ MAX(cc.category_type) AS category_type,
+ COUNT(cps.id) AS num
FROM
non_coal_category cc
- LEFT JOIN sys_operate_type sot on cc.operate_type_id = sot.id
- LEFT JOIN non_coal_pay_category cpc ON cc.id = cpc.category_id
- LEFT JOIN non_coal_pay cp ON cpc.non_coal_pay_id = cp.id
- LEFT JOIN non_coal_pay_student cps ON cp.id = cps.non_coal_pay_id
- WHERE cc.category_type = 2 and cc.del_flag = 0 and cps.del_flag =0 and cp.del_flag = 0 and cps.pay_status = 1
+ LEFT JOIN sys_operate_type sot ON cc.operate_type_id = sot.id
+ LEFT JOIN non_coal_pay_category cpc ON cc.id = cpc.category_id
+ LEFT JOIN non_coal_pay cp ON cpc.non_coal_pay_id = cp.id AND cp.del_flag = 0
+ LEFT JOIN non_coal_pay_student cps ON cp.id = cps.non_coal_pay_id
+ WHERE cc.category_type = 2 and cc.del_flag = 0 and cp.del_flag = 0 AND cps.del_flag = 0 AND cps.pay_status = 1
<if test="year!=null and year !=''">
and cp.year =#{year}
</if>
@@ -224,7 +224,7 @@
and cp.dept_id =#{deptId}
</if>
GROUP BY
- cc.id
+ cc.operate_type_id
</select>
<select id="selectCountTheory" resultType="com.gkhy.exam.pay.dto.rep.CateGoryTheory">
WITH filtered_data AS (
--
Gitblit v1.9.2