diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java index bac0c2c..ed6782f 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java @@ -8,6 +8,7 @@ import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.excel.core.DefaultExcelListener; import org.dromara.common.excel.core.ExcelResult; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -47,9 +48,8 @@ public class QcInspectionItemCategoryController extends BaseController { */ @SaCheckPermission("qms:qcInspectionItemCategory:list") @GetMapping("/list") - public R> list(QcInspectionItemCategoryBo bo) { - List list = qcInspectionItemCategoryService.queryList(bo); - return R.ok(list); + public TableDataInfo list(QcInspectionItemCategoryBo bo, PageQuery pageQuery) { + return qcInspectionItemCategoryService.queryPageList(bo, pageQuery); } /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java index d345ea9..4473584 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionItemCategory.java @@ -24,6 +24,7 @@ public class QcInspectionItemCategory extends TenantEntity { /** * 检测项类别主键 */ + @TableId(value = "category_id", type = IdType.ASSIGN_ID) private Long categoryId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java index 166f3e7..5e9e7ca 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcInspectionItemCategoryService.java @@ -1,5 +1,7 @@ package org.dromara.qms.service; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.qms.domain.QcInspectionItemCategory; import org.dromara.qms.domain.vo.QcInspectionItemCategoryVo; import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; @@ -32,6 +34,15 @@ public interface IQcInspectionItemCategoryService { */ List queryList(QcInspectionItemCategoryBo bo); + /** + * 分页查询检测项类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项类别分页列表 + */ + TableDataInfo queryPageList(QcInspectionItemCategoryBo bo, PageQuery pageQuery); + /** * 新增检测项类别 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java index 39efa05..aa1863f 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionItemCategoryServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.qms.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -7,6 +8,8 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.qms.domain.QcInspectionType; import org.springframework.stereotype.Service; import org.dromara.qms.domain.bo.QcInspectionItemCategoryBo; @@ -43,6 +46,19 @@ public class QcInspectionItemCategoryServiceImpl implements IQcInspectionItemCat return baseMapper.selectVoById(categoryId); } + /** + * 分页查询检测项类别列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 检测项类别分页列表 + */ + @Override + public TableDataInfo queryPageList(QcInspectionItemCategoryBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } /** * 查询符合条件的检测项类别列表 @@ -60,11 +76,9 @@ public class QcInspectionItemCategoryServiceImpl implements IQcInspectionItemCat Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(QcInspectionItemCategory.class) .selectAll(QcInspectionItemCategory.class) - // 查询检测类型列表 .select(QcInspectionType::getTypeName) .leftJoin(QcInspectionType.class, QcInspectionType::getTypeId, QcInspectionItemCategory::getTypeId) - .eq(bo.getCategoryId() != null, QcInspectionItemCategory::getCategoryId, bo.getCategoryId()) .eq(bo.getParentId() != null, QcInspectionItemCategory::getParentId, bo.getParentId()) .eq(StringUtils.isNotBlank(bo.getAncestors()), QcInspectionItemCategory::getAncestors, bo.getAncestors()) @@ -72,7 +86,7 @@ public class QcInspectionItemCategoryServiceImpl implements IQcInspectionItemCat .like(StringUtils.isNotBlank(bo.getCategoryName()), QcInspectionItemCategory::getCategoryName, bo.getCategoryName()) .eq(bo.getTypeId() != null, QcInspectionItemCategory::getTypeId, bo.getTypeId()) .eq(StringUtils.isNotBlank(bo.getDescription()), QcInspectionItemCategory::getDescription, bo.getDescription()) - .orderByDesc(QcInspectionItemCategory::getCreateTime); + .orderByAsc(QcInspectionItemCategory::getCreateTime); return lqw; }