From cadd4bbffeeea1328aaffd6b4c067d2bebfb7255 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 14 Jul 2026 09:12:00 +0800 Subject: [PATCH] Changes --- .../impl/MemberStatisticsServiceImpl.java | 3 ++ .../club/infoManage/manage/clubInfoManage.js | 2 + .../member/apply/common/commonQuery.js | 2 +- .../staffmanage/member/apply/submit/form.html | 24 ++++++--- .../member/apply/submit/index.html | 30 +++++++----- .../member/change/common/commonQuery.js | 2 +- .../member/change/common/memberChange.js | 49 +++++++++++++------ .../member/change/manage/index.html | 22 ++++++--- .../member/common/info/memberInfo.js | 8 +-- .../member/info/common/commonQuery.js | 2 +- .../member/info/history/index.html | 2 +- .../staffmanage/member/info/input/index.html | 2 +- .../member/statistics/analysis/index.html | 37 ++++++++++++++ .../statistics/comprehensive/index.html | 3 +- .../statistics/comprehensive/queryForm.js | 2 +- .../member/statistics/summary/index.html | 37 ++++++++++++++ .../welfare/projectMange/welfareOption.js | 41 +++++++++++----- .../zhgh/welfare/statistics/index.html | 6 +++ 18 files changed, 208 insertions(+), 66 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java index a6b65e1c..3eff9365 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java @@ -393,6 +393,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl 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 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 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); diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js index fb6f4315..3389dbbb 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js +++ b/src/main/resources/views/platform/zhgh/club/infoManage/manage/clubInfoManage.js @@ -35,6 +35,8 @@ + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js index 586cb59c..aa1da21f 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js @@ -35,7 +35,7 @@ - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html index 0c7ad0b1..318ff745 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html @@ -63,12 +63,7 @@ - - - + @@ -278,6 +273,18 @@ } }, methods: { + normalizeUnitField() { + if (!this.formData || !this.formData.unitId) { + return + } + const unitId = String(this.formData.unitId) + this.$set(this.formData, "unitId", unitId) + const unit = this.units.find(v => String(v.id) === unitId) + if (unit) { + this.$set(this.formData, "unitName", unit.name) + this.$set(this.formData, "unionName", unit.unionName || unit.unionname || this.formData.unionName || "") + } + }, // 提交 handleTaskAction(val) { this.$refs.formRef.validate((valid) => { @@ -446,7 +453,7 @@ this.$set(this.formData, "userState", userState) this.$set(this.formData, "personType", personType) this.$set(this.formData, "unitName", unit ? unit.name : unitName) - this.$set(this.formData, "unitId", unit ? unit.id : unitId) + this.$set(this.formData, "unitId", unit ? String(unit.id) : unitId) this.$set(this.formData, "unionName", union ? union.name : unionName) this.$set(this.formData, "unionId", union ? union.id : unionId) @@ -458,8 +465,9 @@ }, }, async created() { - this.init() + await this.init() this.units = await this.$businessTool.listUnit() + this.normalizeUnitField() await this.validateApply() } }) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index 9e0bbe7f..c1834bc8 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -69,12 +69,7 @@ layout("/layouts/platform.html"){ - - - + @@ -326,6 +321,18 @@ layout("/layouts/platform.html"){ } }, methods: { + normalizeUnitField() { + if (!this.formData || !this.formData.unitId) { + return + } + const unitId = String(this.formData.unitId) + this.$set(this.formData, "unitId", unitId) + const unit = this.units.find(v => String(v.id) === unitId) + if (unit) { + this.$set(this.formData, "unitName", unit.name) + this.$set(this.formData, "unionName", unit.unionName || unit.unionname || this.formData.unionName || "") + } + }, onSave() { this.$confirm("您确定保存吗？", "提示", { confirmButtonText: "确定", @@ -453,7 +460,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, "personType", personType) this.$set(this.formData, "preparedBy", preparedBy) this.$set(this.formData, "unitName", unit ? unit.name : unitName) - this.$set(this.formData, "unitId", unit ? unit.id : unitId) + this.$set(this.formData, "unitId", unit ? String(unit.id) : unitId) this.$set(this.formData, "unionName", union ? union.name : unionName) this.$set(this.formData, "unionId", union ? union.id : unionId) @@ -465,11 +472,10 @@ layout("/layouts/platform.html"){ } } }, - created() { - this.init() - this.$businessTool.listUnit().then((data) => { - this.units = data - }) + async created() { + await this.init() + this.units = await this.$businessTool.listUnit() + this.normalizeUnitField() } }) diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js index b52712c9..a1441080 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js @@ -30,7 +30,7 @@ - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js index 89fd61fa..29ad9a9b 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/change/common/memberChange.js @@ -92,12 +92,7 @@ const MEMBER_CHANGE = {