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:
=
2026-04-01 11:32:15 +08:00
parent 69f7b51787
commit 73f53fc858
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
+2 -1
View File
@@ -92,8 +92,9 @@ public class MemberPaymentChartSummaryController {
@Param(value = "endYear", required = false) Integer endYear) {
Sql sql = Sqls.create("""
SELECT
mpp.id,
mpp.projectName,
SUM( pt.tradingAmount * 0.01 ) AS money
COALESCE(SUM(pt.tradingAmount * 0.01), 0) AS money
FROM
member_payment_project mpp
LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java
+6 -9
View File
@@ -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 search) {
String isPay,String schoolTime,String search) {
Sql sql = Sqls.create("""
SELECT
mpi.*,
@@ -96,8 +96,6 @@ public class MemberPaymentSummaryController {
u.mobile,
u.birthday,
u.schoolTime,
u.retireDate,
u.workDate,
startSalaryDate,
renewTime
FROM
@@ -132,7 +130,7 @@ public class MemberPaymentSummaryController {
cnd.andEX("u.personType", "=", personType);
cnd.andEX("u.userState", "=", userState);
cnd.andEX("u.schoolTime", "=", schoolTime);
cnd.andEX("u.retireDate", "=", retireDate);
// cnd.andEX("u.retireDate", "=", retireDate);
cnd.groupBy("u.id");
if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) {
@@ -165,7 +163,7 @@ public class MemberPaymentSummaryController {
@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,search);
personType, userState, paymentProjectId, year, isPay,schoolTime,search);
return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
}
@@ -176,7 +174,7 @@ public class MemberPaymentSummaryController {
public Object modify(@Param("ids") String[] ids, String paymentMoney, boolean isPay, String remark) {
List<String> idList = Arrays.asList(ids);
if (Lang.isNotEmpty(idList)) {
if (!isPay) {
if (isPay) {
//未缴费设为已缴费
memberPaymentService.update(Chain.make("paymentMoney", paymentMoney)
.add("remark", remark).add("isPayment", 1)
@@ -297,11 +295,10 @@ public class MemberPaymentSummaryController {
@Param(value = "paymentProjectId", required = false) String paymentProjectId,
@Param(value = "year", required = false) String year,
@Param(value = "isPay", required = false) String isPay,
@Param(value = "isPay", required = false) String schoolTime,
@Param(value = "isPay", required = false) String retireDate,
@Param(value = "schoolTime", required = false) String schoolTime,
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,"");
List<NutMap> list = memberPaymentService.listMap(sql);
NutMap nutMap = list.stream().findFirst().orElse(null);