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

bug修改

Browse Source
This commit is contained in:
=
2025-09-02 14:12:57 +08:00
parent 1c805dcd51
commit 773c113fcf
7 changed files with 101 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/user/singleTeacher/param/SingleTeacherPageForm.java
+13 -1
View File
@@ -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;
}
src/main/java/com/budwk/app/zhgh/user/singleTeacher/service/impl/SingleTeacherServiceImpl.java
+8 -1
View File
@@ -78,7 +78,9 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl<SingleTeacher> 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<SingleTeacher> 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())) {
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareStatisticsServiceImpl.java
+3 -3
View File
@@ -96,11 +96,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl<WelfareProject
for (NutMap union : mapUnions) {
// 福利人数
long teacherSum = welfareSelectionList.stream().filter(v -> 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<WelfareProject
// 各选项的选择人数
for (WelfareProjectSubjectOption option : welfareOptions) {
long count = userSelections.stream().filter(v -> 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);
}
}