commit

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRefreshReportController.java

@@ -123,7 +123,7 @@ public class ClubRefreshReportController {
 		}
         List<SysClubRefresh> list = dao.query(SysClubRefresh.class, cnd);
         List<String> 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("您有该协会的申请记录尚未完成，请核对！");
         }

src/main/java/com/budwk/app/zhgh/club/controller/infoManage/ClubRuleUpdateController.java

@@ -124,7 +124,7 @@ public class ClubRuleUpdateController {
 		}
         List<SysClubRule> list = dao.query(SysClubRule.class, cnd);
         List<String> 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("您有该协会的申请记录尚未完成，请核对！");
         }

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<SysClubExamineRegister> examineRegisters = sysClubService.dao().query(SysClubExamineRegister.class, Cnd.where("year(registerDate)", "=", DateUtil.thisYear()));
             List<String> list = examineRegisters.stream().map(SysClubExamineRegister::getId).toList();
 
@@ -96,7 +96,7 @@ public class ClubStatisticsController {
 
             List<SysClubExamineRegister> 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<Sys_user_role> 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<SysClub> list = sysClubService.query(cnd);
-        return Result.success(list);
+
+		// 获取审核通过的
+		List<ProcessInstance> 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<String> passList = instanceList.stream().map(ProcessInstance::getBusinessNo).toList();
+		List<SysClub> 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<NutMap> listMap = sysClubService.listMap(sql);
+
         for (NutMap nutMap : listMap) {
             List<String> 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<SysClub> clubList = sysClubService.query(stCnd);
 
+		// 获取审核通过的
+		List<ProcessInstance> 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<String> passList = instanceList.stream().map(ProcessInstance::getBusinessNo).toList();
+		clubList = clubList.stream().filter(o -> passList.contains(o.getId())).toList();
+
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
         exportEntities.add(new ExcelExportEntity("姓名", "userName", 20));
         exportEntities.add(new ExcelExportEntity("工号", "loginName", 20));

src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubInfoManageServiceImpl.java

@@ -164,7 +164,7 @@ public class SysClubInfoManageServiceImpl extends BaseServiceImpl<ClubCommonPage
         //查询社团成员
         if (pageForm.getRadioType() != null && 2 == pageForm.getRadioType()) {
             cnd.and(new Static("JSON_CONTAINS(scu.roleCode, '\"CLUB_MEMBER\"')"));
-            cnd.and(new Static("JSON_LENGTH(scu.roleCode) = 1"));
+            //cnd.and(new Static("JSON_LENGTH(scu.roleCode) = 1"));
         }
         sql.setCondition(cnd);
         Pagination<ClubUserCommonPageVo> listPageVO = sysClubService.listPageVO(pageForm, sql, ClubUserCommonPageVo.class);