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 | 88 ++++++++++++++++++++-----------------------
1 files changed, 41 insertions(+), 47 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 327b8f3..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,14 +2,12 @@
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.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
@@ -53,16 +51,8 @@
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
- public Result addStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.addStandardTree(standardTree));
- }
-
- @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
- @PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
- Integer standardId = (Integer) map.get("standardId");
- String tree = (String) map.get("tree");
- return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
+ public Result addStandardTree(@RequestBody ModelAddDto modelAddDto) {
+ return Result.success(standardTreeService.addStandardTree(modelAddDto));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@@ -87,31 +77,10 @@
return Result.success(standardProductListService.updateSection(list));
}
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @DeleteMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id) {
- return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
- }
-
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @DeleteMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids) {
- JSONArray lists = JSON.parseArray(ids);
- return Result.success(standardProductListService.delStandardProduct(lists));
- }
-
- @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/addStandardProduct")
- public Result addStandardProduct(@RequestBody Map<String, String> map) {
- String ids = map.get("ids");
- String tree = map.get("tree");
- return Result.success(standardTreeService.addStandardProduct(ids, tree));
- }
-
@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 = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
@@ -122,8 +91,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
+ public Result selectStandardProductListByMethodId(Integer id, String tree) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
@@ -144,7 +113,7 @@
return Result.success(standardMethodListService.selectStandardMethodEnum());
}
- @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灦鏋勬爲")
@GetMapping("/getStandardTree2")
public Result getStandardTree2() {
return Result.success(standardTreeService.getStandardTree2());
@@ -253,14 +222,14 @@
@ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
@DeleteMapping("/deleteProductSupplierAsk")
public Result deleteProductSupplierAsk(Integer supplierAskId) {
- standardProductListSupplierAskService.removeById(supplierAskId);
+ standardProductListSupplierAskService.deleteProductSupplierAsk(supplierAskId);
return Result.success();
}
- @ApiOperation(value = "淇敼鏍囧噯鏍�")
+ @ApiOperation(value = "淇敼鍨嬪彿")
@PostMapping("/updateStandardTree")
- public Result updateStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.updateStandardTree(standardTree));
+ public Result updateStandardTree(@RequestBody ModelAddDto modelAddDto) {
+ return Result.success(standardTreeService.updateStandardTree(modelAddDto));
}
@ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎鍒跺姣�")
@@ -279,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));
}
@@ -287,4 +261,24 @@
public Result copyStandardProductSort(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」鎻愪氦")
+ @PostMapping("/productListSubmit")
+ public Result productListSubmit(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListSubmit(standardProductListUpdateRecord);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」瀹℃牳")
+ @PostMapping("/productListCheck")
+ public Result productListCheck(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListCheck(standardProductListUpdateRecord);
+ return Result.success();
+ }
+
+ @ApiOperation("鏌ヨ鏍囧噯搴撴槸鍚﹀瓨鍦ㄥ鏍镐腑鐘舵��")
+ @GetMapping("/existCheckingRecord")
+ public Result existCheckingRecord(){
+ return Result.success(standardProductListService.existCheckingRecord());
+ }
}
--
Gitblit v1.9.3