From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 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 0598af8..97f0ff1 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
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.dto.SampleProductDto2;
@@ -12,10 +14,12 @@
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsOrderTemplateService;
import com.yuanchu.mom.service.InsProductService;
-import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -27,18 +31,17 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
-@Api("妫�楠屽崟妯″潡")
+@Api(tags="妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
-
- private InsSampleService insSampleService;
private InsProductService insProductService;
private InsOrderTemplateService insOrderTemplateService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -46,17 +49,17 @@
SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
-
+ @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));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
- JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
+ JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
return Result.success(insOrderService.addInsOrder(list, insOrder));
@@ -76,7 +79,7 @@
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
@@ -86,7 +89,7 @@
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
@PostMapping("/addInsOrderTemplate")
public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
@@ -106,10 +109,9 @@
public Result<?> selectInsOrderTemplateById(Integer id) {
return Result.success("鎴愬姛", insOrderTemplateService.selectInsOrderTemplateById(id));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "鍒犻櫎妫�楠屽崟妯℃澘")
@PostMapping("/delInsOrderTemplate")
- @ValueAuth
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
@@ -122,5 +124,18 @@
SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
}
-
+ @ValueClassify("璐圭敤缁熻")
+ @ApiOperation(value = "璐圭敤缁熻")
+ @PostMapping("/costStatistics")
+ public Result<?> costStatistics(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ CostStatisticsDto costStatisticsDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CostStatisticsDto.class);
+ return Result.success(insOrderService.costStatistics(page, costStatisticsDto));
+ }
+ @ValueClassify("缁熻鍥捐〃")
+ @ApiOperation(value = "鏍峰搧缂洪櫡鎸囨暟")
+ @PostMapping("/selectSampleDefects")
+ public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
+ return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
+ }
}
--
Gitblit v1.9.3