From 6bffe5fa0883c7530d9297a4162dd949cc2c976d Mon Sep 17 00:00:00 2001 From: weizhong Date: Mon, 25 Aug 2025 01:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E7=8F=AD=E4=B8=BB=E4=BB=BB=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E4=BF=AE=E5=A4=8Dweiz=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssessmentApprovalController.java | 2 +- ...mzrAssessmentIndicatorTypeServiceImpl.java | 33 +++++- .../mapper/rs/training-permissions.sql | 45 -------- .../bzrkh/assessmentIndicatorType/index.vue | 81 +++++++++++-- .../views/bzrkh/teacherAssessment/index.vue | 106 ++++++++++++++---- .../bzrkh/teacherAssessment/submitDialog.vue | 2 +- 6 files changed, 184 insertions(+), 85 deletions(-) delete mode 100644 backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-permissions.sql diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java index 47fca4ab..34a5b64b 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java @@ -88,7 +88,7 @@ public class AssessmentApprovalController extends BaseController { /** * 批量审核拒绝 */ - @SaCheckPermission("bzrkh:assessmentApproval:reject") + @SaCheckPermission("bzrkh:assessmentApproval:approve") @Log(title = "班主任考核审核", businessType = BusinessType.UPDATE) @PostMapping("/batchReject") public R batchReject(@Validated @RequestBody BatchApprovalBo bo) { diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/service/impl/BmzrAssessmentIndicatorTypeServiceImpl.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/service/impl/BmzrAssessmentIndicatorTypeServiceImpl.java index 5e9ea970..0d5a2fe7 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/service/impl/BmzrAssessmentIndicatorTypeServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/service/impl/BmzrAssessmentIndicatorTypeServiceImpl.java @@ -83,11 +83,36 @@ public class BmzrAssessmentIndicatorTypeServiceImpl implements IBmzrAssessmentIn private LambdaQueryWrapper buildQueryWrapper(BmzrAssessmentIndicatorTypeBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getDeleted() != null, BmzrAssessmentIndicatorType::getDeleted, bo.getDeleted()); - lqw.like(StringUtils.isNotBlank(bo.getIndicatorTypeName()), BmzrAssessmentIndicatorType::getIndicatorTypeName, bo.getIndicatorTypeName()); - lqw.eq(StringUtils.isNotBlank(bo.getIndicatorTypeCode()), BmzrAssessmentIndicatorType::getIndicatorTypeCode, bo.getIndicatorTypeCode()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), BmzrAssessmentIndicatorType::getStatus, bo.getStatus()); + + // 添加调试日志 + log.info("构建查询条件 - 输入参数: indicatorTypeCode={}, indicatorTypeName={}, status={}, deleted={}", + bo.getIndicatorTypeCode(), bo.getIndicatorTypeName(), bo.getStatus(), bo.getDeleted()); + + // 默认只查询未删除的记录 + lqw.eq(BmzrAssessmentIndicatorType::getDeleted, 0); + + // 指标类型名称模糊查询 + if (StringUtils.isNotBlank(bo.getIndicatorTypeName())) { + lqw.like(BmzrAssessmentIndicatorType::getIndicatorTypeName, bo.getIndicatorTypeName()); + log.info("添加指标类型名称模糊查询条件: {}", bo.getIndicatorTypeName()); + } + + // 指标类型编码精确查询 + if (StringUtils.isNotBlank(bo.getIndicatorTypeCode())) { + lqw.eq(BmzrAssessmentIndicatorType::getIndicatorTypeCode, bo.getIndicatorTypeCode()); + log.info("添加指标类型编码精确查询条件: {}", bo.getIndicatorTypeCode()); + } + + // 状态查询 + if (StringUtils.isNotBlank(bo.getStatus())) { + lqw.eq(BmzrAssessmentIndicatorType::getStatus, bo.getStatus()); + log.info("添加状态查询条件: {}", bo.getStatus()); + } + + // 按创建时间排序 lqw.orderByAsc(BmzrAssessmentIndicatorType::getCreateTime); + + log.info("最终查询条件构建完成"); return lqw; } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-permissions.sql b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-permissions.sql deleted file mode 100644 index 80743863..00000000 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/training-permissions.sql +++ /dev/null @@ -1,45 +0,0 @@ --- 培训管理权限设置 --- 创建于 2025-07-23 - --- 培训课程管理权限 -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`) VALUES -(2111, '培训课程查询', 2110, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:course:query', '#', 1, NOW(), '培训课程查询权限'), -(2112, '培训课程新增', 2110, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:course:add', '#', 1, NOW(), '培训课程新增权限'), -(2113, '培训课程修改', 2110, 3, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:course:edit', '#', 1, NOW(), '培训课程修改权限'), -(2114, '培训课程删除', 2110, 4, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:course:remove', '#', 1, NOW(), '培训课程删除权限'), -(2115, '培训课程导出', 2110, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:course:export', '#', 1, NOW(), '培训课程导出权限'); - --- 培训申请管理权限 -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`) VALUES -(2121, '培训申请查询', 2110, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:query', '#', 1, NOW(), '培训申请查询权限'), -(2122, '培训申请新增', 2110, 7, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:add', '#', 1, NOW(), '培训申请新增权限'), -(2123, '培训申请修改', 2110, 8, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:edit', '#', 1, NOW(), '培训申请修改权限'), -(2124, '培训申请删除', 2110, 9, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:remove', '#', 1, NOW(), '培训申请删除权限'), -(2125, '培训申请导出', 2110, 10, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:export', '#', 1, NOW(), '培训申请导出权限'), -(2126, '培训申请列表', 2110, 11, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:application:list', '#', 1, NOW(), '培训申请列表权限'); - --- 培训审批管理权限 -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`) VALUES -(2131, '培训审批查询', 2110, 12, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:query', '#', 1, NOW(), '培训审批查询权限'), -(2132, '培训审批新增', 2110, 13, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:add', '#', 1, NOW(), '培训审批新增权限'), -(2133, '培训审批修改', 2110, 14, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:edit', '#', 1, NOW(), '培训审批修改权限'), -(2134, '培训审批删除', 2110, 15, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:remove', '#', 1, NOW(), '培训审批删除权限'), -(2135, '培训审批导出', 2110, 16, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:export', '#', 1, NOW(), '培训审批导出权限'), -(2136, '培训审批处理', 2110, 17, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:process', '#', 1, NOW(), '培训审批处理权限'), -(2137, '培训审批列表', 2110, 18, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:approval:list', '#', 1, NOW(), '培训审批列表权限'); - --- 培训记录管理权限 -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `remark`) VALUES -(2141, '培训记录查询', 2110, 19, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:query', '#', 1, NOW(), '培训记录查询权限'), -(2142, '培训记录新增', 2110, 20, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:add', '#', 1, NOW(), '培训记录新增权限'), -(2143, '培训记录修改', 2110, 21, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:edit', '#', 1, NOW(), '培训记录修改权限'), -(2144, '培训记录删除', 2110, 22, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:remove', '#', 1, NOW(), '培训记录删除权限'), -(2145, '培训记录导出', 2110, 23, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:export', '#', 1, NOW(), '培训记录导出权限'), -(2146, '培训记录列表', 2110, 24, '', NULL, NULL, 1, 0, 'F', '0', '0', 'rs:training:record:list', '#', 1, NOW(), '培训记录列表权限'); - --- 为管理员角色赋予培训管理所有权限 -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES -(1, 2111), (1, 2112), (1, 2113), (1, 2114), (1, 2115), -(1, 2121), (1, 2122), (1, 2123), (1, 2124), (1, 2125), (1, 2126), -(1, 2131), (1, 2132), (1, 2133), (1, 2134), (1, 2135), (1, 2136), (1, 2137), -(1, 2141), (1, 2142), (1, 2143), (1, 2144), (1, 2145), (1, 2146); \ No newline at end of file diff --git a/web/src/views/bzrkh/assessmentIndicatorType/index.vue b/web/src/views/bzrkh/assessmentIndicatorType/index.vue index f7f90cfe..d77e7ea9 100644 --- a/web/src/views/bzrkh/assessmentIndicatorType/index.vue +++ b/web/src/views/bzrkh/assessmentIndicatorType/index.vue @@ -185,13 +185,51 @@ const data = reactive { + console.log('🔍 搜索按钮点击，当前查询参数:', { + indicatorTypeCode: queryParams.value.indicatorTypeCode, + indicatorTypeName: queryParams.value.indicatorTypeName, + status: queryParams.value.status, + pageNum: queryParams.value.pageNum, + pageSize: queryParams.value.pageSize + }); + + queryParams.value.pageNum = 1; + getList(); +}; + /** 查询班主任考核指标类型列表 */ const getList = async () => { loading.value = true; - const res = await listAssessmentIndicatorType(queryParams.value); - assessmentIndicatorTypeList.value = res.rows; - total.value = res.total; - loading.value = false; + + // 构建查询参数，过滤掉undefined和null值 + const queryData = { + pageNum: queryParams.value.pageNum, + pageSize: queryParams.value.pageSize, + ...(queryParams.value.indicatorTypeCode && { indicatorTypeCode: queryParams.value.indicatorTypeCode }), + ...(queryParams.value.indicatorTypeName && { indicatorTypeName: queryParams.value.indicatorTypeName }), + ...(queryParams.value.status && { status: queryParams.value.status }) + }; + + console.log('📋 发送查询请求，参数:', queryData); + + try { + const res = await listAssessmentIndicatorType(queryData); + console.log('📊 查询结果:', { + total: res.total, + dataCount: res.rows?.length, + firstItem: res.rows?.[0] + }); + + assessmentIndicatorTypeList.value = res.rows; + total.value = res.total; + } catch (error) { + console.error('❌ 查询失败:', error); + proxy?.$modal.msgError('查询失败，请检查网络连接'); + } finally { + loading.value = false; + } }; /** 取消按钮 */ @@ -206,16 +244,28 @@ const reset = () => { assessmentIndicatorTypeFormRef.value?.resetFields(); }; -/** 搜索按钮操作 */ -const handleQuery = () => { - queryParams.value.pageNum = 1; - getList(); -}; - /** 重置按钮操作 */ const resetQuery = () => { + console.log('🔄 重置查询参数'); + + // 重置表单字段 queryFormRef.value?.resetFields(); - handleQuery(); + + // 手动重置查询参数对象 + queryParams.value.indicatorTypeCode = undefined; + queryParams.value.indicatorTypeName = undefined; + queryParams.value.status = undefined; + queryParams.value.pageNum = 1; + + console.log('🔄 重置后的查询参数:', { + indicatorTypeCode: queryParams.value.indicatorTypeCode, + indicatorTypeName: queryParams.value.indicatorTypeName, + status: queryParams.value.status, + pageNum: queryParams.value.pageNum + }); + + // 重新查询 + getList(); }; /** 多选框选中数据 */ @@ -285,6 +335,15 @@ const handleDelete = async (row?: AssessmentIndicatorTypeVO) => { }; onMounted(() => { + console.log('🚀 页面初始化，开始加载数据'); + console.log('📋 初始查询参数:', { + indicatorTypeCode: queryParams.value.indicatorTypeCode, + indicatorTypeName: queryParams.value.indicatorTypeName, + status: queryParams.value.status, + pageNum: queryParams.value.pageNum, + pageSize: queryParams.value.pageSize + }); + getList(); }); diff --git a/web/src/views/bzrkh/teacherAssessment/index.vue b/web/src/views/bzrkh/teacherAssessment/index.vue index 598b7b34..491eef44 100644 --- a/web/src/views/bzrkh/teacherAssessment/index.vue +++ b/web/src/views/bzrkh/teacherAssessment/index.vue @@ -75,7 +75,7 @@ {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - +