diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index 1e75105d..642c253d 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -20,6 +20,7 @@ import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; +import com.budwk.app.zhgh.club.model.ClubUser; import com.budwk.app.zhgh.club.model.SysClub; import com.budwk.app.zhgh.club.service.SysClubService; import io.swagger.annotations.ApiOperation; @@ -195,11 +196,9 @@ public class ActivityCultureApplyActivityController { List myManageClub = sysClubService.getMyManageClub(); List clubIds = myManageClub.stream().map(SysClub::getId).collect(Collectors.toList()); - List clubList = sysClubService.dao().query(Sys_user_role.class, - Cnd.where("roleId", "in", List.of(RoleConstant.CLUB_MEMBER.name())) - .and("clubId", "in", clubIds)); + List list = sysClubService.dao().query(ClubUser.class, Cnd.where(ClubUser::getClubId, "in", clubIds)); - List clubUserIds = clubList.stream().map(Sys_user_role::getUserId).toList(); + List clubUserIds = list.stream().map(ClubUser::getUserId).toList(); cnd.and("id", "in", clubUserIds); } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java index e40a2342..d2a4330c 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java @@ -28,6 +28,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Strings; @@ -108,8 +109,11 @@ public class ActivityCultureUserStatisticsController { cnd.and("atp.userId", "in", Sqls.create("SELECT userid FROM club_user WHERE clubId in (@clubIds)").setParam("clubIds", clubIdList)); } } - if (Strings.isNotBlank(page.getSearchName()) && Strings.isNotBlank(page.getSearchKeyword())) { - cnd.where().andLike(page.getSearchName(), page.getSearchKeyword()); + if (Strings.isNotBlank(page.getSearchKeyword())) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.orLike("atp.username", page.getSearchKeyword()); + group.orLike("atp.loginanme", page.getSearchKeyword()); + cnd.and(group); } if (StrUtil.isNotBlank(page.getPageOrderName()) && StrUtil.isNotBlank(page.getPageOrderBy())) { cnd.orderBy(page.getPageOrderName(), page.getPageOrderBy().equalsIgnoreCase("ascending") ? "ASC" : "DESC"); 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 cadce594..739810cf 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 @@ -123,7 +123,7 @@ public class ClubRefreshReportController { } 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, "!=", ProcessInstanceStateEnum.FINISHED.getCode())); + 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()))); if (count > 0) { return Result.error("您有该协会的申请记录尚未完成，请核对！"); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java index c888e9b2..ef62fa43 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java @@ -124,7 +124,7 @@ public class ClubRuleUpdateController { } List list = dao.query(SysClubRule.class, cnd); List idList = list.stream().map(SysClubRule::getId).toList(); - int count = dao.count(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "in", idList).and(ProcessInstance::getState, "!=", ProcessInstanceStateEnum.FINISHED.getCode())); + 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()))); if (count > 0) { return Result.error("您有该协会的申请记录尚未完成，请核对！"); } diff --git a/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java index fae5c028..9199e754 100644 --- a/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java @@ -87,7 +87,7 @@ public class ClubStatisticsController { @SaCheckPermission("club.statistics") public Result getClub(Boolean auditState) { Cnd cnd = Cnd.NEW(); - if (auditState != null) { + /*if (auditState != null) { List examineRegisters = sysClubService.dao().query(SysClubExamineRegister.class, Cnd.where("year(registerDate)", "=", DateUtil.thisYear())); List list = examineRegisters.stream().map(SysClubExamineRegister::getId).toList(); @@ -96,7 +96,7 @@ public class ClubStatisticsController { List registers = examineRegisters.stream().filter(o -> businessNoList.contains(o.getId())).toList(); cnd.and("id", auditState ? "in" : "not in", registers.stream().map(SysClubExamineRegister::getClubId).toList()); - } + }*/ if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SCHOOL_UNION_CLUB_ADMIN.name())) { Sys_role sysRole = sysRoleService.getByCode(RoleConstant.CLUB_PRESIDENT); List userRoles = sysClubService.dao().query(Sys_user_role.class, Cnd.where("userId", "=", SecurityUtil.getUserId()).and("roleId", "=", sysRole.getId())); @@ -104,7 +104,18 @@ public class ClubStatisticsController { cnd.and("id", "in", myClubId); } List list = sysClubService.query(cnd); - return Result.success(list); + + // 获取审核通过的 + List instanceList = sysClubService.dao().query( + ProcessInstance.class, + Cnd.where(ProcessInstance::getBusinessNo, "in", list.stream().map(SysClub::getId).toList()) + .and(ProcessInstance::getState, "=", ProcessInstanceStateEnum.FINISHED.getCode()) + ); + // 获取id + List passList = instanceList.stream().map(ProcessInstance::getBusinessNo).toList(); + List clubList = list.stream().filter(o -> passList.contains(o.getId())).toList(); + + return Result.success(clubList); } @At @@ -195,6 +206,7 @@ public class ClubStatisticsController { cnd.andEX("u.sex", "=", sex); sql.setCondition(cnd); List listMap = sysClubService.listMap(sql); + for (NutMap nutMap : listMap) { List list = Json.fromJsonAsList(String.class, nutMap.getString("roleCode")); String roleName = SysClubUserServiceImpl.convertRoleName(list); @@ -206,6 +218,16 @@ public class ClubStatisticsController { stCnd.andEX("id", "=", clubId); List clubList = sysClubService.query(stCnd); + // 获取审核通过的 + List instanceList = sysClubService.dao().query( + ProcessInstance.class, + Cnd.where(ProcessInstance::getBusinessNo, "in", clubList.stream().map(SysClub::getId).toList()) + .and(ProcessInstance::getState, "=", ProcessInstanceStateEnum.FINISHED.getCode()) + ); + // 获取id + List passList = instanceList.stream().map(ProcessInstance::getBusinessNo).toList(); + clubList = clubList.stream().filter(o -> passList.contains(o.getId())).toList(); + List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("姓名", "userName", 20)); exportEntities.add(new ExcelExportEntity("工号", "loginName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java index 59d9328e..46b834ef 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java @@ -164,7 +164,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl listPageVO = sysClubService.listPageVO(pageForm, sql, ClubUserCommonPageVo.class); diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js index abb3549b..72459c72 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js @@ -16,7 +16,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { > - + @@ -168,7 +168,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { this.showApprovalForm = true this.formData = { processTaskId: row.taskId, - taskName: row.curTaskName + taskName: row.curTaskName, + id: row.id } this.$refs.editInfo.onOpen(row) }) diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js index b0a1755d..9c683cb9 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/userStatistics.js @@ -46,12 +46,6 @@ const ACTIVITY_CULTURE_USER_STATISTICS = { - - - - diff --git a/src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html b/src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html index cf80c955..e2c29ec5 100644 --- a/src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html +++ b/src/main/resources/views/platform/zhgh/club/evaluate/apply/index.html @@ -7,9 +7,7 @@ layout("/layouts/platform.html"){
-
-

年度优秀协会申报

-
+ diff --git a/src/main/resources/views/platform/zhgh/club/examine/apply/index.html b/src/main/resources/views/platform/zhgh/club/examine/apply/index.html index 92c88a5e..3b336ad2 100644 --- a/src/main/resources/views/platform/zhgh/club/examine/apply/index.html +++ b/src/main/resources/views/platform/zhgh/club/examine/apply/index.html @@ -10,10 +10,7 @@ layout("/layouts/platform.html"){ - -
-

考核登记

-
+ diff --git a/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html b/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html index 41514d16..db0bb1a7 100644 --- a/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html +++ b/src/main/resources/views/platform/zhgh/club/infoManage/change/index.html @@ -66,6 +66,9 @@ layout("/layouts/platform.html"){ + + +