commit

2025-11-29 11:25:38 +08:00
parent c21570b916
commit 68165320f3
7 changed files with 382 additions and 22 deletions
@@ -14,6 +14,8 @@ RoleConstant {
    MEMBER("会员角色"),
    SYSADMIN("系统管理员"),

+    UNION_COMMITTEE_MEMBER("工代会委员"),
+
    SCHOOL_UNION_ADMIN("校工会管理员"),
    SCHOOL_UNION_CHAIRMAN("校工会主席"),
    SCHOOL_UNION_VICE_CHAIRMAN("校工会副主席"),
@@ -0,0 +1,128 @@
+package com.budwk.app.sys.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.budwk.app.base.constant.RoleConstant;
+import com.budwk.app.base.page.Pagination;
+import com.budwk.app.base.param.PageForm;
+import com.budwk.app.base.result.Result;
+import com.budwk.app.sys.models.SysCommitteeMember;
+import com.budwk.app.sys.models.Sys_role;
+import com.budwk.app.sys.models.Sys_user;
+import com.budwk.app.sys.models.Sys_user_role;
+import com.budwk.app.sys.services.SysRoleService;
+import com.budwk.app.sys.services.SysUserService;
+import com.budwk.app.sys.views.View_user;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.aop.Aop;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author zhf
+ * @date 2025/11/18 17:26
+ * @description 工会委员会
+ */
+@IocBean
+@At("/platform/sys/committeeMember")
+@Ok("json:full")
+@Api(tags = "工会委员管理")
+public class SysUnionCommitteeMemberController {
+
+    @Inject
+    private SysUserService sysUserService;
+    @Inject
+    private SysRoleService sysRoleService;
+
+    @At
+    @ApiOperation("分页查询")
+    @SaCheckPermission("sys.manager.union.committeeMember")
+    public Result pageData(PageForm pageForm, @Valid String sessionId) {
+        Sql sql = Sqls.create("""
+                SELECT * FROM `sys_committee_member` $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.orLike(SysCommitteeMember::getLoginName, pageForm.getSearchKeyword(), true);
+        seg.orLike(SysCommitteeMember::getUserName, pageForm.getSearchKeyword(), true);
+//        cnd.and(seg);
+        cnd.and(SysCommitteeMember::getSessionId, "=", sessionId);
+        sql.setCondition(cnd);
+        return Result.success(sysUserService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql));
+    }
+
+
+    @At
+    @ApiOperation("查询没有设置的人员")
+    @SaCheckPermission("sys.manager.union.committeeMember")
+    public Result listUserSelect(@Valid String keyWord, @Valid String sessionId) {
+        Sql sql = Sqls.create("select id,loginname,username,unitName from vw_user $condition");
+        Cnd cnd = Cnd.NEW();
+        SqlExpressionGroup seg = new SqlExpressionGroup();
+        seg.orLike(View_user::getLoginname, keyWord, true);
+        seg.orLike(View_user::getUsername, keyWord, true);
+        cnd.and(seg);
+        cnd.and("id", "not in", "(select userId from sys_committee_member where sessionId='%s')".formatted(sessionId));
+        sql.setCondition(cnd);
+        Pagination pagination = sysUserService.listPageMap(1, 10, sql);
+        return Result.success(pagination.getList());
+    }
+
+    @At
+    @ApiOperation("添加委员")
+    @SaCheckPermission("sys.manager.union.committeeMember")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result insert(SysCommitteeMember sysCommitteeMember) {
+        Sys_user user = sysUserService.fetch(sysCommitteeMember.getUserId());
+        sysCommitteeMember.setLoginName(user.getLoginname());
+        sysCommitteeMember.setUserName(user.getUsername());
+        sysUserService.insert(sysCommitteeMember);
+        Sys_role sys_role = sysRoleService.fetch(Cnd.where(Sys_role::getCode, "=", RoleConstant.UNION_COMMITTEE_MEMBER.name()));
+        Sys_user_role user_role = new Sys_user_role();
+        user_role.setRoleId(sys_role.getId());
+        user_role.setUserId(sysCommitteeMember.getUserId());
+        sysRoleService.insert(user_role);
+        sysRoleService.clearCache();
+        sysUserService.clearCache();
+        return Result.success();
+    }
+
+
+    @At
+    @ApiOperation("删除委员")
+    @SaCheckPermission("sys.manager.union.committeeMember")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result delete(@Valid String id) {
+        SysCommitteeMember committeeMember = sysUserService.dao().fetch(SysCommitteeMember.class, id);
+        Sys_role sys_role = sysRoleService.fetch(Cnd.where(Sys_role::getCode, "=", RoleConstant.UNION_COMMITTEE_MEMBER.name()));
+        sysUserService.dao().delete(SysCommitteeMember.class, id);
+        sysRoleService.dao().clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", committeeMember.getUserId())
+                .and(Sys_user_role::getRoleId, "=", sys_role.getId()));
+        return Result.success();
+    }
+
+    @At
+    @ApiOperation("删除委员角色")
+    @SaCheckPermission("sys.manager.union.committeeMember")
+    @Aop(TransAop.READ_COMMITTED)
+    public Result deleteRole(@Valid String sessionId) {
+        List<SysCommitteeMember> memberList = sysUserService.dao().query(SysCommitteeMember.class, Cnd.where(SysCommitteeMember::getSessionId, "=", sessionId));
+        Sys_role sys_role = sysRoleService.fetch(Cnd.where(Sys_role::getCode, "=", RoleConstant.UNION_COMMITTEE_MEMBER.name()));
+        List<String> userids = memberList.stream().map(SysCommitteeMember::getUserId).toList();
+        sysRoleService.dao().clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "in", userids)
+                .and(Sys_user_role::getRoleId, "=", sys_role.getId()));
+        return Result.success();
+    }
+
+
+}
@@ -0,0 +1,55 @@
+package com.budwk.app.sys.models;
+
+import lombok.Data;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * @author zhf
+ * @date 2025/11/19 09:25
+ * @description 工会委员
+ */
+@Data
+@Table("sys_committee_member")
+public class SysCommitteeMember {
+
+    @Name
+    @ColDefine
+    @Column
+    @PrevInsert(uu32 = true)
+    @Comment("id")
+    private String id;
+
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("工号")
+    @Column
+    private String loginName;
+
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("姓名")
+    @Column
+    private String userName;
+
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("userId")
+    @Column
+    private String userId;
+
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("职务")
+    @Column
+    private String position;
+
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("届次名称")
+    @Column
+    private String sessionName;
+
+
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("届次Id")
+    @Column
+    private String sessionId;
+
+
+}
@@ -86,7 +86,7 @@ public class GhkhXghshController {
        if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderBy)) {
            cnd.orderBy(pageOrderName, pageOrderBy);
        }
-        cnd.groupBy("re.union_id");
+        cnd.groupBy("zb_id, re.union_id");
        sql.setCondition(cnd);
        return Result.success(khXghshService.listPage(pageNumber, pageSize, sql));
    }
@@ -111,8 +111,8 @@ public class GhkhXghshController {
                    bz.setZp(zp);
                }
 				Kh_xghsh xghsh = khZbService.dao().fetch(Kh_xghsh.class, Cnd.where("bz_id", "=", bz.getId()).and("flatid", "=", union_id));
-				bz.setSchools(xghsh.getSchools());
-				bz.setAddition(xghsh.getAddition());
+				bz.setSchools(xghsh != null ? xghsh.getSchools() : 0);
+				bz.setAddition(xghsh != null ? xghsh.getAddition() : "");
 			});
        });
        return Result.success(khzb);