From cf396d3076a064998fbac84f76861f5ed918c5e5 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:18:34 +0800
Subject: [PATCH] minio修改
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..ec38fa5 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;
@@ -77,8 +79,8 @@
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@DeleteMapping("/delStandardTree")
- public Result delStandardTree(String tree) {
- return Result.success(standardTreeService.delStandardTree(tree));
+ public Result delStandardTree(String level, String id) {
+ return Result.success(standardTreeService.delStandardTree(level,id));
}
@ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
@@ -220,7 +222,7 @@
@ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
@DeleteMapping("/deleteProductSupplierAsk")
public Result deleteProductSupplierAsk(Integer supplierAskId) {
- standardProductListSupplierAskService.removeById(supplierAskId);
+ standardProductListSupplierAskService.deleteProductSupplierAsk(supplierAskId);
return Result.success();
}
@@ -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("/existCheckingRecord")
+ public Result existCheckingRecord(){
+ return Result.success(standardProductListService.existCheckingRecord());
+ }
}
--
Gitblit v1.9.3