diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java index 8968e0f..4fdd028 100644 --- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java +++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java @@ -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 list = memberPaymentService.listMap(sql); NutMap nutMap = list.stream().findFirst().orElse(null); diff --git a/src/main/resources/views/mobile/memberCost/summary.html b/src/main/resources/views/mobile/memberCost/summary.html index d080ad5..762e9c0 100644 --- a/src/main/resources/views/mobile/memberCost/summary.html +++ b/src/main/resources/views/mobile/memberCost/summary.html @@ -7,7 +7,7 @@ layout("/mobile/platform.html"){
- +
@@ -40,7 +40,7 @@ layout("/mobile/platform.html"){
缴费金额:{{item.paymentMoney}}