From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 a7ddb11..52b75c7 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
@@ -1,5 +1,6 @@
package com.ruoyi.inspect.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.InventoryDetailDTO;
@@ -84,6 +85,12 @@
return Result.success(insOrderService.addNewJuInsOrder(insPlaceOrderDto));
}
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
+ }
+
+ @Operation(summary = "淇敼鏂拌仛妫�楠屼笅鍗曟暟鎹�")
+ @PostMapping("/updateNewJuInsOrder")
+ public Result<?> updateNewJuInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
+ return Result.success(insOrderService.updateNewJuInsOrder(insPlaceOrderDto));
}
@Operation(summary = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
@@ -281,4 +288,16 @@
return insOrderService.judgeNotSpotCheckOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder());
}
+ @Operation(summary = "鏌ヨ宸插畬鎴愬鎵樺崟(瀹㈡埛婊℃剰搴︿笅鎷夌敤, 浠呭凡妫�楠宻tate=4)")
+ @GetMapping("/selectCompletedOrders")
+ public Result selectCompletedOrders() {
+ LambdaQueryWrapper<InsOrder> qw = new LambdaQueryWrapper<>();
+ qw.select(InsOrder::getId, InsOrder::getEntrustCode, InsOrder::getCompany,
+ InsOrder::getCompanyId, InsOrder::getSampleView)
+ .eq(InsOrder::getState, 4)
+ .isNotNull(InsOrder::getCompany)
+ .orderByDesc(InsOrder::getCreateTime);
+ return Result.success(insOrderService.page(new Page<>(1, 500), qw).getRecords());
+ }
+
}
--
Gitblit v1.9.3