From da92350b6e763e0f605d7814b88a0569404fd1cf Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Sat, 20 Dec 2025 15:10:50 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysUnitController.java | 1 + .../ActivityCultureApplyUserServiceImpl.java | 12 +- .../info/MemberDataManageController.java | 242 +++++++++--------- .../param/SingleTeacherPageForm.java | 2 +- .../impl/SingleTeacherServiceImpl.java | 4 +- .../resources/views/layouts/v4/home/act.js | 89 ++++--- .../singleTeacher/ledger/index.html | 2 +- .../zhghh5/activity/culture/applyUser.html | 4 +- 8 files changed, 190 insertions(+), 166 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java index 0bfadc4..e745148 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java @@ -329,6 +329,7 @@ public class SysUnitController { parentId = ""; } unit.setCreatedBy(SecurityUtil.getUserId()); + unit.setUnitTypeCode(1); sysUnitService.save(unit, parentId); return Result.success(); } catch (Exception e) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java index 207fdb1..3e2fe07 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java @@ -4,11 +4,13 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; +import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.exception.BaseException; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; @@ -74,12 +76,20 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl listMap = memberInfoService.listMap(sql); - List list = listMap.stream().map(o -> o.getString("id")).toList(); + Cnd cnd = Cnd.NEW(); + cnd.and(Cnd.exps("member", "=", false).or("member", "is", null)); + Sql sql = generateSql(pageForm, cnd); + List listMap = memberInfoService.listMap(sql); + List list = listMap.stream().map(o -> o.getString("id")).toList(); - List userRoles = list.stream().map(o -> { - Sys_user_role userRole = new Sys_user_role(); - userRole.setRoleId(sysRole.getId()); - userRole.setUserId(o); - return userRole; - }).toList(); + List userRoles = list.stream().map(o -> { + Sys_user_role userRole = new Sys_user_role(); + userRole.setRoleId(sysRole.getId()); + userRole.setUserId(o); + return userRole; + }).toList(); - dao.update(Sys_user.class, Chain.make("member", true), Cnd.where("id", "in", list)); - dao.insert(userRoles); - return Result.success(); - } + dao.update(Sys_user.class, Chain.make("member", true), Cnd.where("id", "in", list)); + dao.insert(userRoles); + return Result.success(); + } - @At - @ApiOperation("批量设置福利会员") - @Aop(TransAop.READ_COMMITTED) - @SaCheckPermission("member.info.dataManage") - @SLog(tag = "会员管理-数据管理工具", msg = "批量设置福利会员") - public Object setWelfareMemberByCnd(@Param(value = "pageForm") MemberInfoPageForm pageForm, - @Param(value = "append") boolean append) { + @At + @ApiOperation("批量设置福利会员") + @Aop(TransAop.READ_COMMITTED) + @SaCheckPermission("member.info.dataManage") + @SLog(tag = "会员管理-数据管理工具", msg = "批量设置福利会员") + public Object setWelfareMemberByCnd(@Param(value = "pageForm") MemberInfoPageForm pageForm, + @Param(value = "append") boolean append) { - // 如果是先清空再追加 - if(!append) { - dao.update(Sys_user.class, Chain.make("welfareMember", false), Cnd.NEW()); - } + // 如果是先清空再追加 + if (!append) { + dao.update(Sys_user.class, Chain.make("welfareMember", false), Cnd.NEW()); + } - Cnd cnd = Cnd.NEW(); - cnd.and(Cnd.exps("welfareMember", "=", false).or("welfareMember", "is", null)); - Sql sql = generateSql(pageForm, cnd); - List listMap = memberInfoService.listMap(sql); - List list = listMap.stream().map(o -> o.getString("id")).toList(); + Cnd cnd = Cnd.NEW(); + cnd.and(Cnd.exps("welfareMember", "=", false).or("welfareMember", "is", null)); + Sql sql = generateSql(pageForm, cnd); + List listMap = memberInfoService.listMap(sql); + List list = listMap.stream().map(o -> o.getString("id")).toList(); - dao.update(Sys_user.class, Chain.make("welfareMember", true), Cnd.where("id", "in", list)); - return Result.success(); - } + dao.update(Sys_user.class, Chain.make("welfareMember", true), Cnd.where("id", "in", list)); + return Result.success(); + } - private Sql generateSql(MemberInfoPageForm pageForm, Cnd cnd) { - Sql sql = Sqls.create(""" - SELECT - id, - loginname as loginName, - username as userName, - sex, - userState, - personType, - preparedBy, - unionName, - unitName, - mobile - from - `vw_user` - $condition - """); - pageForm.buildSearch(cnd, ""); - if (StrUtil.isNotBlank(pageForm.getStartLoginNames())) { - String[] loginNames = pageForm.getStartLoginNames().split(","); - SqlExpressionGroup seg = new SqlExpressionGroup(); - for (String loginName : loginNames) { - seg.orLikeL("loginname", loginName); - } - cnd.and(seg); - } + private Sql generateSql(MemberInfoPageForm pageForm, Cnd cnd) { + Sql sql = Sqls.create(""" + SELECT + id, + loginname as loginName, + username as userName, + sex, + userState, + personType, + preparedBy, + unionName, + unitName, + mobile + from + `vw_user` + $condition + """); + pageForm.buildSearch(cnd, ""); + if (StrUtil.isNotBlank(pageForm.getStartLoginNames())) { + String[] loginNames = pageForm.getStartLoginNames().split(","); + SqlExpressionGroup seg = new SqlExpressionGroup(); + for (String loginName : loginNames) { + seg.orLikeL("loginname", loginName); + } + cnd.and(seg); + } - if (StrUtil.isNotBlank(pageForm.getEndLoginNames())) { - String[] loginNames = pageForm.getEndLoginNames().split(","); - SqlExpressionGroup seg = new SqlExpressionGroup(); - for (String loginName : loginNames) { - seg.orLikeR("loginname", loginName); - } - cnd.and(seg); - } - sql.setCondition(cnd); - return sql; - } + if (StrUtil.isNotBlank(pageForm.getEndLoginNames())) { + String[] loginNames = pageForm.getEndLoginNames().split(","); + SqlExpressionGroup seg = new SqlExpressionGroup(); + for (String loginName : loginNames) { + seg.orLikeR("loginname", loginName); + } + cnd.and(seg); + } + sql.setCondition(cnd); + return sql; + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java index 9cda323..19f1198 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/param/SingleTeacherPageForm.java @@ -21,7 +21,7 @@ public class SingleTeacherPageForm extends PageForm { private String sex; @ApiModelProperty("婚姻状况") - private String maritalStatus; + private String marriage; @ApiModelProperty("学历") private String education; diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java index 468d0f7..b58a4bd 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/singleTeacher/service/impl/SingleTeacherServiceImpl.java @@ -36,7 +36,7 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl imp Sql sql = buildSql(pageForm); List list = listMap(sql); for (int i = 0; i < list.size(); i++) { - list.get(i).put("序号", (i + 1)); + list.get(i).put("index", (i + 1)); } List entities = new ArrayList<>(); @@ -100,7 +100,7 @@ public class SingleTeacherServiceImpl extends BaseServiceImpl imp cnd.andEX("u.personType", "=", pageForm.getPersonType()); cnd.andEX("u.userState", "=", pageForm.getUserState()); cnd.andEX("st.education", "=", pageForm.getEducation()); - cnd.andEX("u.maritalStatus", "=", pageForm.getMaritalStatus()); + cnd.andEX("u.marriage", "=", pageForm.getMarriage()); if (StrUtil.isAllNotBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); diff --git a/src/main/resources/views/layouts/v4/home/act.js b/src/main/resources/views/layouts/v4/home/act.js index 09758b3..ac3bd16 100644 --- a/src/main/resources/views/layouts/v4/home/act.js +++ b/src/main/resources/views/layouts/v4/home/act.js @@ -4,51 +4,51 @@ const act = {
- -
-
- -
-
-
-
-
- - + +
+
+ +
+
+
+
+
+ + {{getStatusText(activity)}} -
-

- {{ activity.name}} -

- -
-

- - 时间：{{ activity.startDate }}至{{ activity.endDate }} -

-
-
-
-
-
- - -
-
- - -
-
+
+

+ {{ activity.name}} +

+ +
+

+ + 时间：{{ activity.startDate }}至{{ activity.endDate }} +

+
+
+
+
+
+ + +
+
+ + +
+
- -
-
📅
-

暂无近期活动

-

敬请关注后续通知

-
- + +
+
📅
+

暂无近期活动

+

敬请关注后续通知

+
+
`, @@ -119,6 +119,11 @@ const act = { this.$message.warning("管理员未配置活动链接") return } + if (act.url === "/platform/activity/apply" + && !this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS"])) { + return this.$message.warning("PC端暂未开放报名，请前往移动端报名！") + + } window.open(act.url) } }, diff --git a/src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html b/src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html index 9f3516c..3f6478a 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/singleTeacher/ledger/index.html @@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
- + diff --git a/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html b/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html index 56d33f4..27256a7 100644 --- a/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html +++ b/src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html @@ -48,7 +48,7 @@ layout("/layouts/platform_h5.html"){ - + @@ -94,7 +94,7 @@ layout("/layouts/platform_h5.html"){ refreshing: false, pageForm: { state: 2, - isEnrolledText: 0, + isEnrolled: 0, year: new Date().getFullYear(), pageNumber: 1, pageSize: 5,