From b16301a671e4be56c3f1317ec288ec21353a0621 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 24 Jul 2025 17:29:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(qms):=20=E9=87=8D=E6=9E=84=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/service/IQcInspectionMainService.java | 68 ++++--------------- .../service/IQcInspectionResultService.java | 4 +- .../impl/QcInspectionItemServiceImpl.java | 1 + 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java index f4a60ee..6dc49e8 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionMainService.java @@ -2,7 +2,6 @@ package org.dromara.qms.service; import org.dromara.qms.domain.QcInspectionMain; import org.dromara.qms.domain.vo.QcInspectionMainVo; -import org.dromara.qms.domain.vo.QcInspectionResultVo; import org.dromara.qms.domain.bo.QcInspectionMainBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -11,101 +10,60 @@ import java.util.Collection; import java.util.List; /** - * 质检主表Service接口 + * 质检任务Service接口 * * @author zch - * @date 2025-07-14 + * @date 2025-07-24 */ public interface IQcInspectionMainService { /** - * 查询质检主表 + * 查询质检任务 * * @param inspectionId 主键 - * @return 质检主表 + * @return 质检任务 */ QcInspectionMainVo queryById(Long inspectionId); /** - * 分页查询质检主表列表 + * 分页查询质检任务列表 * * @param bo 查询条件 * @param pageQuery 分页参数 - * @return 质检主表分页列表 + * @return 质检任务分页列表 */ TableDataInfo queryPageList(QcInspectionMainBo bo, PageQuery pageQuery); /** - * 查询符合条件的质检主表列表 + * 查询符合条件的质检任务列表 * * @param bo 查询条件 - * @return 质检主表列表 + * @return 质检任务列表 */ List queryList(QcInspectionMainBo bo); /** - * 新增质检主表 + * 新增质检任务 * - * @param bo 质检主表 + * @param bo 质检任务 * @return 是否新增成功 */ Boolean insertByBo(QcInspectionMainBo bo); /** - * 修改质检主表 + * 修改质检任务 * - * @param bo 质检主表 + * @param bo 质检任务 * @return 是否修改成功 */ Boolean updateByBo(QcInspectionMainBo bo); /** - * 校验并批量删除质检主表信息 + * 校验并批量删除质检任务信息 * * @param ids 待删除的主键集合 * @param isValid 是否进行有效性校验 * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 分页查询未处理质检任务列表 (for PDA) - */ - TableDataInfo queryPageUnprocessedTasks(QcInspectionMainBo bo, PageQuery pageQuery); - - /** - * 查询质检详情包括子表检测项 (for PDA) - */ - QcInspectionMainVo queryByIdWithResults(Long inspectionId); - - /** - * 提交质检结果 (for PDA), 更新并如果不合格生成评审 - */ - Boolean submitInspectionResult(QcInspectionMainBo bo); - - /** - * 分页查询质检任务历史记录 (for PDA) - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 质检任务历史分页列表 - */ - TableDataInfo queryPageTaskHistory(QcInspectionMainBo bo, PageQuery pageQuery); - - /** - * 分页查询用户分派的质检任务 (for PDA) - * - * @param inspector 检测人员 - * @param pageQuery 分页参数 - * @return 用户质检任务分页列表 - */ - TableDataInfo queryPageUserTasks(String inspector, PageQuery pageQuery); - - /** - * 验证质检数据的完整性和业务规则 (for PDA) - * - * @param bo 质检数据 - * @return 验证是否通过 - */ - Boolean validateInspectionData(QcInspectionMainBo bo); } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java index b39286e..6d27f71 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionResultService.java @@ -12,8 +12,8 @@ import java.util.List; /** * 质检结果子表Service接口 * - * @author Yinq - * @date 2025-07-14 + * @author zch + * @date 2025-07-24 */ public interface IQcInspectionResultService { diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java index e62bd82..bd87613 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemServiceImpl.java @@ -92,6 +92,7 @@ public class QcInspectionItemServiceImpl implements IQcInspectionItemService { .select(QcInspectionItemCategory::getCategoryName) .leftJoin(QcInspectionItemCategory.class,QcInspectionItemCategory::getCategoryId,QcInspectionItem::getCategoryId) + //检测项类别名称 .select(QcInspectionType::getTypeName,QcInspectionType::getTypeCode) .leftJoin(QcInspectionType.class,QcInspectionType::getTypeId,QcInspectionItem::getInspectionType)