From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 18:10:01 +0800
Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错)
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index d5668e2..964f93a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -11,6 +11,7 @@
import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
+import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
@@ -24,7 +25,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -52,12 +52,14 @@
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
+ //鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
@ValueClassify("妫�楠屼笅鍗�")
- @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
- @PostMapping("/selectAllInsOrder")
- public Result selectAllInsOrder(){
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋楠屽崟")
+ @PostMapping("/selectAllInsOrderParameter")
+ public Result selectAllInsOrderParameter() {
return Result.success();
}
+
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "妫�楠屽垎閰�")
@@ -168,10 +170,29 @@
return Result.success();
}
+ //寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
+ @ValueAuth
+ @PostMapping("/selectNoProducts")
+ public Result<?> selectNoProducts(@RequestBody Map<String, Object> data,Integer orderId ,String ids) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ InsProduct insProduct = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsProduct.class);
+ return Result.success(insProductService.selectNoProducts(page, insProduct,orderId,ids));
+ }
+
+
+ @ApiOperation(value = "寰呮鐨勬挙閿�")
@PutMapping("/updateInspected")
@ValueAuth
- public Result<?> updateInspected(Integer id){
- insProductService.updateInspected(id);
+ public Result<?> updateInspected(Integer orderId,String ids){
+ insProductService.updateInspected(orderId,ids);
+ return Result.success();
+ }
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
+ @PostMapping("/checkUpdate")
+ public Result<?> checkUpdate(Integer orderId,Integer state){
+ insProductService.checkUpdate(orderId,state);
return Result.success();
}
--
Gitblit v1.9.3