From 3585c4b63185b6e83ed6ed3a255e87c7853a3e48 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 七月 2026 10:02:18 +0800
Subject: [PATCH] 1.合格率统计逻辑调整；2.不合格处理：新增问题类型字段；3.对接企业微信配置调整；4.班次：新增删除排班操作
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 2fdf20a..4687bd5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@RestController
@AllArgsConstructor
@@ -53,7 +54,7 @@
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ヨ鍗曚綅妫�楠屽崟")
@GetMapping("/selectInsOrderParameter")
- public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) throws Exception {
+ public Result selectInsOrderParameter(Page page, SampleOrderDto sampleOrderDto) {
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
@@ -89,6 +90,12 @@
@GetMapping("/getInsOrder")
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
+ }
+
+ @ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯呭垪琛�")
+ @PostMapping("/getInsOrderList")
+ public Result<?> getInsOrderList(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.getInsOrderList(insPlaceOrderDto.getSelectOrderIds()));
}
@ApiOperation(value = "瀹℃牳妫�楠屽崟杩涜鐘舵�佷慨鏀�")
@@ -132,44 +139,31 @@
}
- @ApiOperation(value = "鎾ら攢")
+ @ApiOperation(value = "鎾ら攢鏈鏍歌鍗�")
@PostMapping("/updateStatus")
- public Result<?> updateStatus(@RequestBody Map<String, Object> param) {
- Integer id = (Integer) param.get("id");
- insOrderService.updateStatus(id);
+ public Result<?> updateStatus(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insOrderService.updateStatus(revokeDTO.getId());
return Result.success();
}
//寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
@GetMapping("/selectNoProducts")
- public Result<?> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
- return Result.success(insProductService.selectNoProducts(page, insProduct, orderId, ids));
+ public Result<?> selectNoProducts(Page page, ProductOrderRevokeDTO revokeDTO) {
+ return Result.success(insProductService.selectNoProducts(page, revokeDTO.getOrderId(), revokeDTO.getRevocationInsProductIds()));
}
@ApiOperation(value = "寰呮鐨勬挙閿�")
@PostMapping("/updateInspected")
- public Result<?> updateInspected(@RequestBody Map<String, Object> param) {
- Integer orderId = (Integer) param.get("orderId");
- String ids = (String) param.get("ids");
- Integer typeSource = (Integer) param.get("typeSource");
- Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
- if (Objects.nonNull(typeSource) && typeSource == 1) {
- ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
- .set(IfsInventoryQuantity::getState, 0)
- .eq(IfsInventoryQuantity::getId, ifsInventoryId));
- insOrderService.update(null, new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState, -1).eq(InsOrder::getId, orderId)); // 鎾ら攢
- }
- insProductService.updateInspected(orderId, ids);
+ public Result<?> updateInspected(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insProductService.updateInspected(revokeDTO.getOrderId(), revokeDTO.getIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
return Result.success();
}
@ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
@PostMapping("/checkUpdate")
- public Result<?> checkUpdate(@RequestBody Map<String, Object> param) {
- Integer orderId = (Integer) param.get("orderId");
- Integer state = (Integer) param.get("state");
- insProductService.checkUpdate(orderId, state);
+ public Result<?> checkUpdate(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insProductService.checkUpdate(revokeDTO.getOrderId(), revokeDTO.getState());
return Result.success();
}
@@ -178,7 +172,7 @@
@GetMapping("/getIfsOrder")
public Result<?> getIfsOrder() {
HashMap<String, Object> map = new HashMap<>();
- map.put("LOCATION_NO", "1302;WG-04-001");
+// map.put("LOCATION_NO", "1302;WG-04-001");
map.put("STATE_DB", "To be Inspected");
insOrderService.getIfsOrder(map, false);
return Result.success();
--
Gitblit v1.9.3