From 8f63d5ce747106195b279e1c158fd12f9997a770 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:08:40 +0800
Subject: [PATCH] 检验任务代码迁移&爱尚平台对接测试
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 4a7b154..8e0992f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -48,7 +48,7 @@
@ApiOperation(value = "瀵煎嚭濮旀墭璐圭敤")
@GetMapping("/exportCommissionFees")
- public void exportCommissionFees(Map<String, Object> data,HttpServletResponse response) {
+ public void exportCommissionFees(@RequestParam Map<String, Object> data,HttpServletResponse response) {
insOrderPlanService.exportCommissionFees(data,response);
}
@@ -102,8 +102,8 @@
@ApiOperation(value = "浜ゆ帴鎸夐挳")
@PostMapping("/upPlanUser")
- public Result<?> upPlanUser(Integer userId, Integer orderId, String sonLaboratory) {
- return Result.success(insOrderPlanService.upPlanUser(userId, orderId, sonLaboratory));
+ public Result<?> upPlanUser(@RequestBody UpInsOrderDTO upInsOrderDTO) {
+ return Result.success(insOrderPlanService.upPlanUser(upInsOrderDTO.getUserId(), upInsOrderDTO.getOrderId(), upInsOrderDTO.getSonLaboratory()));
}
@ApiOperation(value = "鍒ゆ柇浜ゆ帴鐨勮瘯楠屽")
@@ -142,18 +142,18 @@
}
/**
- * @param param 妯℃澘鍐呭
- * @param currentTable 褰撳墠妯℃澘id
- * @param sampleId 褰撳墠鏍峰搧id
- * @param orderId 褰撳墠璁㈠崟id
- * @param sonLaboratory 瀛愯瘯楠屽
+ * @param inspectionOrderDTO 妫�楠屾暟鎹�
* @return
*/
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
- public Result<?> saveInsContext(String param, Integer currentTable, Integer sampleId, Integer orderId, String sonLaboratory,Boolean isDelete) {
- Map<String, Object> param2 = JSON.parseObject(param, Map.class);
- insOrderPlanService.saveInsContext(param2, currentTable, sampleId, orderId, sonLaboratory,isDelete);
+ public Result<?> saveInsContext(@RequestBody InspectionOrderDTO inspectionOrderDTO) {
+ insOrderPlanService.saveInsContext(inspectionOrderDTO.getParam(),
+ inspectionOrderDTO.getCurrentTable(),
+ inspectionOrderDTO.getSampleId(),
+ inspectionOrderDTO.getOrderId(),
+ inspectionOrderDTO.getSonLaboratory(),
+ inspectionOrderDTO.getIsDelete());
return Result.success();
}
@@ -228,4 +228,4 @@
return Result.success(insOrderPlanService.getCurrentMonthPlanTotalBySonLaboratory(insOrderPlanCountDTO.getSonLaboratory(),insOrderPlanCountDTO.getStartTime(),insOrderPlanCountDTO.getEndTime()));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3