From c19ee12f4c09ae2989f1b187d3a911bf2f9f405e Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 14 Oct 2026 17:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E6=A1=88=E9=97=AE=E9=A2=98=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProposalFeedbackEvaluationController.java | 6 ++-- ...acherCongressDelegateManageController.java | 36 +++---------------- .../TeacherCongressDelegateService.java | 9 +++++ .../TeacherCongressDelegateServiceImpl.java | 30 ++++++++++++++++ .../teachercongress/delegate/manage/adjust.js | 27 ++++++++------ 5 files changed, 62 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java index 4b1f27f8..27357911 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalFeedbackEvaluationController.java @@ -95,9 +95,9 @@ public class ProposalFeedbackEvaluationController { Cnd cnd = Cnd.NEW(); cnd.and("t.taskName", "=", "feedback"); - if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - } + /* if (!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())) { + }*/ + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); 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 9411a930..d558cba8 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 @@ -36,7 +36,6 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.*; import org.nutz.dao.sql.Sql; import org.nutz.dao.util.Daos; -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; @@ -201,43 +200,16 @@ public class TeacherCongressDelegateManageController { } /** - * 代表调整搜索用户 + * 按姓名或工号搜索可添加到代表调整列表的人员。 * - * @param param - * @return + * @param param sessionId 为必填的目标届次ID；keyWord 为必填的姓名或工号关键字，候选人员不限定为本届已有代表 + * @return Result，其 data 为最多10条人员记录；id、userId 均为用户ID，userName、loginName、sex、unionName、unitName 分别为姓名、工号、性别、工会和单位 */ @At @SaCheckPermission("tc.delegate.manage") @Ok("json:{ignoreNull:true}") public Result adjustUserList(@Valid TeacherCongressDelegateManageSearchAdjustUserParam param) { -// Dao extDao = Daos.ext(dao, FieldFilter.create(Teacher_congress_delegate.class, "^id|userId|userName|loginName|unitName$")); -// SqlExpressionGroup seg = new SqlExpressionGroup(); -// seg.orLike("userName", param.getKeyWord()); -// seg.orLike("loginName", param.getKeyWord()); -// List list = extDao.query(Teacher_congress_delegate.class, Cnd.where("sessionId", "=", param.getSessionId()).and(seg).limit(1, 10)); -// return Result.success(list); - Sql sql = Sqls.create(""" - SELECT - u.id, - u.id AS userId, - u.username AS userName, - u.loginname AS loginName, - u.sex, - u.unionName, - u.unitName - FROM - vw_user u - LEFT JOIN teacher_congress_delegate tcd ON tcd.userId = u.id - $condition - """); - Cnd cnd = Cnd.NEW(); - SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.orLike("u.username", param.getKeyWord()); - seg.orLike("u.loginname", param.getKeyWord()); - cnd.and(seg); - sql.setCondition(cnd); - Pagination pagination = sysUserService.listPageMap(1, 10, sql); - return Result.success(pagination.getList()); + return Result.success(teacherDelegateService.listAdjustUsers(param)); } /** 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 2d1f2366..209d8003 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 @@ -5,6 +5,7 @@ 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 com.budwk.app.zhgh.democratic.teachercongress.delegate.param.TeacherCongressDelegateManageSearchAdjustUserParam; import org.nutz.lang.util.NutMap; import javax.servlet.http.HttpServletResponse; @@ -31,6 +32,14 @@ public interface TeacherCongressDelegateService extends BaseService listPublicUsers(TeacherCongressDelegateManagePublicUserParam param); + /** + * 按姓名或工号搜索代表调整候选人员，包含尚未成为本届代表的用户。 + * + * @param param sessionId 为目标届次ID，不用于限制候选人员；keyWord 为姓名或工号关键字 + * @return 最多10条人员记录；id、userId 均为用户ID，userName、loginName、sex、unionName、unitName 分别为姓名、工号、性别、工会和单位 + */ + List listAdjustUsers(TeacherCongressDelegateManageSearchAdjustUserParam param); + /** * 根据系统配置的单位或分工会组成关系，为尚未归团的代表自动分配代表团。 * 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 ec3df4ae..0ca66e5e 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 @@ -21,6 +21,7 @@ import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonServi 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.param.TeacherCongressDelegateManageSearchAdjustUserParam; 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; @@ -107,6 +108,35 @@ public class TeacherCongressDelegateServiceImpl extends BaseServiceImpl listAdjustUsers(TeacherCongressDelegateManageSearchAdjustUserParam param) { + Sql sql = Sqls.create(""" + SELECT + u.id, + u.id AS userId, + u.username AS userName, + u.loginname AS loginName, + u.sex, + u.unionName, + u.unitName + FROM vw_user u + $condition + """); + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("u.username", param.getKeyWord()); + seg.orLike("u.loginname", param.getKeyWord()); + sql.setCondition(Cnd.NEW().and(seg)); + // 下拉候选列表沿用最多10条的限制，不依赖代表记录数量。 + sql.setPager(dao().createPager(1, 10)); + return listMap(sql); + } + /** * 为当前届次未归团代表批量解析代表团，同时刷新其届次代表角色，避免重复生成角色关系。 */ diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/adjust.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/adjust.js index b62281ad..733cd805 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/adjust.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/adjust.js @@ -16,17 +16,22 @@ :value="item.id"> - - - 添加到待调整列表 + + +
+
+ +
+ 添加到待调整列表 +