This commit is contained in:
=
2025-03-07 14:11:11 +08:00
parent 55e9010fb5
commit d5a8dd7534
2 changed files with 37 additions and 8 deletions
@@ -75,7 +75,7 @@ public class MemberPaymentSummaryController {
public Sql dataSql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword,
String unionId, String unitId, String threeUnitId, String unionGroupId,
String personType, String userState, String paymentProjectId, String year,
String isPay,String schoolTime,String retireDate) {
String isPay,String schoolTime,String retireDate,String search) {
Sql sql = Sqls.create("""
SELECT
mpi.*,
@@ -117,6 +117,9 @@ public class MemberPaymentSummaryController {
cnd.and("u.unionGroupId", "in", io.v.nutz.web.commons.utils.ShiroUtil.getUnionGroupIds());
}
}
if (Strings.isNotBlank(search)){
cnd.orEX("u.username", "like","%" + search + "%");
}
cnd.andEX("mpp.`year`", "=", year);
cnd.andEX("mpi.paymentProjectId", "=", paymentProjectId);
if (Strings.isNotBlank(isPay) && !"null".equals(isPay)) {
@@ -158,10 +161,11 @@ public class MemberPaymentSummaryController {
@Param(value = "year", required = false) String year,
@Param(value = "isPay", required = false) String isPay,
@Param(value = "schoolTime", required = false) String schoolTime,
@Param(value = "retireDate", required = false) String retireDate) {
@Param(value = "retireDate", required = false) String retireDate,
@Param(value = "search", required = false) String search) {
Sql sql = this.dataSql(pageForm.getPageOrderName(), pageForm.getPageOrderBy(), pageForm.getSearchName(),
pageForm.getSearchKeyword(), unionId, unitId, threeUnitId, unionGroupId,
personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,search);
return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
}
@@ -297,7 +301,7 @@ public class MemberPaymentSummaryController {
@Param(value = "isPay", required = false) String retireDate,
boolean isZip, HttpServletResponse response) {
Sql sql = this.dataSql(null, null, searchName, searchKeyword, unionId, unitId, threeUnitId,
unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,"");
List<NutMap> list = memberPaymentService.listMap(sql);
NutMap nutMap = list.stream().findFirst().orElse(null);
@@ -7,7 +7,7 @@ layout("/mobile/platform.html"){
</van-sticky>
<div>
<van-search v-model="pageForm.searchKeyword" placeholder="请输入搜索关键词" @search="doSearch">
<van-search v-model="pageForm.search" placeholder="请输入搜索关键词" @search="doSearch">
</van-search>
</div>
<div>
@@ -40,7 +40,7 @@ layout("/mobile/platform.html"){
<div class="custom-title">缴费金额:{{item.paymentMoney}}</div>
</template>
<template #right-icon>
<van-button @click="show=true" v-if="!item.isPayment" size="mini" plain type="info">设为已缴</van-button>
<van-button @click="openPay(item)" v-if="!item.isPayment" size="mini" plain type="info">设为已缴</van-button>
</template>
</van-cell>
<template #right>
@@ -64,6 +64,7 @@ layout("/mobile/platform.html"){
v-model="formData.paymentMoney"
name="缴费金额"
label="缴费金额"
type="digit"
placeholder="缴费金额"
:rules="[{ required: true, message: '请填写缴费金额' }]"
></van-field>
@@ -97,8 +98,7 @@ layout("/mobile/platform.html"){
totalCount: 0,
username: "",
isPay:false,
searchName:'u.username',
searchKeyword:''
search:''
},
option1: [
{ text: '姓名', value: 'u.username' },
@@ -162,6 +162,31 @@ layout("/mobile/platform.html"){
}
})
},
openPay(item){
this.show=true
this.formData=item
},
onSubmit(){
this.$dialog.confirm({
title: '提示',
message: "您确定要更改缴费信息吗?",
}).then(async () => {
const data={
ids:JSON.stringify([this.formData.id]),
paymentMoney:this.formData.paymentMoney,
remark:this.formData.remark,
isPay:this.formData.isPayment
}
const resp = await $.get("/platform/member/payment/summary/modify", data)
if (resp.code === 0) {
this.$toast.success(resp.msg)
await this.doSearch()
this.show=false
} else {
this.$toast.fail(resp.msg)
}
})
}
},
async created() {
await this.pageData()