From b835dcf59ce2b06720dbdb972f10a13d1d3712e4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 15:43:56 +0800
Subject: [PATCH] 标准库功能修改备份开发-查询标准库是否存在审核中状态
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 99 ++++++++++++++++----------------
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 13 ++++
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 7 ++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 17 +++++
4 files changed, 86 insertions(+), 50 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 1df9b55..fc11072 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.service.StandardMethodListService;
@@ -246,6 +248,11 @@
@PostMapping("/updateStandardProductListBatch")
public Result updateStandardProductListBatch(@RequestBody Map<String, Object> param) {
List<StandardProductList> standardProductList = (List<StandardProductList>) param.get("standardProductList");
+ if(CollectionUtils.isEmpty(standardProductList)){
+ for (StandardProductList productList : standardProductList) {
+ productList.setCheckStatus(StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
+ }
+ }
return Result.success(standardProductListService.updateBatchById(standardProductList));
}
@@ -268,4 +275,10 @@
standardProductListService.productListCheck(standardProductListUpdateRecord);
return Result.success();
}
+
+ @ApiOperation("鏌ヨ鏍囧噯搴撴槸鍚﹀瓨鍦ㄥ鏍镐腑鐘舵��")
+ @GetMapping("/productListCheck")
+ public Result existCheckingRecord(){
+ return Result.success(standardProductListService.existCheckingRecord());
+ }
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
index 7e42ecf..266945c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
@@ -77,4 +77,11 @@
* @param standardProductListUpdateRecord
*/
void productListCheck(StandardProductListUpdateRecord standardProductListUpdateRecord);
+
+ /**
+ * 鏌ヨ鏍囧噯搴撴槸鍚﹀瓨鍦ㄥ鏍镐腑鐘舵��
+ *
+ * @return
+ */
+ boolean existCheckingRecord();
}
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 691a547..ad901fd 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,6 +1,8 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.StandardMethodListMapper;
@@ -39,61 +41,58 @@
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
- // 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
- boolean workshopExist = existWorkShop(tree);
Map<String, List<?>> map = new HashMap<>();
- String str = "";
- List<StandardMethodList> standardMethodLists = new ArrayList<>();
+ String sampleType = ""; // 妫�楠屽璞�
+ // 鎷兼帴鏍�
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[4] + "\"";
- 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;
- }
+ map.put("standardMethodList", null);
+ if(trees == null && trees.length < 4){
+ return map;
+ }
+ StringBuilder checkItemQueryTree = new StringBuilder(); // 妫�鏌ラ」鏌ヨ
+ // 鍒ゆ柇鏄惁鍖呭惈杞﹂棿
+ boolean existWorkShopFlag = this.existWorkShop(tree);
+ // 杞﹂棿灞傜骇澶氫竴灞傜骇
+ if(existWorkShopFlag){
+ switch (trees.length) {
+ case 7:
+ sampleType = trees[4];
+ checkItemQueryTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\",\"").append(trees[6]).append("\"");
+ break;
+ case 6:
+ sampleType = trees[4];
+ checkItemQueryTree.append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
+ break;
+ case 5:
+ sampleType = trees[4];
+ checkItemQueryTree.append("\"").append(trees[4]).append("\"").append("]");
+ break;
}
}else {
- standardMethodLists.addAll(standardMethodListMapper.selectStandardMethodListsByNull(str));
+ switch (trees.length) {
+ case 6:
+ sampleType = trees[3];
+ checkItemQueryTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"");
+ break;
+ case 5:
+ sampleType = trees[3];
+ checkItemQueryTree.append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"");
+ break;
+ case 4:
+ sampleType = trees[3];
+ checkItemQueryTree.append("\"").append(trees[3]).append("\"").append("]");
+ break;
+ }
}
- map.put("standardMethodList", standardMethodLists);
+ if(StringUtils.isEmpty(checkItemQueryTree.toString())){
+ return map;
+ }
+ List<StandardMethodList> standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(checkItemQueryTree.toString());
+ // 鏌ヤ笉鍒版煡璇㈡鏌ュ璞�
+ if(CollectionUtils.isEmpty(standardMethodListArray)){
+ standardMethodListArray = standardMethodListMapper.selectStandardMethodLists(sampleType);
+ }
+ map.put("standardMethodList", standardMethodListArray);
return map;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 4ec53ee..f3effad 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -732,6 +732,23 @@
}
standardProductListUpdateRecordMapper.updateById(standardProductListUpdateRecord);
}
+
+ /**
+ * 鏌ヨ鏍囧噯搴撴槸鍚﹀瓨鍦ㄥ鏍镐腑鐘舵��
+ *
+ * @return
+ */
+ @Override
+ public boolean existCheckingRecord() {
+ QueryWrapper<StandardProductListUpdateRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ List<StandardProductListUpdateRecord> standardProductListUpdateRecordList = standardProductListUpdateRecordMapper.selectList(queryWrapper);
+ if(CollectionUtils.isEmpty(standardProductListUpdateRecordList)){
+ return false;
+ }else {
+ return true;
+ }
+ }
}
--
Gitblit v1.9.3