From e78cc56f04556a1d3d54f0db830ba9f16eb28a58 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 03 八月 2024 21:40:53 +0800
Subject: [PATCH] 检验下单待检撤销+删除检验值结论还在

---
 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 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 361b748..e659d28 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;
@@ -23,6 +24,7 @@
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -50,18 +52,12 @@
         return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
     }
 
-    @ValueClassify("妫�楠屼笅鍗�")
-    @ApiOperation(value = "鏌ョ湅鎵�鏈夋楠屽崟")
-    @PostMapping("/selectAllInsOrder")
-    public Result selectAllInsOrder(){
-        return Result.success();
-    }
 
     @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "妫�楠屽垎閰�")
     @PostMapping("/upInsOrder")
-    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
-        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
+    public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
+        return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
     }
     @ValueClassify("妫�楠屼笅鍗�")
     @ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@@ -80,7 +76,7 @@
     @ValueAuth
     public Result<?> selectOrderManDay(Integer id) {
         int day = insProductService.selectOrderManDay(id);
-        return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
     }
 
     @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -109,8 +105,8 @@
     @ApiOperation(value = "鏌ヨ妫�楠屽崟妯℃澘")
     @GetMapping("/selectInsOrderTemplate")
     @ValueAuth
-    public Result<?> selectInsOrderTemplate() {
-        return Result.success(insOrderTemplateService.selectInsOrderTemplate());
+    public Result<?> selectInsOrderTemplate(String company) {
+        return Result.success(insOrderTemplateService.selectInsOrderTemplate(company));
     }
 
     @ApiOperation(value = "閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭")
@@ -142,6 +138,15 @@
         CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
         return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
     }
+
+    @ValueAuth
+    @ApiOperation(value = "璐圭敤缁熻鑾峰彇鎬讳环")
+    @PostMapping("/costStatistics2")
+    public Result<?> costStatistics2(@RequestBody Map<String, Object> data) throws Exception {
+        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+        return Result.success(insOrderService.costStatistics2(costStatisticsDto));
+    }
+
     @ValueClassify("缁熻鍥捐〃")
     @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
     @PostMapping("/selectSampleDefects")
@@ -157,10 +162,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();
     }
 
@@ -170,4 +194,12 @@
     public Result<?> labelPrinting(String ids) {
         return Result.success(insOrderService.labelPrinting(ids));
     }
+
+    @ValueClassify("璐圭敤缁熻")
+    @ApiOperation(value = "璐圭敤缁熻瀵煎嚭")
+    @PostMapping("/export")
+    public void export(@RequestBody Map<String, Object> data,HttpServletResponse response) throws Exception {
+        CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+       insOrderService.export(costStatisticsDto,response);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3