From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001 From: zhangfeng <1603559716@qq.com> Date: 星期五, 23 十二月 2022 08:55:23 +0800 Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf --- equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialClassifyInfoService.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialClassifyInfoService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialClassifyInfoService.java index ba1af0a..de04439 100644 --- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialClassifyInfoService.java +++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialClassifyInfoService.java @@ -1,7 +1,11 @@ package com.gkhy.safePlatform.equipment.service.baseService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyDO; import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyInfo; +import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyStockDO; +import com.gkhy.safePlatform.equipment.model.dto.req.MaterialClassifyQuery; import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery; import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyDto; @@ -15,7 +19,19 @@ int update(SafeMaterialClassifyInfo classifyInfo); - List<SafeMaterialClassifyInfo> listByCondition(SafeMaterialClassifyQuery query); + List<SafeMaterialClassifyInfo> list(); - List<SafeMaterialClassifyInfo> getList(); + List<SafeMaterialClassifyInfo> getParentList(); + + List<SafeMaterialClassifyInfo> getListByParentId(Long parentId); + + SafeMaterialClassifyDO getBigAndSmallClassify(Long smallClassifyId); + + List<SafeMaterialClassifyInfo> getClassifyListByIds(List<Long> smallClassifyIds); + + List<SafeMaterialClassifyDO> getTraceabilityClassifyList(List<Long> smallClassifyIds); + + List<SafeMaterialClassifyInfo> listByPage(Page<SafeMaterialClassifyInfo> page, MaterialClassifyQuery query); + + List<SafeMaterialClassifyInfo> getListByParentIds(List<Long> parentIdList); } -- Gitblit v1.9.2