c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-03-11 19:40:34 +08:00
parent ec49bcfa8b
commit 0c644ac349
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
+19 -8
View File
@@ -151,18 +151,29 @@ public class MemberPaymentChartSummaryController {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
un.unionname, un.unionname,
COALESCE ( SUM( pt.tradingAmount * 0.01 ), 0 ) AS money COALESCE ( SUM( subquery.money ), 0 ) AS money
FROM FROM
sys_union un sys_union un
LEFT JOIN payment_transaction pt ON pt.unionId = un.id LEFT JOIN (
AND pt.tradingState = 'PAY_SUCCESS' SELECT
AND pt.isRefund = 0 pt.unionId,
LEFT JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId SUM( pt.tradingAmount * 0.01 ) AS money
AND mpi.paymentProjectId=@paymentProjectId FROM
payment_transaction pt
INNER JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
AND mpi.paymentProjectId = @paymentProjectId
WHERE
pt.tradingState = 'PAY_SUCCESS'
AND pt.isRefund = 0
GROUP BY
pt.unionId
) subquery ON subquery.unionId = un.id
GROUP BY GROUP BY
un.id un.id,
ORDER BY un.unionname,
un.unioncode un.unioncode
ORDER BY
un.unioncode;
""").setParam("paymentProjectId", paymentProjectId); """).setParam("paymentProjectId", paymentProjectId);
return Result.success(memberPaymentService.listMap(sql)); return Result.success(memberPaymentService.listMap(sql));
} }
src/main/resources/views/platform/membercost/chartSummary/index.html
+4 -10
View File
@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){
</div> </div>
<script> <script>
new Vue({ const vue = new Vue({
el: "#app", el: "#app",
mixins: [initTableMixins], mixins: [initTableMixins],
data() { data() {
@@ -196,7 +196,7 @@ layout("/layouts/platform.html"){
unionForm: { unionForm: {
year: new Date().getFullYear() + "" year: new Date().getFullYear() + ""
}, },
paymentProjectList:[], paymentProjectList: []
} }
}, },
methods: { methods: {
@@ -231,9 +231,6 @@ layout("/layouts/platform.html"){
autoRotate: false autoRotate: false
} }
}, },
color: ({ type }) => {
return "#63DAAB"
},
meta: { meta: {
projectName: { projectName: {
alias: "项目" alias: "项目"
@@ -274,9 +271,6 @@ layout("/layouts/platform.html"){
autoRotate: false autoRotate: false
} }
}, },
color: ({ type }) => {
return "#63DAAB"
},
meta: { meta: {
projectName: { projectName: {
alias: "项目" alias: "项目"
@@ -311,7 +305,7 @@ layout("/layouts/platform.html"){
autoFit: true, autoFit: true,
title: { title: {
visible: true, visible: true,
text: "年工会经费及活动详情" text: ""
}, },
description: { description: {
visible: true, visible: true,
@@ -361,7 +355,7 @@ layout("/layouts/platform.html"){
const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.unionForm.year }) const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.unionForm.year })
if (resp.code === 0) { if (resp.code === 0) {
this.paymentProjectList = resp.data this.paymentProjectList = resp.data
this.$set(this.unionForm, "paymentProjectId", this.paymentProjectList ? this.paymentProjectList[0].id : null) this.$set(this.unionForm, "paymentProjectId", (this.paymentProjectList && this.paymentProjectList.length > 0) ? this.paymentProjectList[0].id : null)
await this.allUnionMoney() await this.allUnionMoney()
} }
} }