c-hongqw1/zhgh_hhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-03-10 15:51:37 +08:00
parent 30a17cb884
commit 61511ae0e9
38 changed files with 812 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/models/Sys_club_user.java
+21 -52
View File
@@ -1,5 +1,6 @@
package io.v.nutz.sys.models;
import lombok.Data;
import org.nutz.dao.entity.annotation.*;
import org.nutz.lang.util.NutMap;
@@ -10,8 +11,10 @@ import java.util.List;
* @DateTime: 2020/8/15 16:39
* @Description: 社团成员
*/
@Data
@Table("Sys_club_user")
public class Sys_club_user {
@Column
@Name
@Comment("id")
@@ -49,64 +52,30 @@ public class Sys_club_user {
@ColDefine(type = ColType.INT, width = 4)
private Integer status;
@Column
@Comment("退会状态（1 待协会审核 2 协会审核不通过 3 待校工会审核 4 校工会审核不通过 5 通过）")
@ColDefine(type = ColType.INT, width = 4)
private Integer exitStatus;
@Column
@ColDefine(type = ColType.MYSQL_JSON)
@Comment("审核记录")
private List<NutMap> auditList;
public Boolean getIsjf() {
return isjf;
}
@Column
@Comment("是否正常，此字段相当于一个标识，删除或者退休，设置为false，不会真正的从数据库删除，目的是为了后面统计年度成员情况")
@ColDefine(type = ColType.BOOLEAN)
@Default("1")
private Boolean isNormal;
public void setIsjf(Boolean isjf) {
this.isjf = isjf;
}
@Column
@Comment("isNormal变化的时间")
@ColDefine(type = ColType.VARCHAR, width = 30)
private String changeTime;
public String getId() {
return id;
}
@Column
@ColDefine(type = ColType.MYSQL_JSON)
@Comment("退出审核记录")
private List<NutMap> exitAuditList;
public void setId(String id) {
this.id = id;
}
public String getClubid() {
return clubid;
}
public void setClubid(String clubid) {
this.clubid = clubid;
}
public String getUserid() {
return userid;
}
public void setUserid(String userid) {
this.userid = userid;
}
public String getJoin_time() {
return join_time;
}
public void setJoin_time(String join_time) {
this.join_time = join_time;
}
public Integer getSf() {
return sf;
}
public void setSf(Integer sf) {
this.sf = sf;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
src/main/java/io/v/nutz/web/controllers/platform/sys/club/ClubUserCountController.java
+10 -10
View File
@@ -40,16 +40,16 @@ public class ClubUserCountController {
SELECT
club.id,
club.`name`,
sum( CASE WHEN cu.STATUS = 5 THEN 1 ELSE 0 END ) AS total,
sum( CASE WHEN su.userState = '在职' AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS `work`,
sum( CASE WHEN su.userState = '退休' AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS retire,
sum( CASE WHEN su.sex = '男' AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS man,
sum( CASE WHEN su.sex = '女' AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS woman,
sum( CASE WHEN cu.sf != 2 THEN 1 ELSE 0 END ) AS governing_body,
sum( CASE WHEN cu.STATUS != 1 AND cu.sf = 2 THEN 1 ELSE 0 END ) AS club_has_confirm,
sum( CASE WHEN cu.STATUS = 1 AND cu.sf = 2 THEN 1 ELSE 0 END ) AS club_no_confirm,
sum( CASE WHEN cu.STATUS IN ( 4, 5 ) AND cu.sf = 2 THEN 1 ELSE 0 END ) AS school_has_confirm,
sum( CASE WHEN cu.STATUS = 3 AND cu.sf = 2 THEN 1 ELSE 0 END ) AS school_no_confirm
sum( CASE WHEN cu.STATUS = 5 AND cu.isNormal=true THEN 1 ELSE 0 END ) AS total,
sum( CASE WHEN su.userState = '在职' AND cu.isNormal=true AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS `work`,
sum( CASE WHEN su.userState = '退休' AND cu.isNormal=true AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS retire,
sum( CASE WHEN su.sex = '男' AND cu.isNormal=true AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS man,
sum( CASE WHEN su.sex = '女' AND cu.isNormal=true AND cu.STATUS = 5 THEN 1 ELSE 0 END ) AS woman,
sum( CASE WHEN cu.sf != 2 AND cu.isNormal=true THEN 1 ELSE 0 END ) AS governing_body,
sum( CASE WHEN cu.STATUS != 1 AND cu.isNormal=true AND cu.sf = 2 THEN 1 ELSE 0 END ) AS club_has_confirm,
sum( CASE WHEN cu.STATUS = 1 AND cu.isNormal=true AND cu.sf = 2 THEN 1 ELSE 0 END ) AS club_no_confirm,
sum( CASE WHEN cu.STATUS IN ( 4, 5 ) AND cu.isNormal=true AND cu.sf = 2 THEN 1 ELSE 0 END ) AS school_has_confirm,
sum( CASE WHEN cu.STATUS = 3 AND cu.isNormal=true AND cu.sf = 2 THEN 1 ELSE 0 END ) AS school_no_confirm
FROM
sys_club_user cu
RIGHT JOIN sys_club club ON cu.clubid = club.id
src/main/java/io/v/nutz/web/controllers/platform/sys/club/SysClubCon.java
+1 -1
View File
@@ -195,7 +195,7 @@ public class SysClubCon {
"\tclub.*,\n" +
"\tfzr.username fzrname,\n" +
"\tunit.`name` fzr_unit_name,\n" +
"\t( SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.`status` = 5 ) cynum \n" +
"\t( SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id and scu.isNormal=true AND scu.`status` = 5 ) cynum \n" +
"FROM\n" +
"\t`sys_club` club\n" +
"\tLEFT JOIN sys_user fzr ON club.fzr = fzr.id\n" +
src/main/java/io/v/nutz/web/controllers/platform/sys/club/SysClubUserCon.java
+1
View File
@@ -100,6 +100,7 @@ public class SysClubUserCon {
Cnd cnd = Cnd.NEW();
cnd.and("scu.clubid", "=", clubid);
cnd.and("scu.isNormal", "=", true);
cnd.and("scu.status", "in", type == 1 ? new int[]{5} : new int[]{1, 3, 5});
if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) {
src/main/java/io/v/nutz/web/controllers/platform/sys/club/SysClubUserShCon.java
+112 -62
View File
@@ -2,6 +2,7 @@ package io.v.nutz.web.controllers.platform.sys.club;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.annontation.ViReturn;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.PageUtil;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.sys.services.SysClubService;
@@ -48,10 +49,15 @@ public class SysClubUserShCon {
public void schoolsh() {
}
@At("/mobile")
@Ok("beetl:/mobile/club/clubActivityAudit.html")
public void mobile() {
}
@At("/mobile")
@Ok("beetl:/mobile/club/clubAudit.html")
public void mobile() {
}
@At("/schoolAudit")
@Ok("beetl:/mobile/club/schoolAudit.html")
public void schoolAudit() {
}
@Inject
private SysClubService sysClubService;
@@ -61,7 +67,16 @@ public class SysClubUserShCon {
@At
@ViReturn
public Object pageData(String clubid, String searchName, String searchKeyword, int pageNumber, int pageSize, String pageOrderName, String pageOrderBy, Integer radioType, Integer type) {
public Object pageData(String clubid,
String searchName,
String searchKeyword,
int pageNumber,
int pageSize,
String pageOrderName,
String pageOrderBy,
Integer radioType,
Integer type,
Integer applyType) {
Sql sql = Sqls.create("""
SELECT
scu.*,
@@ -80,37 +95,36 @@ public class SysClubUserShCon {
LEFT JOIN sys_club club ON scu.clubid = club.id
LEFT JOIN `user` u ON scu.userid = u.id
$condition
$myOrderBy
""");
Cnd cnd = Cnd.NEW();
cnd.and("u.username", "is not", null);
int status = type == 1 ? 1 : 3;
if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) {
if (radioType == 1) {
cnd.and("scu.status", "=", status).or(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"));
}
if (radioType == 2) {
cnd.and("scu.status", ">", status).and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"));
}
if (radioType == 3) {
cnd.and("scu.status", "=", status);
}
} else {
if (radioType == 1) {
cnd.and("scu.status", "=", status);
}
if (radioType == 2) {
cnd.and("scu.status", ">", status);
}
if (radioType == 3) {
cnd.and("scu.status", "=", status);
}
}
if (radioType == 1) {
if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) {
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", ">=", status);
} else {
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", ">", status);
}
}
if (radioType == 2) {
if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) {
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", ">=", status);
} else {
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", ">", status);
}
}
if (radioType == 3) {
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", "=", status);
}
cnd.andEX("scu.clubid", "=", clubid);
cnd.and("sf", "=", 2);
cnd.and("isNormal", "=", true);
cnd.andEX("scu.clubid", "=", clubid);
if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) {
if (ShiroUtil.hasRole("H02")) {
if (ShiroUtil.hasAnyRoles("club01, club02, club03, club04, H02")) {
cnd.and(new Static("""
scu.clubid IN ( SELECT stid FROM sys_user_role WHERE roleid = '%s' AND userid = '%s' AND stid IS NOT NULL )
""".formatted(Roles.CLUB_FZR, ShiroUtil.getPrincipalProperty("id"))));
@@ -121,10 +135,14 @@ public class SysClubUserShCon {
cnd.and(searchName, "like", "%" + searchKeyword + "%");
}
if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderBy)) {
cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy));
if("auditTime".equals(pageOrderName)) {
sql.setVar("myOrderBy", "ORDER BY JSON_EXTRACT(scu.auditList, '$[0].auditTime') " + PageUtil.getOrder(pageOrderBy));
} else {
cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy));
}
} else {
/*cnd.asc("scu.status").asc("scu.clubid").asc("scu.sf").desc("scu.join_time");*/
cnd.and(new Static(" 1=1 order by field(scu.status, 1, 3, 5, 2, 4), scu.clubid asc, scu.join_time desc"));
sql.setVar("myOrderBy", "ORDER BY JSON_EXTRACT(scu.auditList, '$[0].auditTime') DESC");
}
sql.setCondition(cnd);
return sysClubService.listPageMap(pageNumber, pageSize, sql);
@@ -133,36 +151,56 @@ public class SysClubUserShCon {
@At
@ViReturn
public Object check(String[] ids, Boolean flag, Integer type) {
public Object check(String[] ids, Boolean flag, Integer type, Integer applyType) {
Cnd cnd = Cnd.NEW();
cnd.where().andInStrArray("id", ids);
int status = 0;
if (type == 1) {
status = flag ? 3 : 2;
status = flag ? 5 : 2;
} else if (type == 2) {
status = flag ? 5 : 4;
}
List<NutMap> auditList = new ArrayList<>();
auditList.add(NutMap.NEW().addv("auditUser", ShiroUtil.getPrincipalProperty("id")).addv("auditState", flag));
sysClubUserService.update(Chain.make("status", status).add("auditList", auditList), cnd);
auditList.add(NutMap.NEW().addv("auditUser", ShiroUtil.getPrincipalProperty("id")).addv("auditState", flag)
.addv("auditTime", DateUtil.getDateTime()).addv("auditType", type == 1 ? "club" : "school"));
if(applyType == 1) {
sysClubUserService.update(Chain.make("status", status)
.add("join_time", cn.hutool.core.date.DateUtil.now())
.add("auditList", auditList), cnd);
} else {
Chain exitStatus = Chain.make("exitStatus", status).add("exitAuditList", auditList);
if(status == 5) {
exitStatus.add("isNormal", false);
}
sysClubUserService.update(exitStatus, cnd);
}
return null;
}
//获取当前登录用户负责的社团
@At
@ViReturn
public Object getMyClub(String searchKeyword, int pageNumber, int pageSize, String clubType) {
Sql sql = Sqls.create("""
select
club.*,
u.username as fzrname,
(select count(*) from sys_club_user cu where cu.clubid = club.id and status = 1) as no_audit,
(select count(*) from sys_club_user cu where cu.clubid = club.id and JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', @userid))) as has_audit
from
sys_club club
left join `user` u on club.fzr = u.id
$condition
""").setParam("userid", ShiroUtil.getPrincipalProperty("id"));
public Object getMyClub(String searchKeyword, int pageNumber, int pageSize, String clubType, int type, Integer applyType) {
String str = " and %s in ".formatted(applyType == 1 ? "status" : "exitstatus") + (type == 1 ? "('1')" : "('3')");
String has_str = " and JSON_CONTAINS(%s, JSON_OBJECT('auditUser', '%s')) "
.formatted(applyType == 1 ? "auditList" : "exitAuditList", ShiroUtil.getPrincipalProperty("id"));
int status = type == 1 ? 1 : 3;
if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) {
has_str = " and %s > %s ".formatted(applyType == 1 ? "status" : "exitStatus", status);
}
Sql sql = Sqls.create("" +
"select " +
"club.*, " +
"u.username as fzrname," +
"(select count(*) from sys_club_user cu where cu.clubid = club.id and sf = '2'" + str + ") as no_audit, " +
"(select count(*) from sys_club_user cu where cu.clubid = club.id and sf = '2'" + has_str + ") as has_audit " +
"from " +
"sys_club club " +
"left join `user` u on club.fzr = u.id " +
"$condition" +
"").setParam("userid", ShiroUtil.getPrincipalProperty("id"));
Cnd cnd = Cnd.NEW();
cnd.and("isjs", "=", false);
@@ -184,7 +222,16 @@ public class SysClubUserShCon {
//获取社团已审或者未审人员
@At
@ViReturn
public Object getClubUser(String id, String auditType) {
public Object getClubUser(String id, String auditType, int type, Integer applyType) {
String str = type == 1 ? "1" : "3";
String has_str = " JSON_CONTAINS(%s, JSON_OBJECT('auditUser', '%s')) "
.formatted(applyType == 1 ? "auditList" : "exitAuditList", ShiroUtil.getPrincipalProperty("id"));
int status = type == 1 ? 1 : 3;
if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin"})) {
has_str = " %s > %s ".formatted(applyType == 1 ? "status" : "exitStatus", status);
}
Sql sql = Sqls.create("""
SELECT
scu.*,
@@ -196,8 +243,7 @@ public class SysClubUserShCon {
u.birthday,
u.unionname,
u.unitname,
club.name clubname,
su.rylx
club.name clubname
FROM
sys_club_user scu
LEFT JOIN sys_club club ON scu.clubid = club.id
@@ -207,12 +253,13 @@ public class SysClubUserShCon {
""");
Cnd cnd = Cnd.NEW();
cnd.and("u.username", "is not", null);
cnd.and("sf", "=", 2);
if ("notAudit".equals(auditType)) {
cnd.and("scu.status", "=", 1);
}
if ("hasAudit".equals(auditType)) {
cnd.and(new Static("JSON_CONTAINS(auditList, JSON_OBJECT('auditUser', '" + ShiroUtil.getPrincipalProperty("id") + "'))"));
cnd.and(applyType == 1 ? "scu.status" : "scu.exitStatus", "in", str);
}
if ("hasAudit".equals(auditType)) {
cnd.and(new Static(has_str));
}
cnd.andEX("scu.clubid", "=", id);
if (!ShiroUtil.hasAnyRoles(new String[]{"sysadmin", "A06"})) {
@@ -226,15 +273,18 @@ public class SysClubUserShCon {
List<Record> list = sysClubService.list(sql);
if ("hasAudit".equals(auditType)) {
list.forEach(item -> {
List<NutMap> listMap = Json.fromJsonAsList(NutMap.class, item.getString("auditList"));
Boolean auditState = false;
for (NutMap map : listMap) {
if (map.getString("auditUser").equals(ShiroUtil.getPrincipalProperty("id"))) {
auditState = map.get("auditState") == null ? null : map.getBoolean("auditState");
break;
}
}
item.put("auditState", auditState);
String s = applyType == 1 ? "auditList" : "exitAuditList";
if (item.getString(s) != null) {
List<NutMap> listMap = Json.fromJsonAsList(NutMap.class, item.getString(s));
Boolean auditState = false;
for (NutMap map : listMap) {
if (ShiroUtil.hasAnyRoles(new String[]{"sysadmin"}) || map.getString("auditUser").equals(ShiroUtil.getPrincipalProperty("id"))) {
auditState = map.get("auditState") == null ? null : map.getBoolean("auditState");
break;
}
}
item.put("auditState", auditState);
}
});
}
return list;
src/main/java/io/v/nutz/web/controllers/platform/sys/club/SysClubUserSqCon.java
+40 -9
View File
@@ -1,15 +1,19 @@
package io.v.nutz.web.controllers.platform.sys.club;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import io.v.nutz.annontation.ViReturn;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.PageUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_club_user;
import io.v.nutz.sys.services.SysClubService;
import io.v.nutz.sys.services.SysClubUserService;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
@@ -21,6 +25,7 @@ import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import java.util.List;
import java.util.Objects;
/**
@@ -62,11 +67,12 @@ public class SysClubUserSqCon {
" club.*," +
" fzr.username fzrname," +
" unit.`name` fzr_unit_name," +
" (SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.`status` = 5) cynum," +
" (SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.`status` in (1, 3)) approvalnum," +
" (SELECT status FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.userid = @userid) status," +
" (select count(*) from sys_user where userState='在职' and id in (select userid from sys_club_user where clubid = club.id and `status` = 5)) as worknum," +
" (select count(*) from sys_user where userState='退休' and id in (select userid from sys_club_user where clubid = club.id and `status` = 5)) as outnum" +
" (SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.`status` = 5 and isNormal = true) cynum," +
" (SELECT count( 1 ) FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.`status` in (1, 3) and isNormal = true) approvalnum," +
" (SELECT status FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.userid = @userid and isNormal = true) status," +
" (SELECT exitStatus FROM sys_club_user scu WHERE scu.clubid = club.id AND scu.userid = @userid and isNormal = true) exitStatus," +
" (select count(*) from sys_user where userState='在职' and id in (select userid from sys_club_user where clubid = club.id and `status` = 5 and isNormal = true)) as worknum," +
" (select count(*) from sys_user where userState='退休' and id in (select userid from sys_club_user where clubid = club.id and `status` = 5 and isNormal = true)) as outnum" +
" FROM" +
" `sys_club` club" +
" LEFT JOIN sys_user fzr ON club.fzr = fzr.id" +
@@ -79,9 +85,9 @@ public class SysClubUserSqCon {
}
if (isjr) {
cnd.and("club.id in (SELECT clubid from sys_club_user WHERE userid = '" + ShiroUtil.getPrincipalProperty("id") + "') and 1", "=", 1);
cnd.and("club.id in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "') and 1", "=", 1);
} else {
cnd.and("club.id not in (SELECT clubid from sys_club_user WHERE userid = '" + ShiroUtil.getPrincipalProperty("id") + "' and status not in (2, 4) ) and 1", "=", 1);
cnd.and("club.id not in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "' and status not in (2, 4) ) and 1", "=", 1);
}
if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) {
@@ -110,6 +116,7 @@ public class SysClubUserSqCon {
sys_club_user.setSf(2);
sys_club_user.setStatus(1);
sys_club_user.setIsjf(false);
sys_club_user.setIsNormal(true);
sysClubUserService.insert(sys_club_user);
return null;
}
@@ -117,8 +124,8 @@ public class SysClubUserSqCon {
@At
@ViReturn
public Object getCount() {
int hasJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false).and("id in (SELECT clubid from sys_club_user WHERE userid = '" + ShiroUtil.getPrincipalProperty("id") + "') and 1", "=", 1));
int noJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false).and("id not in (SELECT clubid from sys_club_user WHERE userid = '" + ShiroUtil.getPrincipalProperty("id") + "' and status not in (2, 4) ) and 1", "=", 1));
int hasJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false).and("id in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "') and 1", "=", 1));
int noJoinCount = dao.count("sys_club", Cnd.NEW().and("isjs", "=", false).and("id not in (SELECT clubid from sys_club_user WHERE isNormal = true and userid = '" + ShiroUtil.getPrincipalProperty("id") + "' and status not in (2, 4) ) and 1", "=", 1));
return new NutMap().setv("hasJoinCount", hasJoinCount).setv("noJoinCount", noJoinCount);
}
@@ -151,4 +158,28 @@ public class SysClubUserSqCon {
""").setParam("userid", id);
return sysClubUserService.list(sql);
}
@At
@ViReturn
@SLog(type = "club", tag = "申请退会", msg = "申请退会")
public Object exitClub(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数为空");
}
dao.update(Sys_club_user.class, Chain.make("exitStatus", 1)
, Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid()));
return null;
}
@At
@ViReturn
@SLog(type = "club", tag = "撤销申请退会", msg = "撤销申请退会")
public Object cancelExitClub(String id) {
if (StrUtil.isBlank(id)) {
return Result.error("参数为空");
}
dao.update(Sys_club_user.class, Chain.make("exitStatus", null)
, Cnd.where("clubid", "=", id).and("userid", "=", ShiroUtil.getPlatformUid()));
return null;
}
}
src/main/resources/static/assets/mobile/icon/activity/bm.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 50 KiB

src/main/resources/static/assets/mobile/icon/activity/school.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 KiB

src/main/resources/static/assets/mobile/icon/activity/sport.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 KiB

src/main/resources/static/assets/mobile/icon/club/apply.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 88 KiB

src/main/resources/static/assets/mobile/icon/club/club.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 97 KiB

src/main/resources/static/assets/mobile/icon/club/school.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 78 KiB

src/main/resources/static/assets/mobile/icon/jjpy/建家评议 (1).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 75 KiB

src/main/resources/static/assets/mobile/icon/jjpy/建家评议 (我的).png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

src/main/resources/static/assets/mobile/icon/member/apply.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 45 KiB

src/main/resources/static/assets/mobile/icon/member/audit.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 49 KiB

src/main/resources/static/assets/mobile/icon/member/da.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 38 KiB

src/main/resources/static/assets/mobile/icon/member/dashboard.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 40 KiB

src/main/resources/static/assets/mobile/icon/proposal/cx.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 34 KiB

src/main/resources/static/assets/mobile/icon/proposal/fy.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 32 KiB

src/main/resources/static/assets/mobile/icon/proposal/myProposal.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 28 KiB

src/main/resources/static/assets/mobile/icon/proposal/search.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 23 KiB

src/main/resources/static/assets/mobile/icon/proposal/tz.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 27 KiB

src/main/resources/static/assets/mobile/icon/site/apply.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 117 KiB

src/main/resources/static/assets/mobile/icon/site/audit.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 101 KiB

src/main/resources/static/assets/mobile/icon/site/my.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 107 KiB

src/main/resources/static/assets/mobile/icon/train/my.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 106 KiB

src/main/resources/static/assets/mobile/icon/train/scan.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 KiB

src/main/resources/static/assets/mobile/icon/train/train.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 205 KiB

src/main/resources/static/assets/mobile/icon/wmhd/apply.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 110 KiB

src/main/resources/static/assets/platform/img/quickentry/education.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

src/main/resources/views/mobile/club/clubAudit.html
+24 -13
View File
@@ -25,8 +25,6 @@ layout("/mobile/platform.html"){
}
.van-doc-card .van-button--small {
border-top-right-radius: 16px;
border-bottom-left-radius: 16px;
height: 26px;
}
@@ -112,6 +110,8 @@ layout("/mobile/platform.html"){
</van-search>
<van-dropdown-menu>
<van-dropdown-item v-model="pageForm.applyType" :options="applyTypeOptions"
@change="doSearch"></van-dropdown-item>
<van-dropdown-item v-model="pageForm.clubType" :options="typeOptions"
@change="doSearch"></van-dropdown-item>
</van-dropdown-menu>
@@ -154,13 +154,6 @@ layout("/mobile/platform.html"){
<van-col span="12"><span style="color: grey">会费标准：</span>{{o.dues_standard}}</van-col>
<van-col span="12"><span style="color: grey">限定人数：</span>{{o.number}}人</van-col>
</van-row>
<van-row>
<van-col span="24" class="cus_overflow">
<span style="color: grey">介绍链接：</span>
<span style="color: #236eb4"
@click.stop="window.open(o.introduce_href.indexOf('http') !== -1 ? o.introduce_href : 'https://' + o.introduce_href)">{{o.introduce_href}}</span>
</van-col>
</van-row>
</div>
<van-divider></van-divider>
@@ -208,7 +201,6 @@ layout("/mobile/platform.html"){
<span class="unit">{{obj.unitname}}</span>
<br/>
<span style="display: inline-block; width: 85px">{{obj.sex}}</span>
<span style="display: inline-block; width: 106px">13296575967</span>
<span style="display: inline-block;">{{obj.loginname}}</span>
<van-icon class="audit_icon" color="green" v-if="queryType === 'hasAudit' && obj.auditstate === true" name="passed"></van-icon>
<van-icon class="audit_icon" color="grey" v-if="queryType === 'hasAudit' && obj.auditstate === false" name="close"></van-icon>
@@ -248,6 +240,12 @@ layout("/mobile/platform.html"){
userShow: false,
clickRow: {},
typeOptions: [],
type: '',
auditType: '',
applyTypeOptions: [
{text: '申请加入', value: '1'},
{text: '申请退会', value: '2'},
],
}
},
methods: {
@@ -266,6 +264,7 @@ layout("/mobile/platform.html"){
ids: JSON.stringify(idList),
flag: auditType === 'pass',
type: 1,
applyType: this.pageForm.applyType,
})
if (resp.code === 0) {
this.doSearch()
@@ -295,11 +294,19 @@ layout("/mobile/platform.html"){
const resp = await $.post('/platform/sys/club/sh/getClubUser', {
id: o.id,
auditType: 'hasAudit',
type: 1,
applyType: this.pageForm.applyType,
})
if (resp.code === 0) {
this.userList = resp.data
this.userList.sort((a, b) => { return b.auditstate - a.auditstate })
this.userShow = true
if (this.userList.length === 0) {
vant.Toast('暂无已审人员')
} else {
this.userList.sort((a, b) => {
return b.auditstate - a.auditstate
})
this.userShow = true
}
}
},
async openView(o) {
@@ -308,6 +315,8 @@ layout("/mobile/platform.html"){
const resp = await $.post('/platform/sys/club/sh/getClubUser', {
id: o.id,
auditType: 'notAudit',
type: 1,
applyType: this.pageForm.applyType,
})
if (resp.code === 0) {
this.userList = resp.data
@@ -329,6 +338,7 @@ layout("/mobile/platform.html"){
},
async onLoad() {
this.loading = true
this.pageForm.type = 1
$.post('/platform/sys/club/sh/getMyClub', this.pageForm).then(res => {
if (res.code === 0) {
this.tableData = this.tableData.concat(res.data.list)
@@ -349,6 +359,7 @@ layout("/mobile/platform.html"){
})
this.typeOptions.unshift({text: '全部类型'})
this.$set(this.pageForm, "clubType", this.typeOptions[0].value)
this.$set(this.pageForm, "applyType", '1')
this.onLoad()
}
})
@@ -356,4 +367,4 @@ layout("/mobile/platform.html"){
<!--#
}
#-->
#-->
src/main/resources/views/mobile/club/inClub.html
+73 -25
View File
@@ -25,8 +25,6 @@ layout("/mobile/platform.html"){
}
.van-button--small {
border-top-right-radius: 16px;
border-bottom-left-radius: 16px;
height: 26px;
}
@@ -115,29 +113,47 @@ layout("/mobile/platform.html"){
</div>
<div style="color: grey">{{o.location}}</div>
</div>
<div style="color: #1867b0; white-space: nowrap;">
<span v-if="o.status==1">待协会审核</span>
<span v-if="o.status==2" style="color: red">协会拒绝</span>
<span v-if="o.status==3">待校工会审核</span>
<span v-if="o.status==4" style="color: red">校工会拒绝</span>
<span v-if="o.status==5" style="color: green">审核通过</span>
</div>
</div>
<div style="margin-top: 4px">
<van-row>
<van-col span="12"><span style="color: grey">联&ensp;系&ensp;人：</span>{{o.fzrname}}</van-col>
<van-col span="12"><span style="color: grey">电&emsp;&emsp;话：</span>{{o.fzr_mobile}}</van-col>
<van-col span="12">
<span style="color: grey">联&ensp;系&ensp;人：</span>
<span>{{o.fzrname}}</span>
</van-col>
<van-col span="12">
<span style="color: grey">电&emsp;&emsp;话：</span>
<span>{{o.fzr_mobile}}</span>
</van-col>
</van-row>
<van-row>
<van-col span="12"><span style="color: grey">会费标准：</span>{{o.dues_standard}}</van-col>
<van-col span="12"><span style="color: grey">限定人数：</span>{{o.number}}人</van-col>
<van-col span="12">
<span style="color: grey">会费标准：</span>
<span>{{o.dues_standard}}</span>
</van-col>
<van-col span="12">
<span style="color: grey">限定人数：</span>
<span>{{o.number}}人</span>
</van-col>
</van-row>
<van-row>
<van-col span="24" class="cus_overflow">
<span style="color: grey">介绍链接：</span>
<span style="color: #236eb4"
@click="window.open(o.introduce_href.indexOf('http') !== -1 ? o.introduce_href : 'https://' + o.introduce_href)">{{o.introduce_href}}</span>
<van-col span="12" class="cus_overflow">
<span style="color: grey">入会状态：</span>
<span v-if="o.status==1">待协会审核</span>
<span v-if="o.status==2" style="color: red">协会拒绝</span>
<span v-if="o.status==3">待校工会审核</span>
<span v-if="o.status==4" style="color: red">校工会拒绝</span>
<span v-if="o.status==5" style="color: green">审核通过</span>
<span v-if="!o.status">暂未申请</span>
</van-col>
<van-col span="12" class="cus_overflow">
<span style="color: grey">退会状态：</span>
<span v-if="o.exitstatus==1">待协会审核</span>
<span v-if="o.exitstatus==2" style="color: red">协会拒绝</span>
<span v-if="o.exitstatus==3">待校工会审核</span>
<span v-if="o.exitstatus==4" style="color: red">校工会拒绝</span>
<span v-if="o.exitstatus==5" style="color: green">审核通过</span>
<span v-if="!o.exitstatus">暂未申请</span>
</van-col>
</van-row>
</div>
@@ -146,13 +162,27 @@ layout("/mobile/platform.html"){
<div style="display: flex; justify-content: flex-end">
<div>
<van-button @click="rollback(o)" v-if="pageForm.isjr === true"
type="primary" size="small" color="#1867b0" style="margin-right: 8px">撤销申请</van-button>
<van-button @click="needJoin(o)" v-if="(o.cynum + o.approvalnum) < o.number && pageForm.isjr === false"
type="primary" size="small" color="#1867b0" style="margin-right: 8px">我要加入</van-button>
<van-button @click="needJoin(o)" v-if="(o.cynum + o.approvalnum) >= o.number && pageForm.isjr === false"
:disabled="(o.cynum + o.approvalnum) >= o.number"
type="primary" size="small" color="#1867b0" style="margin-right: 8px">人数已满</van-button>
<van-button @click="rollback(o)" color="#1867b0"
size="small" style="margin-right: 8px" type="primary"
v-if="pageForm.isjr === true && o.status==1">
撤销加入申请
</van-button>
<van-button @click="needJoin(o)"
color="#1867b0" v-if="pageForm.isjr === false"
size="small" style="margin-right: 8px" type="primary">
我要加入
</van-button>
<van-button @click="cancelExitClub(o)" color="#1867b0"
size="small" style="margin-right: 8px" type="primary"
v-if="pageForm.isjr === true && o.status!=1 && o.exitstatus==1">
撤销退会申请
</van-button>
<van-button @click="exitClub(o)"
color="#1867b0" v-if="pageForm.isjr === true && o.exitstatus!=1"
size="small" style="margin-right: 8px" type="primary">
我要退会
</van-button>
</div>
</div>
</div>
@@ -181,6 +211,24 @@ layout("/mobile/platform.html"){
}
},
methods: {
exitClub(row) {
vant.Dialog.confirm({title: '提示', message: '您确定要申请退会吗？',}).then(async () => {
const resp = await $.post('/platform/sys/club/sq/exitClub', {id: row.id})
if (resp.code === 0) {
this.doSearch()
}
vant.Toast(resp.msg)
}).catch(() => {})
},
cancelExitClub(id) {
vant.Dialog.confirm({title: '提示', message: '您确定要撤销退会申请吗？',}).then(async () => {
const resp = await $.post('/platform/sys/club/sq/cancelExitClub', {id: id})
if (resp.code === 0) {
this.doSearch()
}
vant.Toast(resp.msg)
}).catch(() => {})
},
openView(id) {
},
@@ -257,4 +305,4 @@ layout("/mobile/platform.html"){
<!--#
}
#-->
#-->
src/main/resources/views/mobile/club/schoolAudit.html
+385
View File
@@ -0,0 +1,385 @@
<!--#
layout("/mobile/platform.html"){
#-->
<style>
.van-index-bar__sidebar {
display: none;
}
.van-doc-card {
margin: 14px;
padding: 12px 12px 12px 12px;
background-color: #fff;
border-radius: 10px;
box-shadow: 0 8px 12px #ebedf0;
line-height: 20px;
font-size: 13px;
position: relative;
}
.van-divider {
margin: 6px 0 6px 0px;
border-color: lightgray;
}
.van-doc-card .van-button--small {
border-radius: 8px;
width: 60px !important;
height: 28px;
}
.van-col {
line-height: 24px;
}
.title_span {
font-size: 16px;
font-weight: bold;
position: absolute;
left: -1px;
top: 11px;
color: #1867b0;
}
.title {
font-size: 13px;
font-weight: bold;
flex: 1;
overflow: hidden;
white-space: nowrap;
}
.cus_overflow {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.van-dropdown-menu__item {
flex: auto;
}
.userPopup {
height: 90%;
background-color: #f6f7f9;
font-size: 14px;
}
.audit_icon {
font-size: 24px;
position: absolute;
font-weight: bolder;
right: 0;
top: 60px;
}
.userPopup .van-cell {
padding: 10px 0;
}
.van-radio-group {
width: 100%;
justify-content: center;
margin: 10px;
}
.van-cell-group__title {
padding: 5px 0 5px 0;
}
.van-form .van-field__control {
text-align: right;
}
</style>
<div id="app" v-cloak>
<m-page-loading v-if="mLoading"></m-page-loading>
<!--top栏-->
<van-nav-bar
title="会长审核"
left-arrow
placeholder
fixed
@click-left="history.go(-1)"
safe-area-inset-top
></van-nav-bar>
<!--筛选框-->
<div class="search-fixed">
<van-search
v-model="pageForm.searchKeyword"
shape="round"
maxlength="10"
@search="doSearch"
placeholder="请输入协会名称进行查询"
>
</van-search>
<van-dropdown-menu>
<van-dropdown-item v-model="pageForm.applyType" :options="applyTypeOptions"
@change="doSearch"></van-dropdown-item>
<van-dropdown-item v-model="pageForm.radioType" :options="auditOptions"
@change="doSearch"></van-dropdown-item>
<van-dropdown-item v-model="pageForm.clubId" :options="clubOptions"
@change="doSearch"></van-dropdown-item>
</van-dropdown-menu>
</div>
<!--列表-->
<div style="margin-top: 116px">
<van-list
v-model="loading"
:finished="finished" :immediate-check="false" @load="onLoad"
:finished-text="tableData.length>0?'没有更多了':''"
>
<div class="van-doc-card" v-for="o in tableData">
<div>
<div style="display: flex; justify-content: space-between">
<div style="width: 74%">
<div class="van-ellipsis title">
<span class="title_span">|</span>
<span>{{o.username}}</span>
</div>
<div style="color: #1867b0;"></div>
</div>
</div>
<van-divider></van-divider>
<div style="margin-top: 10px">
<van-row>
<van-col span="24">
<span style="color: grey">协会名称：</span>
<span>{{o.clubname}}</span>
</van-col>
</van-row>
<van-row>
<van-col span="24">
<span style="color: grey">工&emsp;&emsp;号：</span>
<span>{{o.loginname}}</span>
</van-col>
</van-row>
<van-row>
<van-col span="24">
<span style="color: grey">所属单位：</span>
<span>{{o.unitname}}</span>
</van-col>
</van-row>
<van-row>
<van-col span="24">
<span style="color: grey">申请时间：</span>
<span>{{o.applytime}}</span>
</van-col>
</van-row>
</div>
<div style="display: flex; justify-content: flex-end; margin-top: 4px">
<div>
<van-button @click.stop="openView(o)"
type="primary" size="small" color="#1867b0"
style="margin-right: 8px; width: auto;">
查看
</van-button>
<van-button @click.stop="openAudit(o)" v-if="o.status == 3"
type="primary" size="small" color="#1867b0"
style="margin-right: 8px; width: auto;">
审核
</van-button>
</div>
</div>
</div>
</div>
</van-list>
<van-empty
v-if="mLoading==false&&tableData.length==0"
class="custom-image"
image="/none.svg"
description="暂无数据"
></van-empty>
</div>
<van-popup class="info-show" v-model="infoShow" get-container="#app" position="right" :style="{ height: '100%', width: '100%' }">
<van-nav-bar
title="详细信息"
left-arrow
placeholder
fixed
@click-left="infoShow = false"
safe-area-inset-top
></van-nav-bar>
<club-user-apply-info ref="applyInfo" :handle="handle">
<template #handle>
<div class="van-cell-group__title">
<div class="van-sidebar-item van-sidebar-item--select">
会长审核
</div>
</div>
<van-form class="van-form">
<van-field
readonly
value="${@shiro.getPrincipalProperty('username')}"
name="username"
label="审核人员"
></van-field>
<van-field v-model="formData.auditTime" label="审核时间" readonly></van-field>
<van-field v-model="formData.auditOpinion"
required
rows="1"
autosize
label="审核意见"
type="textarea"
placeholder="请输入审核意见"
></van-field>
<!--<van-field label="审核签字" required style="flex-flow: column">
<template #label>
<div class="mb10">审核签字</div>
</template>
<template #input>
<mobile-sign ref="signature" v-model="formData.auditSign"></mobile-sign>
</template>
</van-field>-->
<van-row gutter="20" style="margin-top: 30px;padding: 0 25px">
<van-col span="12">
<van-button :color="themeColor" plain block @click="doReview(false)">拒 绝
</van-button>
</van-col>
<van-col span="12">
<van-button :color="themeColor" block @click="doReview(true)">通 过
</van-button>
</van-col>
</van-row>
</van-form>
</template>
</club-user-apply-info>
</van-popup>
</div>
<script>
const vue = new Vue({
el: '#app',
mixins: [mobileMixins],
data() {
return {
handle: false,
clubOptions: [],
auditOptions: [
{text: '全部', value: 1},
{text: '已审核', value: 2},
{text: '未审核', value: 3},
],
pageForm: {
radioType: 3
},
infoShow: false,
formData: {},
applyTypeOptions: [
{text: '申请加入', value: '1'},
{text: '申请退会', value: '2'},
],
}
},
components: {
'club-user-apply-info': httpVueLoader('/components/mobile/club/mobileClubUserApplyInfo.vue?v=1.0.1'),
'mobile-sign': httpVueLoader('/components/sign/mobileSign.vue'),
},
methods: {
openAudit(row) {
this.formData = {
id: row.id,
auditTime: moment().format('YYYY-MM-DD'),
username: "${@shiro.getPrincipalProperty('username')}",
auditOpinion: null,
auditSign: ""
}
this.infoShow = true
this.handle = true
this.$nextTick(() => {
this.$refs.applyInfo.getInfo(row.id)
})
},
openView(row) {
this.infoShow = true
this.handle = false
this.$nextTick(() => {
this.$refs.applyInfo.getInfo(row.id)
})
},
async doReview(flag) {
if (!this.formData.auditOpinion) {
vant.Toast('请填写审核意见');
return
}
/*if (this.$refs.signature.checkNull()) {
vant.Toast('请签字')
return
}*/
const confirm = await vant.Dialog.confirm({
title: '提示',
message: '您确定要审核吗？',
})
if (confirm === 'confirm') {
//this.$refs.signature.submitSign()
this.formData.flag = flag
this.formData.type = 2
this.formData.applyType = this.pageForm.applyType
const resp = await $.post('/platform/sys/club/sh/check', this.formData)
if (resp.code === 0) {
this.doSearch()
this.infoShow = false
}
vant.Toast(resp.msg)
}
},
doSearch() {
this.pageForm.pageNumber = 1
this.tableData = []
this.finished = false
this.onLoad()
},
async onLoad() {
this.loading = true
this.pageForm.type = 2
$.post('/platform/sys/club/sh/pageData', this.pageForm).then(res => {
if (res.code === 0) {
this.tableData = this.tableData.concat(res.data.list)
if (this.tableData.length === res.data.totalCount) {
this.finished = true
} else {
this.pageForm.pageNumber++
}
}
this.loading = false
})
},
async getMyMangeClub() {
const {data} = await $.get("/platform/sys/club/users/getMyMangeClub")
return data
},
},
async created() {
const data = await this.getMyMangeClub()
data.forEach(item => {
this.clubOptions.push({text: item.name, value: item.id})
})
this.clubOptions.unshift({text: '全部协会'})
this.$set(this.pageForm, "applyType", '1')
this.onLoad()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/mobile/home.html
+28 -31
View File
@@ -117,24 +117,24 @@ layout("/mobile/platform.html"){
<van-grid :border="false" :column-num="3">
<van-grid-item url="/mobile/member/detail" v-if="${@shiro.hasRole('H01')}">
<image src="/assets/mobile/icon/member/da.png"></image>
<span class="icon_text"> 会员档案</span>
<span class="icon_text">会员档案</span>
</van-grid-item>
<van-grid-item url="/mobile/member/apply" v-if="${@shiro.lacksRole('H01')}">
<image src="/assets/mobile/icon/member/apply.png"></image>
<span class="icon_text"> 申请入会</span>
<span class="icon_text">申请入会</span>
</van-grid-item>
<van-grid-item
url="/mobile/member/audit"
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('H04')||@shiro.hasRole('A06')}">
<image src="/assets/mobile/icon/member/audit.png"></image>
<span class="icon_text"> 会员审核</span>
<span class="icon_text">会员审核</span>
</van-grid-item>
<van-grid-item url="/mobile/member/dashBoard/index">
<image src="/assets/mobile/icon/member/dashboard.png"></image>
<span class="icon_text"> 会员看板</span>
<span class="icon_text">会员看板</span>
</van-grid-item>
</van-grid>
@@ -177,25 +177,6 @@ layout("/mobile/platform.html"){
<image src="/assets/mobile/icon/proposal/cx.png"></image>
<span class="icon_text">代表查询</span>
</van-grid-item>
<!-- <van-grid-item url="/mobile/proposal/analysis/index">-->
<!-- <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"-->
<!-- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">-->
<!-- <svg t="1598769687916" class="icon" viewBox="0 0 1024 1024" version="1.1"-->
<!-- xmlns="http://www.w3.org/2000/svg" p-id="1332" width="32" height="32"-->
<!-- xmlns:xlink="http://www.w3.org/1999/xlink">-->
<!-- <defs>-->
<!-- <style type="text/css"></style>-->
<!-- </defs>-->
<!-- <path d="M283.84768 275.52256h473.088c37.376 0 67.584 30.208 67.584 67.584v439.296c0 37.376-30.208 67.584-67.584 67.584h-473.088c-37.376 0-67.584-30.208-67.584-67.584v-439.296c0-37.376 30.208-67.584 67.584-67.584z"-->
<!-- fill="#CAE4FF" p-id="1333"></path>-->
<!-- <path d="M253.9008 716.1856c-15.872 0-28.672-12.8-28.672-28.16 0-7.68 3.072-14.848 8.192-20.48l175.616-175.616c11.264-11.264 29.184-11.264 40.448 0l103.424 103.424 125.44-125.44-49.664-49.664 152.064-25.088-10.752 166.912-51.2-51.2-143.36 142.848c-0.512 1.024-1.536 2.048-2.56 2.56-11.264 11.264-29.184 11.264-40.448 0l-103.424-103.424-155.648 155.648c-4.608 4.608-12.288 7.68-19.456 7.68z"-->
<!-- fill="#0972E7" p-id="1334"></path>-->
<!-- <path d="M163.7888 983.4496c-37.376 0-67.072-30.208-67.584-67.584V208.2816c0-37.376 30.208-67.072 67.584-67.584h95.744v-81.92c0-15.872 12.8-28.672 28.672-28.16 15.872 0 28.16 12.8 28.16 28.16v81.92h172.544v-81.92c0-15.872 12.8-28.672 28.16-28.672 15.872 0 28.672 12.8 28.672 28.16v81.92h173.056v-81.92c0-15.872 12.8-28.672 28.16-28.672 15.872 0 28.672 12.8 28.672 28.16v81.92h95.744c37.376 0 67.072 30.208 67.584 67.584v708.096c0 37.376-30.208 67.072-67.584 67.584l-707.584 0.512z m704-71.168V212.3776H167.8848v699.904h699.904z"-->
<!-- fill="#0972E7" p-id="1335"></path>-->
<!-- </svg>-->
<!-- <span class="icon_text"> 提案分析</span>-->
<!-- </van-grid-item>-->
</van-grid>
</van-row>
</div>
@@ -216,7 +197,7 @@ layout("/mobile/platform.html"){
</van-grid-item>
<van-grid-item url="/platform/mobile/trainSignUpActivityScannerQrCode"
v-if="${@shiro.hasRole('codeScanner')}">
<image src="/assets/mobile/icon/train/my.png"></image>
<image src="/assets/mobile/icon/train/scan.png"></image>
<span class="icon_text">扫一扫</span>
</van-grid-item>
@@ -228,15 +209,15 @@ layout("/mobile/platform.html"){
</div>
<van-grid :border="false" :column-num="3">
<van-grid-item url="/mobile/activity/Sports/list/activityList">
<image src="/assets/mobile/svg/activity/bm.svg"></image>
<image src="/assets/mobile/icon/activity/sport.png"></image>
<span style="font-size: 12px;margin-top: 10px">体育活动报名</span>
</van-grid-item>
<van-grid-item url="/mobile/activity/unionActivity">
<image src="/assets/mobile/icon/activity/bm.png"></image>
<image src="/assets/mobile/icon/activity/school.png"></image>
<span class="icon_text">校活动报名</span>
</van-grid-item>
<van-grid-item url="/mobile/wmhd/apply">
<image src="/assets/mobile/svg/wmhd/apply.svg"></image>
<image src="/assets/mobile/icon/wmhd/apply.png"></image>
<span class="icon_text">教工作品征集</span>
</van-grid-item>
<!--<van-grid-item @click="toWxJsz">
@@ -368,13 +349,13 @@ layout("/mobile/platform.html"){
</div>
<van-grid :border="false" :column-num="3">
<van-grid-item url="/mobile/wakeshome/review/appraisal/index">
<image src="/assets/mobile/svg/psychology/zgpy.svg"></image>
<span class="icon_text"> 职工评议</span>
<image src="/assets/mobile/icon/jjpy/建家评议 (1).png"></image>
<span class="icon_text">职工评议</span>
</van-grid-item>
<van-grid-item url="/mobile/wakeshome/review/appraisal/mine">
<image src="/assets/mobile/svg/psychology/wdpy.svg"></image>
<span class="icon_text"> 我的评议</span>
<image src="/assets/mobile/icon/jjpy/建家评议 (我的).png"></image>
<span class="icon_text">我的评议</span>
</van-grid-item>
</van-grid>
</div>
@@ -396,6 +377,22 @@ layout("/mobile/platform.html"){
</van-grid>
</div>
<div v-if="paramType === '协会组织'">
<div class="van-sidebar-item van-sidebar-item&#45;&#45;select">
协会组织
</div>
<van-grid :border="false" :column-num="3">
<van-grid-item url="/platform/sys/club/sq/mobile">
<image src="/assets/mobile/icon/club/apply.png"></image>
<span class="icon_text">协会入会</span>
</van-grid-item>
<van-grid-item url="/platform/sys/club/sh/mobile">
<image src="/assets/mobile/icon/club/club.png"></image>
<span class="icon_text">入会审核</span>
</van-grid-item>
</van-grid>
</div>
</div>
<script src="https://res.wx.qq.com/open/js/cloudbase/1.1.0/cloud.js"></script>
src/main/resources/views/mobile/newHome.html
+8 -2
View File
@@ -55,7 +55,7 @@ layout("/mobile/platform.html"){
<van-grid-item>
<div class="item_div" style="background-color: rgb(155,130,239)">
<div>
<van-image height="32" width="40" src="/assets/platform/img/quickentry/jy.png"
<van-image height="32" width="40" src="/assets/platform/img/quickentry/education.png"
@click="location.href='/mobile/trainEducation/index'"></van-image>
</div>
<span class="icon_text">培训教育</span>
@@ -63,7 +63,7 @@ layout("/mobile/platform.html"){
</van-grid-item>
<van-grid-item>
<div class="item_div" style="background-color: rgb(155,130,239)">
<div class="item_div" style="background-color: #FE8DB8">
<div>
<van-image height="32" width="40" src="/assets/platform/img/quickentry/jcbd.png" @click="loginOut"></van-image>
</div>
@@ -123,6 +123,12 @@ layout("/mobile/platform.html"){
text: '建言献策',
isOpen: false,
backGroundColor: '#2fbabf'
},
{
src: '/assets/platform/img/quickentry/proposal.png',
text: '协会组织',
isOpen: true,
backGroundColor: '#EEC04D'
}
]
}
src/main/resources/views/platform/sys/club/shrt.html
+48 -25
View File
@@ -29,30 +29,37 @@ layout("/layouts/platform.html"){
<div class="btn-group tool-button mt5">
<el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
</div>
<div class="pull-right offscreen-right mt5">
<el-button :disabled="subDis" @click="check(true)" icon="el-icon-check" plain type="success">同意
</el-button>
<el-button :disabled="subDis" @click="check(false)" icon="el-icon-close" plain type="danger">拒绝
</el-button>
</div>
<div class="pull-right offscreen-right mt5" style="margin-right: 40px">
<el-radio-group v-model="pageForm.radioType" @change="(val) => doSearch()">
<el-radio-button label="1">全部</el-radio-button>
<el-radio-button label="2">已审核</el-radio-button>
<el-radio-button label="3">未审核</el-radio-button>
</el-radio-group>
</div>
</el-card>
<el-card class="mt10" shadow="never">
<vi-title2 title="温馨提醒：如下方没有数据，可能是其他理事成员已审核，审核信息请切换已审核查看">
<template #func>
<el-radio-group @change="(val) => doSearch()" style="margin-right: 6px"
v-model="pageForm.applyType">
<el-radio-button :label="1">申请加入</el-radio-button>
<el-radio-button :label="2">申请退会</el-radio-button>
</el-radio-group>
<el-radio-group @change="(val) => doSearch()" style="margin-right: 6px"
v-model="pageForm.radioType">
<el-radio-button label="1">全部</el-radio-button>
<el-radio-button label="2">已审核</el-radio-button>
<el-radio-button label="3">未审核</el-radio-button>
</el-radio-group>
<el-button :disabled="subDis" @click="check(true)" icon="el-icon-check" plain
type="success">通过
</el-button>
<el-button :disabled="subDis" @click="check(false)" icon="el-icon-close"
plain type="danger">不通过
</el-button>
</template>
</vi-title2>
<el-table :data="tableData" :key="tabKey" @selection-change="handleSelectionChange" @sort-change="pageOrder"
ref="multipleTable"
row-key="id"
style="width: 100%" v-loading="tabloading">
<el-table-column :reserve-selection="true" v-if="pageForm.radioType !== '2'" :selectable="(row, index) => {return row.status === 1}"
<el-table-column :reserve-selection="true" :selectable="(row, index) => {return row.status === 1 || row.exitStatus === 1}"
type="selection"
v-if="pageForm.radioType !== '2'"
width="55">
</el-table-column>
<el-table-column align="center" header-align="center" label="序号" type="index">
@@ -89,14 +96,24 @@ layout("/layouts/platform.html"){
prop="userState"></el-table-column>
<el-table-column align="center" header-align="center" label="所属单位" prop="unitname" show-overflow-tooltip
sortable></el-table-column>
<el-table-column align="center" header-align="center" label="审核状态"
<el-table-column v-if="pageForm.applyType === 1" align="center" header-align="center" label="入会状态"
prop="status">
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="primary">待协会审核</el-tag>
<el-tag v-if="scope.row.status==2" type="danger">协会拒绝</el-tag>
<el-tag v-if="scope.row.status==3" type="primary">待校工会审核</el-tag>
<el-tag v-if="scope.row.status==4" type="danger">校工会拒绝</el-tag>
<el-tag v-if="scope.row.status==5" type="success">审核通过</el-tag>
<el-tag type="primary" v-if="scope.row.status==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.status==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.status==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.status==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.status==5">审核通过</el-tag>
</template>
</el-table-column>
<el-table-column v-if="pageForm.applyType === 2" align="center" header-align="center" label="退会状态"
prop="exitStatus">
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.exitStatus==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitStatus==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.exitStatus==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitStatus==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.exitStatus==5">审核通过</el-tag>
</template>
</el-table-column>
</el-table>
@@ -134,7 +151,8 @@ layout("/layouts/platform.html"){
totalCount: 0,
pageOrderName: "",
pageOrderBy: "",
radioType: 3
radioType: 3,
applyType: 1,
},
formRules: {
code: [{required: true, message: '必填', trigger: ['blur', 'change']}],
@@ -165,7 +183,12 @@ layout("/layouts/platform.html"){
return v.id
})
this.subDis = true
$.post(base + "/platform/sys/club/sh/check", {ids: JSON.stringify(ids), flag: flag, type: 1}, (data) => {
$.post(base + "/platform/sys/club/sh/check", {
ids: JSON.stringify(ids),
flag: flag,
type: 1,
applyType: this.pageForm.applyType,
}, (data) => {
this.subDis = false
if (data.code === 0) {
this.$message({
@@ -239,4 +262,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->
src/main/resources/views/platform/sys/club/sqrt.html
+61 -3
View File
@@ -109,7 +109,7 @@ layout("/layouts/platform.html"){
<el-table-column align="center" header-align="center" label="退休人数" show-overflow-tooltip
prop="outnum"></el-table-column>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="申请状态" sortable>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="入会状态" sortable>
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="primary">待协会审核</el-tag>
<el-tag v-if="scope.row.status==2" type="danger">协会拒绝</el-tag>
@@ -119,6 +119,17 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column align="center" v-if="activeName=='true'" header-align="center" label="退会状态" sortable>
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.exitstatus==1">待社团审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitstatus==2">社团不通过</el-tag>
<el-tag type="primary" v-if="scope.row.exitstatus==3">待校工会审核</el-tag>
<el-tag type="danger" v-if="scope.row.exitstatus==4">校工会不通过</el-tag>
<el-tag type="success" v-if="scope.row.exitstatus==5">审核通过</el-tag>
<el-tag type="success" v-if="!scope.row.exitstatus">暂无</el-tag>
</template>
</el-table-column>
<el-table-column align="center" header-align="center" label="操作" fixed="right" width="250px">
<template slot-scope="scope">
<el-button size="mini" @click="openDetail(scope.row.id)">查看</el-button>
@@ -127,7 +138,16 @@ layout("/layouts/platform.html"){
</el-button>
<el-button size="mini" v-if="activeName=='true'&&scope.row.status==1" type="danger"
@click="doRevocation(scope.row.id)">
撤销申请
撤销加入申请
</el-button>
<el-button size="mini" v-if="activeName=='true' && scope.row.status==5 && !scope.row.exitstatus" type="primary" @click="exitClub(scope.row)">
申请退会
</el-button>
<el-button size="mini" v-if="activeName=='true' && scope.row.status!=1 && scope.row.exitstatus==1"
type="danger"
@click="cancelExitClub(scope.row.id)">
撤销退会申请
</el-button>
</template>
</el-table-column>
@@ -250,6 +270,44 @@ layout("/layouts/platform.html"){
}
},
methods: {
exitClub(row) {
this.$confirm('您确定要申请退会吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
callback: async (a, b) => {
if ("confirm" === a) {//确认后再执行
const resp = await $.post('/platform/sys/club/sq/exitClub', {id: row.id})
if (resp.code === 0) {
await this.getCount()
this.pageData()
this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
}
});
},
cancelExitClub(id) {
this.$confirm('您确定要撤销申请吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
callback: async (a, b) => {
if ("confirm" === a) {//确认后再执行
const resp = await $.post('/platform/sys/club/sq/cancelExitClub', {id: id})
if (resp.code === 0) {
await this.getCount()
this.pageData()
this.$message.success(resp.msg)
} else {
this.$message.warning(resp.msg)
}
}
}
});
},
doRevocation(id) {
this.$confirm('是否撤销申请？', '提示', {
confirmButtonText: '确定',
@@ -394,4 +452,4 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
#-->