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

Changes

Browse Source
This commit is contained in:
zhouhefeng
2026-07-14 09:12:00 +08:00
parent 4475404f70
commit cadd4bbffe
18 changed files with 208 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java
+3
View File
@@ -393,6 +393,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl<Sys_user> imple
*/
private String getAnalysisPersonFilterSql(MemberStatisticsPageForm pageForm, String alias) {
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.append(getAnalysisInSql(alias, "personType", pageForm.getPersonTypes()));
sqlBuilder.append(getAnalysisInSql(alias, "aidFundMemberUserType", pageForm.getAidFundMemberUserTypes()));
sqlBuilder.append(getAnalysisInSql(alias, "userAttribute", pageForm.getUserAttributes()));
return sqlBuilder.toString();
@@ -498,6 +499,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl<Sys_user> imple
sql.setVar("yearCnd", new Static(" AND u.`year` = %d".formatted(currentYear)));
// sql.setVar("abbr", new Static("his"));
}
cnd.andEX("u.personType", "in", pageForm.getPersonTypes());
cnd.andEX("u.userAttribute", "in", pageForm.getUserAttributes());
cnd.andEX("u.aidFundMemberUserType", "in", pageForm.getAidFundMemberUserTypes());
cnd.groupBy("un.id", "un.unionCode", "un.name");
@@ -539,6 +541,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl<Sys_user> imple
sql.setVar("table", new Static("member_history"));
sql.setVar("yearCnd", new Static(" AND u.`year` = %d".formatted(currentYear)));
}
cnd.andEX("u.personType", "in", pageForm.getPersonTypes());
cnd.andEX("u.userAttribute", "in", pageForm.getUserAttributes());
cnd.andEX("u.aidFundMemberUserType", "in", pageForm.getAidFundMemberUserTypes());
cnd.and("un.unitLevel", "=", 2);