查询工艺能力接口增加supplierId，供应商id

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CraftAbilityController.java

@@ -304,8 +304,8 @@ public class CraftAbilityController extends BladeController {
 	@GetMapping("/findList")
 	@ApiOperationSupport(order = 2)
 	@Operation(summary = "列表", description  = "传入CraftAbility")
-	public R<List<CraftAbilityEntity>> findList() {
-		List<CraftAbilityEntity> list = craftAbilityService.list();
+	public R<List<CraftAbilityEntity>> findList(@RequestParam(required = false ,name = "supplierId") String supplierId) {
+		List<CraftAbilityEntity> list = craftAbilityService.listByParams(supplierId);
 		return R.data(list);
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICraftAbilityService.java

@@ -73,4 +73,6 @@ public interface ICraftAbilityService extends BaseService<CraftAbilityEntity> {
 	 * @return
 	 */
 	CraftAbilityEntity selectByCaCode(String caCode);
+
+	List<CraftAbilityEntity> listByParams(String supplierId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CraftAbilityServiceImpl.java

@@ -25,18 +25,25 @@
  */
 package org.springblade.desk.basic.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.annotation.Resource;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.basic.excel.CraftAbilityExcel;
 import org.springblade.desk.basic.mapper.CraftAbilityMapper;
+import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.vo.CraftAbilityVO;
 import org.springblade.desk.basic.service.ICraftAbilityService;
 
+import org.springblade.desk.basic.service.IOemService;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 工艺能力 服务实现类
@@ -46,7 +53,9 @@ import java.util.List;
  */
 @Service
 public class CraftAbilityServiceImpl extends BaseServiceImpl<CraftAbilityMapper, CraftAbilityEntity> implements ICraftAbilityService {
-
+	@Lazy
+	@Resource
+	private IOemService oemService;
 	@Override
 	public IPage<CraftAbilityVO> selectCraftAbilityPage(IPage<CraftAbilityVO> page, CraftAbilityVO craftAbility) {
 		return page.setRecords(baseMapper.selectCraftAbilityPage(page, craftAbility));
@@ -72,4 +81,24 @@ public class CraftAbilityServiceImpl extends BaseServiceImpl<CraftAbilityMapper,
 		return baseMapper.selectByCaCode(caCode);
 	}
 
+	@Override
+	public List<CraftAbilityEntity> listByParams(String supplierId) {
+		//供应商id 非必传 根据供应商id查询供应商信息获取工艺能力id字段 工艺能力id以逗号分割 若为空 直接返回
+		if (StrUtil.isNotEmpty(supplierId)) {
+			Oem supplier = oemService.getById(supplierId);
+			if (BeanUtil.isEmpty(supplier) || Objects.isNull(supplier.getCraftAbilityId())) {
+				return new ArrayList<>();
+			}
+			Set<String> craftAbilityIds = Arrays.stream(supplier.getCraftAbilityId().split(","))
+					.map(String::trim)
+					.filter(cn.hutool.core.util.StrUtil::isNotEmpty)
+					.collect(Collectors.toSet());
+			if (craftAbilityIds.isEmpty()) {
+				return new ArrayList<>();
+			}
+			return listByIds(craftAbilityIds);
+		}
+		return list();
+	}
+
 }