commit

src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinApplyController.java

@@ -167,12 +167,12 @@ public class ClubUserJoinApplyController {
         }
 
         if (ObjectUtil.isNotEmpty(clubUser)) {
-            return Result.error("请勿重复申请！");
+            return Result.error(99, "请勿重复申请！");
         }
 
         ProcessInstance processInstance = dao.fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", userApply.getId()));
         if (!processInstance.getState().equals(ProcessInstanceStateEnum.FINISHED.getCode())) {
-            return Result.error("您有该协会的申请记录尚未完成，请到我的申请里查看！");
+            return Result.error(99, "您有该协会的申请记录尚未完成，请到我的申请里查看！");
         }
         return Result.success();
     }

src/main/java/com/budwk/app/zhgh/club/controller/apply/ClubUserJoinMineController.java

@@ -112,6 +112,7 @@ public class ClubUserJoinMineController {
         Sql sql = Sqls.create("""
                 SELECT
                 	cua.*,
+                	club.clubName,
                 	u.loginname AS loginName,
                 	u.username AS userName,
                 	u.sex,
@@ -125,6 +126,7 @@ public class ClubUserJoinMineController {
                 FROM
                 	club_user_apply cua
                 	LEFT JOIN vw_user u ON u.id = cua.userId
+                	LEFT JOIN sys_club club ON club.id = cua.clubId
                 WHERE cua.id = @id
                 """);
         sql.setParam("id",id);

src/main/java/com/budwk/app/zhgh/club/controller/statistics/ClubStatisticsController.java

@@ -253,7 +253,6 @@ public class ClubStatisticsController {
         exportEntities.add(new ExcelExportEntity("退休人数", "retire", 20));
         exportEntities.add(new ExcelExportEntity("男", "man", 20));
         exportEntities.add(new ExcelExportEntity("女", "woman", 20));
-        exportEntities.add(new ExcelExportEntity("理事机构人数", "governing_body", 20));
 
         ExportParams exportParams = new ExportParams();
         exportParams.setType(ExcelType.XSSF);
@@ -335,11 +334,11 @@ public class ClubStatisticsController {
                  	club.clubCode,
                  	club.clubName,
                  	sum( CASE WHEN cu.userId is not null $myCondition THEN 1 ELSE 0 END ) AS total,
-                 	sum( CASE WHEN su.userState in ('在职', '在岗')  $myCondition THEN 1 ELSE 0 END ) AS `work`,
+                 	sum( CASE WHEN su.userState in ('在职', '在岗') $myCondition THEN 1 ELSE 0 END ) AS `work`,
                  	sum( CASE WHEN su.userState in ('退休') $myCondition THEN 1 ELSE 0 END ) AS retire,
                  	sum( CASE WHEN su.sex like '%男%' $myCondition THEN 1 ELSE 0 END ) AS man,
                  	sum( CASE WHEN su.sex like '%女%' $myCondition THEN 1 ELSE 0 END ) AS woman,
-                 	sum( CASE WHEN cu.roleCode != 'CLUB_MEMBER' AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body
+                 	sum( CASE WHEN ('CLUB_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_VICE_PRESIDENT' MEMBER OF (cu.roleCode) or 'CLUB_SECRETARY' MEMBER OF (cu.roleCode) or 'CLUB_VICE_SECRETARY' MEMBER OF (cu.roleCode)) AND 1 = 1 $myCondition THEN 1 ELSE 0 END ) AS governing_body
                 FROM
                  	sys_club club
                  	LEFT JOIN club_user cu ON cu.clubId = club.id

src/main/java/com/budwk/app/zhgh/club/vo/ClubUserJoinVo.java

@@ -22,4 +22,5 @@ public class ClubUserJoinVo extends ClubUserApply {
     private String education;
     private String academicDegree;
     private String position;
+    private String clubName;
 }