From c8adcb9e1bf08c3b1ad580b4a5c0522c727dd8e6 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Fri, 12 Dec 2025 16:27:55 +0800 Subject: [PATCH] commit --- ...acherCongressDelegateManageController.java | 42 +++++++++++++++++++ ...CongressDelegatePushZgAuditController.java | 9 ++-- ...eacherCongressDelegatePushServiceImpl.java | 27 ++++++++++++ .../delegate/manage/index.html | 17 ++++++++ 4 files changed, 89 insertions(+), 6 deletions(-) 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 b846de9b..1b8ac93b 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 @@ -25,6 +25,7 @@ import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_con import com.budwk.app.zhgh.democratic.teachercongress.delegate.param.*; import com.budwk.app.zhgh.democratic.teachercongress.delegate.service.TeacherCongressDelegateService; 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 io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -479,4 +480,45 @@ public class TeacherCongressDelegateManageController { } + @At + @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_union::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(delegate.getSessionId()); + 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()); + dao.insert(userRole); + } + sysUserService.clearCache(); + } + return Result.success(); + } + + + } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java index 5b045d0c..b6ab83c9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java @@ -6,7 +6,6 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.constant.RoleConstant; @@ -24,8 +23,6 @@ import com.budwk.app.sys.models.Sys_user_role; import com.budwk.app.sys.views.View_user; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.Teacher_congress_delegate; -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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.Workbook; @@ -230,7 +227,7 @@ public class TeacherCongressDelegatePushZgAuditController { delegate.setSessionId(delegatePush.getSessionId()); - Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class, + /*Teacher_congress_delegation_unit delegation_unit = baseService.dao().fetch(Teacher_congress_delegation_unit.class, Cnd.where(Teacher_congress_delegation_unit::getUnitId, "=", user.getUnitId()) .and(Teacher_congress_delegation_union::getSessionId, "=", delegatePush.getSessionId())); @@ -239,7 +236,7 @@ public class TeacherCongressDelegatePushZgAuditController { userRole.setTcDelegationId(delegation_unit.getDelegationId()); } else { return Result.error(user.getUnitName() + "没有设置到代表团,请先在代表团管理里设置。"); - } + }*/ if ("正式代表".equals(delegatePush.getRepresentativeType())) { Sys_role sys_role = baseService.dao().fetch(Sys_role.class, Cnd.where(Sys_role::getCode, "=", RoleConstant.TEACHER_CONGRESS_DELEGATE_FORMAL.name())); delegate.setRoleId(sys_role.getId()); @@ -253,7 +250,7 @@ public class TeacherCongressDelegatePushZgAuditController { userRole.setUserId(user.getId()); userRole.setTcSessionId(delegatePush.getSessionId()); baseService.dao().insert(delegate); - baseService.dao().insert(userRole); +// baseService.dao().insert(userRole); // 去改改用户表的手机号 baseService.dao().update( diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java index 1ca62eee..5f3a0096 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java @@ -144,6 +144,33 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl + + 根据单位分配代表团 + 导入代表 新增代表 { + this.$axios.post(loc() + "/doAllocateDelegation", {sessionId: this.pageForm.sessionId}).then((res) => { + if (res.code === 0) { + this.$message.success(res.msg) + this.doSearch() + } + }) + }) + }, sessionChange() { this.pageForm.delegationId = null this.delegationOptions = []