From 773c113fcf33ce521813fdacfcaaeca773071a46 Mon Sep 17 00:00:00 2001 From: = <=> Date: Tue, 2 Sep 2025 14:12:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SingleTeacherPageForm.java | 14 ++++- .../impl/SingleTeacherServiceImpl.java | 9 +++- .../impl/WelfareStatisticsServiceImpl.java | 6 +-- .../zhgh/unionReimburse/apply/index.html | 34 +++++++++++- .../zhgh/unionReimburse/mine/index.html | 2 +- .../zhgh/user/singleTeacher/ledger/index.html | 52 +++++++++++++++---- .../zhgh/welfare/projectMange/index.html | 4 +- 7 files changed, 101 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java b/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java index ee34fe1c..e23a382a 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java @@ -14,13 +14,25 @@ public class SingleTeacherPageForm extends PageForm { @ApiModelProperty("分工会ID") private String unionId; - @ApiModelProperty("部门ID") + @ApiModelProperty("单位ID") private String unitId; + @ApiModelProperty("性别") + private String sex; + @ApiModelProperty("婚姻状况") private String maritalStatus; + @ApiModelProperty("学历") + private String education; + @ApiModelProperty("年龄范围") private Integer[] age; + @ApiModelProperty("人员类型") + private String personType; + + @ApiModelProperty("在职状态") + private String userState; + } diff --git a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java b/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java index e34f971c..a6db069a 100644 --- a/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java @@ -78,7 +78,9 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl imp u.loginname, u.sex, u.unionName, - u.unitName + u.unitName, + u.personType, + u.userState FROM `single_teacher` st LEFT JOIN vw_user u ON u.id = st.userId @@ -93,6 +95,11 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl imp } cnd.where().andBetween("TIMESTAMPDIFF(YEAR, u.birthday, CURDATE())", pageForm.getAge()[0], pageForm.getAge()[1]); cnd.andEX("u.unionId", "=", pageForm.getUnionId()); + cnd.andEX("u.sex", "=", pageForm.getSex()); + cnd.andEX("u.unitId", "=", pageForm.getUnitId()); + cnd.andEX("u.personType", "=", pageForm.getPersonType()); + cnd.andEX("u.userState", "=", pageForm.getUserState()); + cnd.andEX("st.education", "=", pageForm.getEducation()); cnd.andEX("u.maritalStatus", "=", pageForm.getMaritalStatus()); if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java index 050d7e74..b77c57c9 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java @@ -96,11 +96,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId").equals(union.getString("id"))).count(); + long teacherSum = welfareSelectionList.stream().filter(v -> (union.getString("id")).equals(v.getString("welfareUnionId"))).count(); union.put("teacherSum", teacherSum); // 已选人数 - long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); + long selectedNum = welfareSelectionList.stream().filter(v -> (union.getString("id")).equals(v.getString("welfareUnionId")) && v.getBoolean("has_selected")).count(); union.put("selectedNum", selectedNum); // 未选人数 @@ -108,7 +108,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId").equals(union.getString("id")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); + long count = userSelections.stream().filter(v -> (union.getString("id")).equals(v.getString("welfareUnionId")) && StrUtil.isNotBlank(v.getString("selectOptionId")) && v.getString("selectOptionId").equals(option.getId())).map(v -> v.getString("selectUserId")).distinct().count(); union.put(option.getId(), count); } } diff --git a/src/main/resources/views/platform/zhgh/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhgh/unionReimburse/apply/index.html index 748c0d08..7a36e9cb 100644 --- a/src/main/resources/views/platform/zhgh/unionReimburse/apply/index.html +++ b/src/main/resources/views/platform/zhgh/unionReimburse/apply/index.html @@ -43,7 +43,7 @@ layout("/layouts/platform.html"){ - + {{item.name}} @@ -266,7 +266,8 @@ layout("/layouts/platform.html"){ typeOptions: [], reimburseProjectList: [], reimburseProjects: [], - clubOptions: [] + clubOptions: [], + budgetTypeOption: [] } }, // 监听报销类别发生变化，报销项目联动改变 @@ -480,6 +481,35 @@ layout("/layouts/platform.html"){ }, // 初始化 async init() { + //报销经费来源区分 + this.budgetTypeOption = await this.$businessTool.getDictOptions("UNION_REIMBURSE_FUND_SOURCE") + const budgetTypeOption = [] + if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) { + + } else { + if (this.$auth.hasRoleOr(["SCHOOL_OUTLAY_ADMIN", "SCHOOL_UNION_ADMIN"])) { + this.budgetTypeOption.map(v => { + if (["UNION_REIMBURSE_FUND_SOURCE_1"].includes(v.code)) { + budgetTypeOption.push(v) + } + }) + } + if (this.$auth.hasRoleOr(["BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_ADMIN"])) { + this.budgetTypeOption.map(v => { + if (["UNION_REIMBURSE_FUND_SOURCE_2"].includes(v.code)) { + budgetTypeOption.push(v) + } + }) + } + if (this.$auth.hasRoleOr(["CLUB_MANAGER", "CLUB_PRESIDENT"])) { + this.budgetTypeOption.map(v => { + if (["UNION_REIMBURSE_FUND_SOURCE_3"].includes(v.code)) { + budgetTypeOption.push(v) + } + }) + } + this.budgetTypeOption = budgetTypeOption + } this.reimburseProjectList = await this.$businessTool.getDictOptions("UNION_REIMBURSE_PROJECT") if (this.bizId) { this.$axios.post("/platform/unionReimburse/apply/info", {id: this.bizId}).then(async (res) => { diff --git a/src/main/resources/views/platform/zhgh/unionReimburse/mine/index.html b/src/main/resources/views/platform/zhgh/unionReimburse/mine/index.html index 5f95ede2..5880dc25 100644 --- a/src/main/resources/views/platform/zhgh/unionReimburse/mine/index.html +++ b/src/main/resources/views/platform/zhgh/unionReimburse/mine/index.html @@ -85,7 +85,7 @@ layout("/layouts/platform.html"){ - + ·