From 30a143f368dd2ff6e9c27b9d5dd17923ffed03ae Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 01 八月 2024 18:59:12 +0800
Subject: [PATCH] 检验单增加外部委托编号+报告批量下载批量上传
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 e3a1e03..8681513 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
@@ -23,6 +23,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 +51,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 +75,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 +104,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 +137,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")
@@ -163,4 +167,19 @@
insProductService.updateInspected(id);
return Result.success();
}
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏍囩鎵撳嵃")
+ @PostMapping("/labelPrinting")
+ 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