From 085e4b6b0a97c9a20a5b92a6d6f5756ba98144f3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 19 七月 2024 17:41:39 +0800
Subject: [PATCH] 费用统计导出+工时展示
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 21 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..169a309 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,20 +4,27 @@
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;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderTemplate;
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.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
@@ -26,19 +33,18 @@
@RestController
@AllArgsConstructor
@RequestMapping("/insOrder")
-@Api("妫�楠屽崟妯″潡")
+@Api(tags="妫�楠屽崟妯″潡")
public class InsOrderController {
private InsOrderService insOrderService;
-
- private InsSampleService insSampleService;
private InsProductService insProductService;
private InsOrderTemplateService insOrderTemplateService;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -46,27 +52,37 @@
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
- @ApiOperation(value = "妫�楠屼笅鍙�")
+ @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));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
- public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
- JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
+ public Result<?> addInsOrder(String str) {
+ Map<String, Object> map = JSON.parseObject(str, Map.class);
+ 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));
+ List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
}
- @ApiOperation(value = "鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿")
+ @ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@PostMapping("/selectOrderManDay")
@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 = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@@ -75,17 +91,17 @@
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
-
- @ApiOperation(value = "瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�")
+ @ValueClassify("妫�楠屼笅鍗�")
+ @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) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
-
+ @ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屽崟妯℃澘")
@PostMapping("/addInsOrderTemplate")
public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
@@ -105,11 +121,72 @@
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));
}
-}
+
+ @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));
+ }
+ @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));
+ }
+
+ @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")
+ public Result selectSampleDefects(Integer size, Integer current, String inspectionItems, String orderNumber) {
+ return Result.success(insOrderService.selectSampleDefects(new Page<>(current, size),inspectionItems, orderNumber));
+ }
+
+ @ValueClassify("妫�楠屼笅鍗�")
+ @ApiOperation(value = "鎾ら攢")
+ @PutMapping("/updateStatus")
+ public Result<?> updateStatus(Integer id) {
+ insOrderService.updateStatus(id);
+ return Result.success();
+ }
+
+ @PutMapping("/updateInspected")
+ @ValueAuth
+ public Result<?> updateInspected(Integer id){
+ 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