From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Fri, 23 Dec 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java
index a5a0d15..ff9cabb 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java
@@ -1,18 +1,23 @@
package com.gkhy.safePlatform.equipment.service.baseService.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.utils.StringUtils;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialClassifyInfo;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialInfo;
+import com.gkhy.safePlatform.equipment.entity.*;
+import com.gkhy.safePlatform.equipment.enums.IssueReceiptEnum;
+import com.gkhy.safePlatform.equipment.enums.ValidStatusEnum;
import com.gkhy.safePlatform.equipment.excepiton.EquipmentException;
+import com.gkhy.safePlatform.equipment.model.dto.req.MaterialClassifyQuery;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery;
import com.gkhy.safePlatform.equipment.repository.SafeMaterialClassifyInfoRepository;
import com.gkhy.safePlatform.equipment.service.baseService.SafeMaterialClassifyInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.io.InputStream;
import java.util.List;
@Service("SafeMaterialClassifyInfoService")
@@ -47,17 +52,68 @@
return repository.queryById(id);
}
@Override
- public List<SafeMaterialClassifyInfo> listByCondition(SafeMaterialClassifyQuery query){
+ public List<SafeMaterialClassifyInfo> list(){
List<SafeMaterialClassifyInfo> list = repository.selectList(new LambdaQueryWrapper<SafeMaterialClassifyInfo>()
.eq(SafeMaterialClassifyInfo::getDelFlag, 0)
- .like(StringUtils.isNotBlank(query.getMaterialClassifyName()), SafeMaterialClassifyInfo::getMaterialClassifyName, query.getMaterialClassifyName())
);
return list;
}
@Override
- public List<SafeMaterialClassifyInfo> getList(){
- List<SafeMaterialClassifyInfo> list = repository.selectList(new LambdaQueryWrapper<SafeMaterialClassifyInfo>());
+ public List<SafeMaterialClassifyInfo> getParentList(){
+ List<SafeMaterialClassifyInfo> list = repository.selectList(new LambdaQueryWrapper<SafeMaterialClassifyInfo>()
+ .eq(SafeMaterialClassifyInfo::getDelFlag,0)
+ .eq(SafeMaterialClassifyInfo::getParentId,0l));
return list;
}
+
+ @Override
+ public List<SafeMaterialClassifyInfo> getListByParentId(Long parentId) {
+ if(null == parentId){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ return repository.getListByParentId(parentId);
+ }
+
+ @Override
+ public SafeMaterialClassifyDO getBigAndSmallClassify(Long smallClassifyId) {
+ if(null == smallClassifyId){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ return repository.getBigAndSmallClassify(smallClassifyId);
+ }
+
+ @Override
+ public List<SafeMaterialClassifyInfo> getClassifyListByIds(List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ return repository.selectList(new LambdaQueryWrapper<SafeMaterialClassifyInfo>()
+ .eq(SafeMaterialClassifyInfo::getDelFlag,0)
+ .in(SafeMaterialClassifyInfo::getId,ids)
+ );
+ }
+
+ @Override
+ public List<SafeMaterialClassifyDO> getTraceabilityClassifyList(List<Long> smallClassifyIds) {
+ if(CollectionUtils.isEmpty(smallClassifyIds)){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ return repository.getTraceabilityClassifyList(smallClassifyIds);
+ }
+
+ @Override
+ public List<SafeMaterialClassifyInfo> listByPage(Page<SafeMaterialClassifyInfo> page, MaterialClassifyQuery query) {
+ return repository.listByConditions(page,query);
+ }
+
+ @Override
+ public List<SafeMaterialClassifyInfo> getListByParentIds(List<Long> parentIdList) {
+ if (CollectionUtils.isEmpty(parentIdList)){
+ throw new EquipmentException(ResultCodes.CLIENT_PARAM_NULL);
+ }
+ return repository.getListByParentIds(parentIdList);
+ }
+
+
}
--
Gitblit v1.9.2