From ff057092893a5c3852d66d2423cfeb5463106079 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 四月 2024 18:03:19 +0800
Subject: [PATCH] 费用统计
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 0ddca2a..3f32791 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,8 +4,10 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.SampleProductDto2;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
import com.yuanchu.mom.service.InsOrderService;
@@ -46,7 +48,7 @@
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
- @ApiOperation(value = "妫�楠屼笅鍙�")
+ @ApiOperation(value = "妫�楠屽垎閰�")
@PostMapping("/upInsOrder")
public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
@@ -61,7 +63,7 @@
return Result.success(insOrderService.addInsOrder(list, insOrder));
}
- @ApiOperation(value = "鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿")
+ @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@PostMapping("/selectOrderManDay")
@ValueAuth
public Result<?> selectOrderManDay(Integer id) {
@@ -76,10 +78,10 @@
return Result.success(insOrderService.getInsOrder(orderId));
}
- @ApiOperation(value = "瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�")
+ @ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id"),
- @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃")
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
})
@PostMapping("/upInsOrderOfState")
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
@@ -112,4 +114,22 @@
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
+
+ @ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
+ @PostMapping("/selectSampleAndProductByOrderId")
+ @ValueAuth
+ public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
+ return Result.success(insOrderService.selectSampleAndProductByOrderId(page, sampleProductDto));
+ }
+
+ @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));
+ }
+
}
--
Gitblit v1.9.3