diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java index 44d7d89d..9411a930 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegateManageController.java @@ -197,34 +197,7 @@ public class TeacherCongressDelegateManageController { @At @SaCheckPermission("tc.delegate.manage") public Result publicUser(@Valid TeacherCongressDelegateManagePublicUserParam param) { - List units = dao.query(Teacher_congress_delegation_unit.class, Cnd.where("sessionId", "=", param.getSessionId()).and("delegationId", "=", param.getDelegationId())); - List unitIds = units.stream().map(Teacher_congress_delegation_unit::getUnitId).toList(); - if (ObjectUtil.isEmpty(unitIds)) { - return Result.error("代表团没有组成单位"); - } - - Sql sql = Sqls.create(""" - SELECT - t1.id, - t1.username AS userName, - t1.loginName AS loginName, - t2.NAME AS unitName - FROM - `sys_user` t1 - LEFT JOIN sys_unit t2 ON t2.id = t1.unitId - WHERE - t1.id NOT IN ( SELECT userId FROM teacher_congress_delegate WHERE sessionId = @sessionId AND delegationId = @delegationId ) - AND - t1.unitId in (@unitIds) - AND - (t1.loginname like @keyWord or username like @keyWord) - """); - sql.setParam("sessionId", param.getSessionId()); - sql.setParam("delegationId", param.getDelegationId()); - sql.setParam("unitIds", unitIds); - sql.setParam("keyWord", "%" + param.getKeyWord() + "%"); - Pagination pagination = sysUserService.listPageMap(1, 50, sql); - return Result.success(pagination.getList()); + return Result.success(teacherDelegateService.listPublicUsers(param)); } /** @@ -497,40 +470,7 @@ public class TeacherCongressDelegateManageController { @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("tc.delegate.manage") public Result doAllocateDelegation(String sessionId) { - List delegateList = dao.query(Teacher_congress_delegate.class, - Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId) - .and(Teacher_congress_delegate::getDelegationId, "is", null)); - - for (Teacher_congress_delegate delegate : delegateList) { - Teacher_congress_delegation_unit delegation_unit = dao.fetch(Teacher_congress_delegation_unit.class, - Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", delegate.getUnitId()) - .and(Teacher_congress_delegation_unit::getSessionId, "=", sessionId)); - if (ObjectUtil.isNotEmpty(delegation_unit)) { - delegate.setDelegationId(delegation_unit.getDelegationId()); - dao.update(delegate); - Sys_user_role userRole = new Sys_user_role(); - userRole.setTcDelegationId(delegation_unit.getDelegationId()); - userRole.setUserId(delegate.getUserId()); - userRole.setTcSessionId(sessionId); - Sys_role sys_role = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name())); - - if (sys_role.getId().equals(delegate.getRoleId())) { - delegate.setRoleId(sys_role.getId()); - userRole.setRoleId(sys_role.getId()); - } - - Sys_role sys_role2 = dao.fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_ATTENDANCE.name())); - if (sys_role2.getId().equals(delegate.getRoleId())) { - delegate.setRoleId(sys_role2.getId()); - userRole.setRoleId(sys_role2.getId()); - } - userRole.setTcDelegationId(delegate.getDelegationId()); - teacherCongressSessionService.prepareSessionRole(userRole); - dao.insert(userRole); - } - sysUserService.clearCache(); - } - return Result.success(); + return Result.success(teacherDelegateService.allocateDelegations(sessionId)); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/listener/TeacherCongressDelegateListener.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/listener/TeacherCongressDelegateListener.java index f2b5b53d..77597c84 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/listener/TeacherCongressDelegateListener.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/listener/TeacherCongressDelegateListener.java @@ -1,28 +1,14 @@ package com.budwk.app.zhgh.democratic.teachercongress.delegate.listener; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.event.user.SysUserEvent; import com.budwk.app.base.event.user.SysUserEventListener; -import com.budwk.app.sys.models.Sys_role; -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 com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig; -import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; -import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit; -import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session; -import com.budwk.app.zhgh.democratic.teachercongress.prepare.service.TeacherCongressSessionService; +import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegateService; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; +import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.async.Async; -import org.nutz.dao.Cnd; -import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import java.util.List; - /** * @version 1.0 * @Author zzr @@ -31,16 +17,11 @@ import java.util.List; * @注释 */ @IocBean +@Slf4j public class TeacherCongressDelegateListener implements SysUserEventListener { @Inject - private Dao dao; - @Inject - private SysUserService sysUserService; - @Inject - private SysRoleService sysRoleService; - @Inject - private TeacherCongressSessionService teacherCongressSessionService; + private TeacherCongressDelegateService teacherCongressDelegateService; @Override @Async @@ -49,68 +30,11 @@ public class TeacherCongressDelegateListener implements SysUserEventListener { return; } - // 人员单位变更只同步当前开启届次，防止误修改历史届次代表及角色关系。 - Teacher_congress_session session = dao.fetch(Teacher_congress_session.class, - Cnd.where(Teacher_congress_session::getEnable, "=", true) - .desc(Teacher_congress_session::getStartDate)); - if (session == null) { - return; + try { + // 保持原有事件范围，仅将监听器内部归团逻辑下沉到事务服务。 + teacherCongressDelegateService.refreshCurrentDelegateOrganization(event.getUserId()); + } catch (Exception e) { + log.error("刷新教代会代表组织信息失败，userId={}", event.getUserId(), e); } - String userId = event.getUserId(); - //查询校领导的单位 - ProposalConfig config = dao.fetch(ProposalConfig.class, Cnd.NEW()); - List schoolLeaderUnitIds = config.getSchoolLeaderUnitIds(); - - View_user user = dao.fetch(View_user.class, Cnd.where(View_user::getId, "=", userId)); - - //校领导排除在外 - if (StrUtil.isNotBlank(user.getUnitId()) && schoolLeaderUnitIds.contains(user.getUnitId())) { - return; - } - - //查询当前代表的信息 - Teacher_congress_delegate currentDelegate = dao.fetch(Teacher_congress_delegate.class, Cnd.where(Teacher_congress_delegate::getSessionId, "=", session.getId())); - if(currentDelegate == null){ - return; - } - - //查询当前分配的单位属于哪个代表团 - String unitId = user.getUnitId(); - Teacher_congress_delegation_unit unit = dao.fetch(Teacher_congress_delegation_unit.class, Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", session) - .and(Teacher_congress_delegation_unit::getUnitId, "=", unitId)); - String delegationId = unit.getDelegationId(); - - currentDelegate.setDelegationId(delegationId); - currentDelegate.setUnitId(user.getUnitId()); - currentDelegate.setUnitName(user.getUnitName()); - currentDelegate.setUnionId(user.getUnionId()); - currentDelegate.setUnionName(user.getUnionName()); - dao.updateIgnoreNull(currentDelegate); - - - //角色数据 - Sys_role delegateFormalRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name()); - Sys_role delegateAttendanceRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATE_ATTENDANCE.name()); - Sys_role delegateSpeciallyInviteRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATE_SPECIALLY_INVITE.name()); - Sys_role delegationHeadRole = sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD.name()); - - //删除权限 - //删除角色数据 - dao.clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", userId) - .and(Sys_user_role::getRoleId, "in", List.of(delegateFormalRole.getId(), delegateAttendanceRole.getId(), delegateSpeciallyInviteRole.getId(), delegationHeadRole.getId())) - .and(Sys_user_role::getTcSessionId, "=", session.getId()) - ); - - //再加权限 - Sys_user_role sysUserRole = new Sys_user_role(); - sysUserRole.setUserId(userId); - sysUserRole.setTcSessionId(session.getId()); - sysUserRole.setTcDelegationId(currentDelegate.getDelegationId()); - sysUserRole.setRoleId(currentDelegate.getRoleId()); - teacherCongressSessionService.prepareSessionRole(sysUserRole); - dao.insert(sysUserRole); - - sysUserService.clearCache(); - sysRoleService.clearCache(); } } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateService.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateService.java index 26918d6b..2d1f2366 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateService.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateService.java @@ -4,6 +4,8 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.BaseService; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.TeacherCongressDelegateManagePageParam; +import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.TeacherCongressDelegateManagePublicUserParam; +import org.nutz.lang.util.NutMap; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -20,4 +22,27 @@ public interface TeacherCongressDelegateService extends BaseService listPublicUsers(TeacherCongressDelegateManagePublicUserParam param); + + /** + * 根据系统配置的单位或分工会组成关系，为尚未归团的代表自动分配代表团。 + * + * @param sessionId 届次ID + * @return 已分配、未分配数量及未分配人员名称 + */ + NutMap allocateDelegations(String sessionId); + + /** + * 人员组织变化后，按当前组成模式刷新其当前届次代表及角色归团信息。 + * + * @param userId 用户ID + */ + void refreshCurrentDelegateOrganization(String userId); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java index 42a9bf19..ec3df4ae 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegateServiceImpl.java @@ -12,13 +12,24 @@ import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.base.utils.SysOfficeTemplateUtil; import com.budwk.app.sys.models.Sys_role; +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 com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.TeacherCongressDelegateManagePageParam; +import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.TeacherCongressDelegateManagePublicUserParam; import com.budwk.app.zhgh.democratic.teachercongress.delegate.vo.TeacherCongressDelegateExcelVO; import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session; +import com.budwk.app.zhgh.democratic.teachercongress.prepare.service.TeacherCongressSessionService; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.constant.TeacherCongressDelegationCompositionMode; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.service.TeacherCongressDelegationService; +import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig; +import com.budwk.app.base.exception.BaseException; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy; @@ -30,6 +41,8 @@ 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.ioc.aop.Aop; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.lang.util.NutMap; import javax.servlet.http.HttpServletResponse; @@ -39,6 +52,8 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Set; +import java.util.HashSet; @IocBean(args = {"refer:dao"}) public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl implements TeacherCongressDelegateService { @@ -52,6 +67,139 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl listPublicUsers(TeacherCongressDelegateManagePublicUserParam param) { + TeacherCongressDelegationCompositionMode mode = teacherCongressDelegationService.getCompositionMode(); + List organizationIds; + if (mode == TeacherCongressDelegationCompositionMode.UNION) { + organizationIds = dao().query(Teacher_congress_delegation_union.class, + Cnd.where(Teacher_congress_delegation_union::getSessionId, "=", param.getSessionId()) + .and(Teacher_congress_delegation_union::getDelegationId, "=", param.getDelegationId())) + .stream().map(Teacher_congress_delegation_union::getUnionId).toList(); + } else { + organizationIds = dao().query(Teacher_congress_delegation_unit.class, + Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", param.getSessionId()) + .and(Teacher_congress_delegation_unit::getDelegationId, "=", param.getDelegationId())) + .stream().map(Teacher_congress_delegation_unit::getUnitId).toList(); + } + if (organizationIds.isEmpty()) { + throw new BaseException("代表团没有组成" + mode.getLabel()); + } + + String organizationColumn = mode == TeacherCongressDelegationCompositionMode.UNION ? "u.unionId" : "u.unitId"; + Sql sql = Sqls.create("SELECT u.id,u.username AS userName,u.loginname AS loginName,u.unitName,u.unionName " + + "FROM vw_user u WHERE u.id NOT IN (SELECT userId FROM teacher_congress_delegate WHERE sessionId=@sessionId) " + + "AND " + organizationColumn + " IN (@organizationIds) " + + "AND (u.loginname LIKE @keyword OR u.username LIKE @keyword) ORDER BY u.loginname LIMIT 50"); + sql.setParam("sessionId", param.getSessionId()); + sql.setParam("organizationIds", organizationIds); + sql.setParam("keyword", "%" + param.getKeyWord() + "%"); + return listMap(sql); + } + + /** + * 为当前届次未归团代表批量解析代表团，同时刷新其届次代表角色，避免重复生成角色关系。 + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public NutMap allocateDelegations(String sessionId) { + List delegates = query(Cnd.where(Teacher_congress_delegate::getSessionId, "=", sessionId) + .and(Teacher_congress_delegate::getDelegationId, "is", null)); + List unassignedNames = new ArrayList<>(); + int assignedCount = 0; + for (Teacher_congress_delegate delegate : delegates) { + String delegationId = teacherCongressDelegationService.resolveDelegationId(sessionId, delegate.getUnitId(), delegate.getUnionId()); + if (StrUtil.isBlank(delegationId)) { + unassignedNames.add(delegate.getUserName() + "（" + delegate.getLoginName() + "）"); + continue; + } + delegate.setDelegationId(delegationId); + updateIgnoreNull(delegate); + replaceDelegateRole(delegate); + assignedCount++; + } + sysUserService.clearCache(); + return NutMap.NEW().addv("assignedCount", assignedCount) + .addv("unassignedCount", unassignedNames.size()).addv("unassignedNames", unassignedNames); + } + + /** + * 人员组织变更事件只处理当前开启届次；代表身份保留，代表团负责人角色在跨团时清理。 + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public void refreshCurrentDelegateOrganization(String userId) { + Teacher_congress_session session = dao().fetch(Teacher_congress_session.class, + Cnd.where(Teacher_congress_session::getEnable, "=", true).desc(Teacher_congress_session::getStartDate)); + if (session == null) { + return; + } + View_user user = dao().fetch(View_user.class, Cnd.where(View_user::getId, "=", userId)); + if (user == null) { + return; + } + ProposalConfig config = dao().fetch(ProposalConfig.class, Cnd.NEW()); + if (config != null && config.getSchoolLeaderUnitIds() != null + && StrUtil.isNotBlank(user.getUnitId()) && config.getSchoolLeaderUnitIds().contains(user.getUnitId())) { + return; + } + Teacher_congress_delegate delegate = fetch(Cnd.where(Teacher_congress_delegate::getSessionId, "=", session.getId()) + .and(Teacher_congress_delegate::getUserId, "=", userId)); + if (delegate == null) { + return; + } + + String oldDelegationId = delegate.getDelegationId(); + String newDelegationId = teacherCongressDelegationService.resolveDelegationId(session.getId(), user.getUnitId(), user.getUnionId()); + delegate.setDelegationId(newDelegationId); + delegate.setUnitId(user.getUnitId()); + delegate.setUnitName(user.getUnitName()); + delegate.setUnionId(user.getUnionId()); + delegate.setUnionName(user.getUnionName()); + delegate.setMobile(user.getMobile()); + update(delegate); + replaceDelegateRole(delegate); + if (!java.util.Objects.equals(oldDelegationId, newDelegationId)) { + clearDelegationManagerRoles(userId, session.getId()); + } + sysUserService.clearCache(); + sysRoleService.clearCache(); + } + + /** 替换代表本届次的同一身份角色，确保角色中的代表团ID与代表表一致。 */ + private void replaceDelegateRole(Teacher_congress_delegate delegate) { + dao().clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", delegate.getUserId()) + .and(Sys_user_role::getRoleId, "=", delegate.getRoleId()) + .and(Sys_user_role::getTcSessionId, "=", delegate.getSessionId())); + Sys_user_role role = new Sys_user_role(); + role.setUserId(delegate.getUserId()); + role.setRoleId(delegate.getRoleId()); + role.setTcSessionId(delegate.getSessionId()); + role.setTcDelegationId(delegate.getDelegationId()); + teacherCongressSessionService.prepareSessionRole(role); + dao().insert(role); + } + + /** 跨代表团后清理团长、副团长及联络人角色，避免保留原代表团管理权限。 */ + private void clearDelegationManagerRoles(String userId, String sessionId) { + Set roleIds = new HashSet<>(); + roleIds.add(sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_HEAD).getId()); + roleIds.add(sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_VICE_DELEGATION_HEAD).getId()); + roleIds.add(sysRoleService.getByCode(RoleConstant.TEACHER_CONGRESS_DELEGATION_CONTACT).getId()); + dao().clear(Sys_user_role.class, Cnd.where(Sys_user_role::getUserId, "=", userId) + .and(Sys_user_role::getTcSessionId, "=", sessionId) + .and(Sys_user_role::getRoleId, "in", roleIds)); + } @Override public Pagination pageData(TeacherCongressDelegateManagePageParam pageForm) { diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java index a86d1a43..b2d138be 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java @@ -170,45 +170,18 @@ public class TeacherCongressDelegationController { @At @SaCheckPermission("tc.delegation") public Result partUnitTransferData(@Valid String delegationId, @Valid String sessionId) { - //找出本届次已经设置了代表团的所有单位 - List delegationUnits = dao.query(Teacher_congress_delegation_unit.class, Cnd.where("sessionId", "=", sessionId)); - List unitIds = delegationUnits.stream().map(Teacher_congress_delegation_unit::getUnitId).toList(); - - //找出本代表团的单位 - List selectUnitIds = delegationUnits.stream().filter(unit -> unit.getDelegationId().equals(delegationId)).map(Teacher_congress_delegation_unit::getUnitId).toList(); - - SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.orEX("id", "not in", unitIds); - seg.orEX("id", "in", selectUnitIds); - -// Cnd cnd = Cnd.where("unitLevel", "=", 2); - Cnd cnd = Cnd.where("unitTypeCode", "=", "1"); - if (!seg.isEmpty()) { - cnd.and(seg); - } - cnd.asc("unitcode"); - - List units = dao.query(Sys_unit.class, cnd); - - NutMap transferData = NutMap.NEW().addv("selectUnitIds", selectUnitIds).addv("allUnits", units); - return Result.success(transferData); + NutMap data = teacherCongressDelegationService.getCompositionTransferData(sessionId, delegationId); + // 保留旧接口字段，兼容未同步更新的历史页面调用。 + data.put("selectUnitIds", data.get("selectedIds")); + data.put("allUnits", data.get("allItems")); + return Result.success(data); } @At @SaCheckPermission("tc.delegation") @Aop(TransAop.READ_COMMITTED) public Result partUnitSet(@Valid String delegationId, @Valid String sessionId, @Param("unitIds") String[] unitIds) { - dao.clear(Teacher_congress_delegation_unit.class, Cnd.where("delegationId", "=", delegationId).and("sessionId", "=", sessionId)); - - List insertData = Arrays.stream(unitIds).map(unitId -> { - Teacher_congress_delegation_unit delegationUnit = new Teacher_congress_delegation_unit(); - delegationUnit.setUnitId(unitId); - delegationUnit.setDelegationId(delegationId); - delegationUnit.setSessionId(sessionId); - return delegationUnit; - }).toList(); - - dao.insert(insertData); + teacherCongressDelegationService.saveComposition(sessionId, delegationId, unitIds); return Result.success(); } @@ -222,24 +195,35 @@ public class TeacherCongressDelegationController { @At @SaCheckPermission("tc.delegation") public Result partUnitPageData(@Valid PageForm pageForm, @Valid String sessionId, @Valid String delegationId) { - Sql sql = Sqls.create(""" - SELECT - t2.id, - t2.`name` - FROM - teacher_congress_delegation_unit t1 - LEFT JOIN sys_unit t2 ON t2.id = t1.unitId - $condition - """); - Cnd cnd = Cnd.NEW(); - cnd.and("t1.delegationId", "=", delegationId); - cnd.and("t1.sessionId", "=", sessionId); - if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { - cnd.where().andLike("t2.name", pageForm.getSearchKeyword()); - } - sql.setCondition(cnd); - Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); + return Result.success(teacherCongressDelegationService.pageComposition(pageForm, sessionId, delegationId)); + } + + /** + * 获取当前配置模式下的代表团组成选择数据。 + */ + @At + @SaCheckPermission("tc.delegation") + public Result compositionTransferData(@Valid String delegationId, @Valid String sessionId) { + return Result.success(teacherCongressDelegationService.getCompositionTransferData(sessionId, delegationId)); + } + + /** + * 保存当前配置模式下的代表团组成关系。 + */ + @At + @SaCheckPermission("tc.delegation") + public Result compositionSet(@Valid String delegationId, @Valid String sessionId, @Param("itemIds") String[] itemIds) { + teacherCongressDelegationService.saveComposition(sessionId, delegationId, itemIds); + return Result.success(); + } + + /** + * 分页查询当前配置模式下的代表团组成关系。 + */ + @At + @SaCheckPermission("tc.delegation") + public Result compositionPageData(@Valid PageForm pageForm, @Valid String sessionId, @Valid String delegationId) { + return Result.success(teacherCongressDelegationService.pageComposition(pageForm, sessionId, delegationId)); } /** diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/service/TeacherCongressDelegationService.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/service/TeacherCongressDelegationService.java index 7d47a167..99b0a7e5 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/service/TeacherCongressDelegationService.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/service/TeacherCongressDelegationService.java @@ -1,6 +1,9 @@ package com.budwk.app.zhgh.democratic.teachercongress.delegation.service; import com.budwk.app.base.service.BaseService; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.constant.TeacherCongressDelegationCompositionMode; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation; import org.nutz.lang.util.NutMap; @@ -11,6 +14,51 @@ import java.util.List; */ public interface TeacherCongressDelegationService extends BaseService { + /** + * 获取当前代表团组成模式。 + * + * @return 单位或分工会模式 + */ + TeacherCongressDelegationCompositionMode getCompositionMode(); + + /** + * 获取代表团组成选择器数据，已被其他代表团占用的数据不会返回。 + * + * @param sessionId 届次ID + * @param delegationId 代表团ID + * @return 组成模式、当前选中ID及可选项 + */ + NutMap getCompositionTransferData(String sessionId, String delegationId); + + /** + * 保存当前模式下的代表团组成关系。 + * + * @param sessionId 届次ID + * @param delegationId 代表团ID + * @param itemIds 单位ID或分工会ID + */ + void saveComposition(String sessionId, String delegationId, String[] itemIds); + + /** + * 分页查询当前模式下的代表团组成数据。 + * + * @param pageForm 分页查询参数 + * @param sessionId 届次ID + * @param delegationId 代表团ID + * @return 组成数据分页结果 + */ + Pagination pageComposition(PageForm pageForm, String sessionId, String delegationId); + + /** + * 按当前组成模式解析人员所属代表团。 + * + * @param sessionId 届次ID + * @param unitId 人员单位ID + * @param unionId 人员分工会ID + * @return 代表团ID，未配置时返回空 + */ + String resolveDelegationId(String sessionId, String unitId, String unionId); + /** * 按角色查询代表团负责人信息。 * @@ -41,4 +89,4 @@ public interface TeacherCongressDelegationService extends BaseService occupiedIds = new ArrayList<>(); + List selectedIds = new ArrayList<>(); + List allItems = new ArrayList<>(); + + if (mode == TeacherCongressDelegationCompositionMode.UNION) { + List relations = dao().query(Teacher_congress_delegation_union.class, + Cnd.where(Teacher_congress_delegation_union::getSessionId, "=", sessionId)); + relations.forEach(relation -> { + occupiedIds.add(relation.getUnionId()); + if (delegationId.equals(relation.getDelegationId())) { + selectedIds.add(relation.getUnionId()); + } + }); + Cnd cnd = buildAvailableCondition(occupiedIds, selectedIds); + cnd.asc(Sys_union::getUnionCode); + dao().query(Sys_union.class, cnd).forEach(item -> allItems.add(NutMap.NEW() + .addv("id", item.getId()).addv("name", item.getName()).addv("code", item.getUnionCode()))); + } else { + List relations = dao().query(Teacher_congress_delegation_unit.class, + Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", sessionId)); + relations.forEach(relation -> { + occupiedIds.add(relation.getUnitId()); + if (delegationId.equals(relation.getDelegationId())) { + selectedIds.add(relation.getUnitId()); + } + }); + Cnd cnd = Cnd.where(Sys_unit::getUnitTypeCode, "=", "1"); + appendAvailableCondition(cnd, occupiedIds, selectedIds); + cnd.asc(Sys_unit::getUnitcode); + dao().query(Sys_unit.class, cnd).forEach(item -> allItems.add(NutMap.NEW() + .addv("id", item.getId()).addv("name", item.getName()).addv("code", item.getUnitcode()))); + } + return NutMap.NEW().addv("mode", mode.getCode()).addv("label", mode.getLabel()) + .addv("selectedIds", selectedIds).addv("allItems", allItems); + } + + /** + * 保存当前组成模式对应的关联表，并在写入前校验跨代表团重复占用。 + */ + @Override + @Aop(TransAop.READ_COMMITTED) + public void saveComposition(String sessionId, String delegationId, String[] itemIds) { + validateDelegation(sessionId, delegationId); + List normalizedIds = itemIds == null ? Collections.emptyList() : Arrays.stream(itemIds) + .filter(StrUtil::isNotBlank).distinct().toList(); + TeacherCongressDelegationCompositionMode mode = getCompositionMode(); + if (mode == TeacherCongressDelegationCompositionMode.UNION) { + validateUnionIds(normalizedIds); + int occupied = normalizedIds.isEmpty() ? 0 : dao().count(Teacher_congress_delegation_union.class, + Cnd.where(Teacher_congress_delegation_union::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_union::getDelegationId, "!=", delegationId) + .and(Teacher_congress_delegation_union::getUnionId, "in", normalizedIds)); + if (occupied > 0) { + throw new BaseException("所选分工会已被其他代表团使用，请刷新后重试"); + } + dao().clear(Teacher_congress_delegation_union.class, Cnd.where(Teacher_congress_delegation_union::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_union::getDelegationId, "=", delegationId)); + normalizedIds.forEach(itemId -> { + Teacher_congress_delegation_union relation = new Teacher_congress_delegation_union(); + relation.setSessionId(sessionId); + relation.setDelegationId(delegationId); + relation.setUnionId(itemId); + dao().insert(relation); + }); + return; + } + + validateUnitIds(normalizedIds); + int occupied = normalizedIds.isEmpty() ? 0 : dao().count(Teacher_congress_delegation_unit.class, + Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_unit::getDelegationId, "!=", delegationId) + .and(Teacher_congress_delegation_unit::getUnitId, "in", normalizedIds)); + if (occupied > 0) { + throw new BaseException("所选单位已被其他代表团使用，请刷新后重试"); + } + dao().clear(Teacher_congress_delegation_unit.class, Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_unit::getDelegationId, "=", delegationId)); + normalizedIds.forEach(itemId -> { + Teacher_congress_delegation_unit relation = new Teacher_congress_delegation_unit(); + relation.setSessionId(sessionId); + relation.setDelegationId(delegationId); + relation.setUnitId(itemId); + dao().insert(relation); + }); + } + + /** + * 分页查询当前模式下的组成关系，统一向前端返回 id、name、code 字段。 + */ + @Override + public Pagination pageComposition(PageForm pageForm, String sessionId, String delegationId) { + validateDelegation(sessionId, delegationId); + boolean unionMode = getCompositionMode() == TeacherCongressDelegationCompositionMode.UNION; + String sqlText = unionMode + ? "SELECT t2.id,t2.name,t2.unionCode AS code FROM teacher_congress_delegation_union t1 LEFT JOIN sys_union t2 ON t2.id=t1.unionId $condition" + : "SELECT t2.id,t2.name,t2.unitcode AS code FROM teacher_congress_delegation_unit t1 LEFT JOIN sys_unit t2 ON t2.id=t1.unitId $condition"; + Sql sql = Sqls.create(sqlText); + Cnd cnd = Cnd.where("t1.sessionId", "=", sessionId).and("t1.delegationId", "=", delegationId); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + cnd.where().andLike("t2.name", pageForm.getSearchKeyword()); + } + cnd.asc("code"); + sql.setCondition(cnd); + return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + } + + /** + * 按当前模式精确解析代表团；同一组织存在多条关系时拒绝随机匹配，避免代表被错误归团。 + */ + @Override + public String resolveDelegationId(String sessionId, String unitId, String unionId) { + TeacherCongressDelegationCompositionMode mode = getCompositionMode(); + if (mode == TeacherCongressDelegationCompositionMode.UNION) { + if (StrUtil.isBlank(unionId)) { + return null; + } + List relations = dao().query(Teacher_congress_delegation_union.class, + Cnd.where(Teacher_congress_delegation_union::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_union::getUnionId, "=", unionId)); + return resolveUniqueDelegation(relations.stream().map(Teacher_congress_delegation_union::getDelegationId).toList(), "分工会"); + } + if (StrUtil.isBlank(unitId)) { + return null; + } + List relations = dao().query(Teacher_congress_delegation_unit.class, + Cnd.where(Teacher_congress_delegation_unit::getSessionId, "=", sessionId) + .and(Teacher_congress_delegation_unit::getUnitId, "=", unitId)); + return resolveUniqueDelegation(relations.stream().map(Teacher_congress_delegation_unit::getDelegationId).toList(), "单位"); + } + + private Cnd buildAvailableCondition(List occupiedIds, List selectedIds) { + Cnd cnd = Cnd.NEW(); + appendAvailableCondition(cnd, occupiedIds, selectedIds); + return cnd; + } + + /** 当前代表团已选项允许继续显示，其余已占用项从选择器中排除。 */ + private void appendAvailableCondition(Cnd cnd, List occupiedIds, List selectedIds) { + if (occupiedIds.isEmpty()) { + return; + } + if (selectedIds.isEmpty()) { + cnd.and("id", "not in", occupiedIds); + return; + } + cnd.and(Cnd.exps("id", "not in", occupiedIds).or("id", "in", selectedIds)); + } + + /** 校验代表团确实属于当前届次，防止跨届次写入组成关系。 */ + private void validateDelegation(String sessionId, String delegationId) { + if (dao().count(Teacher_congress_delegation.class, Cnd.where(Teacher_congress_delegation::getId, "=", delegationId) + .and(Teacher_congress_delegation::getSessionId, "=", sessionId)) != 1) { + throw new BaseException("代表团或届次参数错误"); + } + } + + /** 校验提交的分工会ID均真实存在。 */ + private void validateUnionIds(List ids) { + if (!ids.isEmpty() && dao().count(Sys_union.class, Cnd.where(Sys_union::getId, "in", ids)) != ids.size()) { + throw new BaseException("所选分工会数据不存在，请刷新后重试"); + } + } + + /** 校验提交的单位ID均真实存在且属于代表团可用的单位类型。 */ + private void validateUnitIds(List ids) { + if (!ids.isEmpty() && dao().count(Sys_unit.class, Cnd.where(Sys_unit::getId, "in", ids) + .and(Sys_unit::getUnitTypeCode, "=", "1")) != ids.size()) { + throw new BaseException("所选单位数据不存在，请刷新后重试"); + } + } + + /** 对组织与代表团关系执行唯一性校验。 */ + private String resolveUniqueDelegation(List delegationIds, String label) { + if (delegationIds.isEmpty()) { + return null; + } + if (delegationIds.size() > 1) { + throw new BaseException(label + "存在重复代表团关系，请先检查代表团组成配置"); + } + return delegationIds.get(0); + } + /** * 按角色查询代表团负责人信息，副团长允许返回多条记录以兼容V3多副团长数据。 * diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java index fb4aa6d1..3c3d33cd 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/prepare/service/impl/TeacherCongressSessionServiceImpl.java @@ -22,6 +22,7 @@ import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_con import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_union; import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation_unit; +import com.budwk.app.zhgh.democratic.teachercongress.delegation.service.TeacherCongressDelegationService; import com.budwk.app.zhgh.democratic.teachercongress.institution.models.Teacher_congress_institution; import com.budwk.app.zhgh.democratic.teachercongress.institution.models.Teacher_congress_institution_user; import com.budwk.app.zhgh.democratic.teachercongress.meetings.models.Teacher_congress_meeting; @@ -57,6 +58,8 @@ public class TeacherCongressSessionServiceImpl extends BaseServiceImpl sysUsers = dao.query(Sys_user.class, Cnd.where("id", "in", userIds)); + List sysUserHistoryStream = sysUsers.stream().map(e -> { + Sys_user_history sysUserHistory = new Sys_user_history(); + BeanUtil.copyProperties(e, sysUserHistory); + sysUserHistory.setChangeTypes(List.of(MemberChangeTypeName)); + sysUserHistory.setChangeTime(date); + NutMap change = NutMap.NEW(); + change.put("fieldName", "会员状态"); + change.put("field", "member"); + change.put("sourceValue", "否"); + change.put("newValue", "是"); + sysUserHistory.setChangeInfos(List.of(change)); + sysUserHistory.setChangeOrigin(MemberChangeOrigin.HAND_MOVEMENT.name()); + return sysUserHistory; + }).collect(Collectors.toList()); + dao.insert(sysUserHistoryStream); return Result.success(); } diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html index be2588bb..a96b065a 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html @@ -39,7 +39,7 @@ layout("/layouts/platform.html"){ - 根据单位分配代表团 + {{ allocateButtonText }} 导入代表 新增代表 @@ -138,19 +138,34 @@ layout("/layouts/platform.html"){ roleOptions: [], formRules: {}, - excelImportDialog: false + excelImportDialog: false, + compositionMode: "${config.dbtzc!'unit'}" + } + }, + computed: { + compositionLabel() { + return this.compositionMode === "union" ? "分工会" : "单位" + }, + allocateButtonText() { + return "根据" + this.compositionLabel + "分配代表团" } }, methods: { doAllocateDelegation() { - this.$confirm("确定要一键给没有代表团的代表，根据单位所在代表团设置代表团吗？", "提示", { + this.$confirm("确定要给尚未归团的代表，根据" + this.compositionLabel + "组成关系设置代表团吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "info" }).then(() => { this.$axios.post(loc() + "/doAllocateDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { if (res.code === 0) { - this.$message.success(res.msg) + let message = "已分配" + res.data.assignedCount + "人" + if (res.data.unassignedCount > 0) { + message += "，另有" + res.data.unassignedCount + "人未找到对应代表团" + this.$message.warning(message) + } else { + this.$message.success(message) + } this.doSearch() } }) diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html index 735c3a3d..b1ce9208 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/index.html @@ -35,7 +35,7 @@ layout("/layouts/platform.html"){ 设置团长 - 设置组成单位 + {{ compositionButtonText }} 删除 @@ -46,11 +46,12 @@ layout("/layouts/platform.html"){