Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/MaterialClassifyService.java

@@ -1,11 +1,11 @@
package com.gkhy.safePlatform.equipment.service;

import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyDO;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyAddReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyModReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyDto;
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyStockDto;

@@ -18,13 +18,15 @@

    ResultVO update(ContextCacheUser currentUser, SafeMaterialClassifyModReq req);

    ResultVO delete(Long id);
    ResultVO delete(ContextCacheUser currentUser,Long id);

    SafeMaterialClassifyDto queryById(Long id);
    SafeMaterialClassifyDto queryById(ContextCacheUser currentUser,Long id);

    SafeMaterialClassifyDO getBigAndSmallClassifyInfo(Long smallClassifyId);
    List<SafeMaterialClassifyDto> getClassifyListByIds(List<Long> ids);

    List<SafeMaterialClassifyDO> getTraceabilityClassifyList(List<Long> smallClassifyIds);

    SearchResultVO<List<SafeMaterialClassifyDto>> listByPage(ContextCacheUser currentUser,PageQuery<MaterialClassifyQuery> pageQuery);

}