From 088418ec4d795a5fd2bbb1d1fbe2499574814a7a Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 29 Dec 2025 13:44:10 +0800 Subject: [PATCH] commit --- .../controller/v4/SysV4AppsController.java | 5 +++-- .../ActivityDeclareBranchUnionController.java | 2 +- ...ctivityDeclareClubPrincipalController.java | 2 +- .../ActivityDeclareMineController.java | 2 +- ...ivityDeclareSchoolPrincipalController.java | 2 +- .../ActivityDeclareSchoolUnionController.java | 2 +- .../apply/ClubUserJoinApplyController.java | 2 +- .../apply/ClubUserMineClubController.java | 11 ++++++++-- src/main/resources/views/layouts/v4/apps.html | 2 +- src/main/resources/views/layouts/v4/serv.html | 4 ++-- .../zhgh/activity/family/manage/basicForm.js | 4 ++-- .../activity/fellowship/manage/basicForm.js | 4 ++-- .../activity/trainSignUp/manage/basicForm.js | 4 ++-- .../dayofficework/article/query/index.html | 2 +- .../dayofficework/article/write/index.html | 8 ++++++++ .../zhgh/dayofficework/ghkh/khph.html | 2 +- .../literacy/manage/basicForm.js | 4 ++-- .../meeting/approval/index.html | 3 +-- .../difficulthelp/apply/index.html | 20 +++++++++---------- .../difficulthelp/apply/index.html | 4 ++-- .../views/platform/zhghh5/sys/home/apps.js | 2 +- 21 files changed, 53 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java index 9a8ba24..ea74437 100644 --- a/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java +++ b/src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java @@ -137,7 +137,7 @@ public class SysV4AppsController { @Ok("json:full") @SaCheckLogin @ApiOperation("获取收藏的应用") - public Result favorite(HttpServletRequest req) { + public Result favorite(String platform, HttpServletRequest req) { Sql sql = Sqls.create(""" SELECT m.id, @@ -156,12 +156,13 @@ public class SysV4AppsController { LEFT JOIN sys_module sm ON sm.id = m.moduleId WHERE f.userId = @userId - AND m.platform = 'PC' + AND m.platform = @platform AND m.disabled = 0 ORDER BY m.location ASC; """); sql.setParam("userId", SecurityUtil.getUserId()); + sql.setParam("platform", platform); List list = sysMenuService.listMap(sql); return Result.success(list); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java index c79c881..c91e160 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareBranchUnionController.java @@ -106,7 +106,7 @@ public class ActivityDeclareBranchUnionController { cnd.and("t.taskName", "=", "54f481d7-3239-4cd2-882d-e1cc18ea86eb"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - cnd.andEX("info.applyTime", "=", pageParam.getYear()); + cnd.andEX("year(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java index 2ef3dc2..5ec8cbd 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareClubPrincipalController.java @@ -100,7 +100,7 @@ public class ActivityDeclareClubPrincipalController { cnd.and("t.taskName", "=", "06d5979b-b52f-4df1-8974-087568322cd6"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - cnd.andEX("info.applyTime", "=", pageParam.getYear()); + cnd.andEX("year(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index 0349dca..442115b 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -126,7 +126,7 @@ public class ActivityDeclareMineController { """); Cnd cnd = Cnd.NEW(); pageParam.buildSearch(cnd, "info."); - cnd.andEX("info.applyTime", "=", pageParam.getYear()); + cnd.andEX("year(info.applyTime)", "=", pageParam.getYear()); if (StrUtil.isAllBlank(pageParam.getPageOrderName(), pageParam.getPageOrderBy())) { cnd.desc("info.applyTime"); } else { diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java index bef5b3a..b4484db 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolPrincipalController.java @@ -100,7 +100,7 @@ public class ActivityDeclareSchoolPrincipalController { cnd.and("t.taskName", "=", "5b511275-143f-4ecd-8eff-7c8ad1456b1b"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - cnd.andEX("info.applyTime", "=", pageParam.getYear()); + cnd.andEX("year(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java index d8cbad8..9ebc372 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareSchoolUnionController.java @@ -97,7 +97,7 @@ public class ActivityDeclareSchoolUnionController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "81428a9b-63c0-44b8-a28c-17d282c2cc8e"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - cnd.andEX("info.applyTime", "=", pageParam.getYear()); + cnd.andEX("year(info.applyTime)", "=", pageParam.getYear()); if (pageParam.getAudit()) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java index b28cdf3..a197f99 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java @@ -122,7 +122,7 @@ public class ClubUserJoinApplyController { ClubUserApply userApply = dao.fetch(ClubUserApply.class, Cnd.where("userId", "=", clubUserApply.getUserId()).and("clubId", "=", clubUserApply.getClubId()).and("mode", "=", 1).desc(ClubUserApply::getApplyDate)); if (ObjectUtil.isNotEmpty(userApply) && StrUtil.isBlank(userApply.getId())) { ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId())); - if (!processInstance.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())) { + if (!List.of(ProcessInstanceStateEnum.REJECT.getCode(),ProcessInstanceStateEnum.FINISHED.getCode()).contains(processInstance.getState())) { return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！"); } } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java index 4e3ca85..353c824 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserMineClubController.java @@ -4,6 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; import com.budwk.app.base.service.BaseService; +import com.budwk.app.flow.entity.ProcessInstance; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.club.model.ClubUser; import com.budwk.app.zhgh.club.param.ClubUserPageForm; @@ -47,7 +49,12 @@ public class ClubUserMineClubController { return Result.success(); } List clubIds = query.stream().map(ClubUser::getClubId).toList(); - Sql sql = Sqls.create(""" + + List processInstance = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", clubIds)); + List instanceList = processInstance.stream().filter(o -> o.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())).toList(); + List list = instanceList.stream().map(ProcessInstance::getBusinessNo).toList(); + + Sql sql = Sqls.create(""" SELECT club.*, COUNT(DISTINCT ( uc.userId )) AS currentPeopleNum, @@ -64,7 +71,7 @@ public class ClubUserMineClubController { """); Cnd cnd = Cnd.NEW(); cnd.andEX("club.clubName", "=", pageForm.getClubName()); - cnd.and("club.id", "in", clubIds); + cnd.and("club.id", "in", list); cnd.groupBy("club.id"); cnd.asc("club.clubCode"); sql.setCondition(cnd); diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html index b434f49..2985295 100644 --- a/src/main/resources/views/layouts/v4/apps.html +++ b/src/main/resources/views/layouts/v4/apps.html @@ -565,7 +565,7 @@ layout("/layouts/v4/baseLayout.html"){ // 加载收藏的应用 loadFavorites() { - $.get("/platform/v4/apps/favorite") + $.get("/platform/v4/apps/favorite", {platform: 'PC'}) .then((result) => { if (result.code === 0) { this.applications = result.data || [] diff --git a/src/main/resources/views/layouts/v4/serv.html b/src/main/resources/views/layouts/v4/serv.html index 8bcbe3b..e5bb7ac 100644 --- a/src/main/resources/views/layouts/v4/serv.html +++ b/src/main/resources/views/layouts/v4/serv.html @@ -146,7 +146,7 @@ layout("/layouts/v4/baseLayout.html"){ flex: 1; overflow-y: auto; grid-auto-rows: min-content; - padding-top: 5px; + padding: 5px 0; } .app-card { @@ -528,7 +528,7 @@ layout("/layouts/v4/baseLayout.html"){ // 加载收藏的应用 loadFavorites() { - $.get("/platform/v4/serv/favorite") + $.get("/platform/v4/serv/favorite", {platform: 'PC'}) .then((result) => { if (result.code === 0) { this.applications = result.data || [] diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js index cbe2794..d4c5c92 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/activity/family/manage/basicForm.js @@ -598,8 +598,8 @@ const basicForm = { cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null - if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) { - cloneData.year = new Date(cloneData.activityStartTime).getFullYear() + if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) { + cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear() } cloneData.typeLimits = JSON.stringify(this.formData.typeLimits) cloneData.courseList = JSON.stringify(cloneData.courseList) diff --git a/src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js index b75110c..1db5d09 100644 --- a/src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/activity/fellowship/manage/basicForm.js @@ -592,8 +592,8 @@ const basicForm = { cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null - if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) { - cloneData.year = new Date(cloneData.activityStartTime).getFullYear() + if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) { + cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear() } cloneData.typeLimits = JSON.stringify(this.formData.typeLimits) cloneData.courseList = JSON.stringify(cloneData.courseList) diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js index 26f49ca..efcc890 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js @@ -551,8 +551,8 @@ const basicForm = { cloneData.activitySignUpEndTime = cloneData.activitySignTime !== undefined ? cloneData.activitySignTime[1] : null cloneData.activityStartTime = cloneData.activityTime !== undefined ? cloneData.activityTime[0] : null cloneData.activityEndTime = cloneData.activityTime !== undefined ? cloneData.activityTime[1] : null - if (cloneData.activityStartTime !== undefined && cloneData.activityStartTime !== null) { - cloneData.year = new Date(cloneData.activityStartTime).getFullYear() + if (cloneData.activitySignUpStartTime !== undefined && cloneData.activitySignUpStartTime !== null) { + cloneData.year = new Date(cloneData.activitySignUpStartTime).getFullYear() } cloneData.typeLimits = JSON.stringify(this.formData.typeLimits) cloneData.courseList = JSON.stringify(cloneData.courseList) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html index 3017a32..d7edfdb 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html @@ -94,7 +94,7 @@ layout("/layouts/platform.html"){ created() { this.$businessTool.listUnit().then((res) => (this.unitOptions = res)) this.$businessTool.listUnion().then((res) => (this.unionOptions = res)) - this.$businessTool.listClub().then((res) => (this.clubOptions = res)) + this.$businessTool.listCLubByRole().then((res) => (this.clubOptions = res)) this.pageData() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html index a41471f..fd0b572 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html @@ -123,6 +123,10 @@ layout("/layouts/platform.html"){ onSubmit() { this.$refs.formRef.validate((valid) => { if (valid) { + if(this.formData.clubId) { + const club = this.permission?.clubs.find(o => o.id === this.formData.clubId) + this.$set(this.formData, 'clubName', club.clubName) + } this.$axios.post("/platform/article/write/submit", { article: JSON.stringify(this.formData), taskId: this.taskId, @@ -144,6 +148,10 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { + if(this.formData.clubId) { + const club = this.permission?.clubs.find(o => o.id === this.formData.clubId) + this.$set(this.formData, 'clubName', club.clubName) + } this.$axios.post('/platform/article/write/submitAgain', { article: JSON.stringify(this.formData), taskId: GetQueryString("taskId") diff --git a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html index 266ed1e..2d7da95 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/ghkh/khph.html @@ -40,7 +40,7 @@ layout("/layouts/platform.html"){ - -