From 8bf9254ba43e744517d4de2516121da2979fd057 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 01 四月 2025 11:29:51 +0800
Subject: [PATCH] 1.检验项目参数导入 2.对象导入
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 101 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 21 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index aa95f5d..004efe5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -1,13 +1,17 @@
package com.ruoyi.basic.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.StandardMethodListMapper;
import com.ruoyi.basic.mapper.StandardProductListMapper;
+import com.ruoyi.basic.mapper.WorkShopMapper;
import com.ruoyi.basic.pojo.StandardMethodList;
import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.basic.pojo.WorkShop;
import com.ruoyi.basic.service.StandardMethodListService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -29,34 +33,66 @@
private StandardProductListMapper standardProductListMapper;
+ @Autowired
+ private WorkShopMapper workShopMapper;
+
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
- String[] trees = tree.split(" - ");
+ // 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
+ boolean workshopExist = existWorkShop(tree);
Map<String, List<?>> map = new HashMap<>();
String str = "";
List<StandardMethodList> standardMethodLists = new ArrayList<>();
- switch (trees.length){
- case 5:
- str += "\"" + trees[2] + "\",\"" + trees[3] + "\",\"" + trees[4] + "\"";
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\",\"" + trees[3] + "\""));
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\""));
- break;
- case 4:
- str += "\"" + trees[2] + "\",\"" + trees[3] + "\"";
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[2] + "\""));
- break;
- case 3:
- str += "\"" + trees[2] + "\"";
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists3(str));
- break;
- default:
- map.put("standardMethodList", null);
- return map;
+ String[] trees = tree.split(" - ");
+ if(trees != null && trees.length >= 4){
+ // 鍒ゆ柇鏄惁鏈夎溅闂�
+ if(workshopExist){
+ switch (trees.length - 4){
+ case 3:
+ str += "\"" + trees[4] + "\",\"" + trees[5] + "\",\"" + trees[6] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[4] + "\",\"" + trees[5] + "\""));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[4] + "\""));
+ break;
+ case 2:
+ str += "\"" + trees[4] + "\",\"" + trees[5] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[4] + "\""));
+ break;
+ case 1:
+ str += "\"" + trees[4] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists3(str));
+ break;
+ default:
+ map.put("standardMethodList", null);
+ return map;
+ }
+ }else {
+ switch (trees.length - 4){
+ case 2:
+ str += "\"" + trees[3] + "\",\"" + trees[4] + "\",\"" + trees[5] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[3] + "\",\"" + trees[4] + "\""));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[3] + "\""));
+ break;
+ case 1:
+ str += "\"" + trees[3] + "\",\"" + trees[5] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists(str));
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists("\"" + trees[3] + "\""));
+ break;
+ case 0:
+ str += "\"" + trees[3] + "\"";
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodLists3(str));
+ break;
+ default:
+ map.put("standardMethodList", null);
+ return map;
+ }
+ }
+ }else {
+ standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
}
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
map.put("standardMethodList", standardMethodLists);
return map;
}
@@ -70,6 +106,29 @@
public Integer getStandardMethodId(String code) {
return baseMapper.getStandardMethodId(code);
}
+
+ /**
+ * 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
+ *
+ * @param tree
+ * @return
+ */
+ @Override
+ public boolean existWorkShop(String tree){
+ QueryWrapper<WorkShop> queryWrapper = new QueryWrapper<>();
+ List<WorkShop> workShopList = workShopMapper.selectList(queryWrapper);
+ String[] trees = tree.split(" - ");
+ if(trees != null && trees.length > 0){
+ for (int i = 0; i < trees.length; i++) {
+ for (WorkShop workShop : workShopList) {
+ if(workShop.getName().equals(trees[i].trim())){
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3