diff --git a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java index 240e73f..4a70348 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java @@ -56,17 +56,21 @@ public class H5ActivityWorksUploadCollectionController { `activity_works_collection` awc LEFT JOIN activity_user_scope aus ON aus.groupId = awc.activityGroupId AND aus.userId = @userId + $condition """).setParam("userId", SecurityUtil.getUserId()); Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(awc.startDateTime)", "=", year); - //查询报名中 + // 查询报名中 if (activityType == 2) { cnd.and(new Static("now() > awc.startDateTime and now() < awc.endDateTime")); - }//查询已结束的 + } + // 查询已结束的 else if (activityType == 3) { - cnd.and(new Static("now() > awc.startDateTime")); - } else if (activityType == 4) { - cnd.and(new Static("now() < awc.endDateTime")); + cnd.and(new Static("now() > awc.endDateTime")); + } + // 查询未开始的 + else if (activityType == 4) { + cnd.and(new Static("now() < awc.startDateTime")); } cnd.and("awc.enable", "=", 1); cnd.and("awc.type", "=", 1); diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java index 739810c..a9b4980 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java @@ -118,9 +118,11 @@ public class ClubRefreshReportController { public Object submit(@Param("data") SysClubRefresh clubRefresh) { Cnd cnd = Cnd.NEW(); - if(StrUtil.isNotBlank(clubRefresh.getId())) { - cnd.and(SysClubRefresh::getId, "!=", clubRefresh.getId()); - } + cnd.and("userId", "=", SecurityUtil.getUserId()); +// cnd.and("clubId", "=", clubRefresh.getClubId()); + if(StrUtil.isNotBlank(clubRefresh.getId())) { + cnd.and(SysClubRefresh::getId, "!=", clubRefresh.getId()); + } List list = dao.query(SysClubRefresh.class, cnd); List idList = list.stream().map(SysClubRefresh::getId).toList(); int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "not in", List.of(ProcessInstanceStateEnum.FINISHED.getCode(), ProcessInstanceStateEnum.REJECT.getCode()))); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java index 943faa1..4c9b9e6 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubExamineServiceImpl.java @@ -195,8 +195,9 @@ public class SysClubExamineServiceImpl extends BaseServiceImpl pageVO = articleService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pageVO); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java index c191c59..e3768c9 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleQueryController.java @@ -51,6 +51,7 @@ public class ArticleQueryController { info.unionName, info.submitTime, info.origin, + info.clubName, ins.id AS instanceId, ins.businessNo, ins.state instanceState, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index 99cebbd..9c079d6 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -112,7 +112,7 @@ public class CondolenceMineController { } else { cnd.desc("info.createTime"); } - + cnd.groupBy("info.id"); sql.setCondition(cnd); Pagination pagination = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java index a6a0b5f..3ddf72f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java @@ -104,6 +104,7 @@ public class DifficultHelpMineController { } else { cnd.orderBy("info." + pageParam.getPageOrderName(), PageUtil.getOrder(pageParam.getPageOrderBy())); } + cnd.groupBy("info.id"); sql.setCondition(cnd); Pagination pagination = difficultHelpCommonService.listPageMap(pageParam.getPageNumber(), pageParam.getPageSize(), sql); return Result.success().addData(pagination); diff --git a/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js b/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js index 1821ff2..d67418b 100644 --- a/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js +++ b/src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js @@ -18,7 +18,7 @@ const clubUserJoin = { {{viewData.sex}} - {{viewData.birthday}} + {{$moment(viewData.birthday).format('YYYY-MM-DD')}} {{viewData.mobile}} diff --git a/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html index 8dfd4ed..66b55e7 100644 --- a/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html @@ -16,7 +16,7 @@ layout("/layouts/platform.html"){ @change="doSearch" > - + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html index 80a07a9..5036dc6 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html @@ -25,6 +25,11 @@ layout("/layouts/platform.html"){ + + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html index 57e97bf..af167cb 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html @@ -202,6 +202,7 @@ layout("/layouts/platform.html"){ pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes) pageForm.personTypes = JSON.stringify(this.pageForm.personTypes) pageForm.userStates = JSON.stringify(this.pageForm.userStates) + pageForm.age = JSON.stringify(this.pageForm.age) const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => { return {prop: item.prop, label: item.label} }) diff --git a/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js b/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js index 2e22f33..d960508 100644 --- a/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js +++ b/src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js @@ -9,7 +9,7 @@ const clubUserJoin = { {{ viewData.userName }} {{ viewData.loginName }} {{ viewData.sex }} - {{ viewData.birthday }} + {{$moment(viewData.birthday).format('YYYY-MM-DD')}} {{ viewData.mobile }} {{ viewData.email }} {{ viewData.unionName }}