From 379222715511cc4d6efd4abbbb3463f5485f590d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:27:30 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 1a95be3..074496d 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
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.pojo.InsOrder;
@@ -46,8 +48,6 @@
return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
}
-
-
//鐢ㄤ簬妫�楠屼笅鍗曞尯鍒煡鐪嬫墍鏈夎鍗曞拰鍙煡鐪嬪悓涓�涓鎵樺崟浣嶇殑璁㈠崟
@ApiOperation(value = "鍒ゆ柇褰撳墠瀹㈡埛绱ф�ラ搴︽槸鍚︾敤瀹�")
@GetMapping("/hasSendUrgentOrder")
@@ -65,12 +65,14 @@
@ApiOperation(value = "鍒嗛厤鎸夐挳")
@PostMapping("/upInsOrder")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> upInsOrder(@RequestBody UpInsOrderDTO upInsOrderDTO) {
return Result.success(insOrderService.upInsOrder(upInsOrderDTO));
}
@ApiOperation(value = "涓嬪崟鎸夐挳")
@PostMapping("/addInsOrder")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
public Result<?> addInsOrder(String str) {
Map<String, Object> map = JSON.parseObject(str, Map.class);
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
@@ -90,6 +92,7 @@
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
@GetMapping("/getInsOrder")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.OTHER)
public Result<?> getInsOrder(Integer orderId) {
return Result.success(insOrderService.getInsOrder(orderId));
}
@@ -100,18 +103,21 @@
@ApiImplicitParam(name = "state", value = "瀹℃牳缁撴灉 1:閫氳繃 2锛氫笉閫氳繃", dataTypeClass = Integer.class)
})
@PostMapping("/upInsOrderOfState")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> upInsOrderOfState(@RequestBody InsOrder insOrder) {
return Result.success(insOrderService.upInsOrderOfState(insOrder));
}
@ApiOperation(value = "淇濆瓨妫�楠屾ā鏉挎寜閽�")
@PostMapping("/addInsOrderTemplate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.INSERT)
public Result<?> addInsOrderTemplate(@RequestBody InsOrderTemplate insOrderTemplate) {
return Result.success(insOrderTemplateService.addInsOrderTemplate(insOrderTemplate));
}
@ApiOperation(value = "鍒犻櫎妫�楠屾ā鏉挎寜閽�")
@PostMapping("/delInsOrderTemplate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.DELETE)
public Result<?> delInsOrderTemplate(Integer id) {
return Result.success(insOrderTemplateService.delInsOrderTemplate(id));
}
@@ -130,8 +136,7 @@
@ApiOperation(value = "閫氳繃妫�楠屽崟鏌ヨ妫�楠屾暟鎹紙鏁版嵁鏌ョ湅锛�")
@GetMapping("/selectSampleAndProductByOrderId")
- public Result<?> selectSampleAndProductByOrderId(@RequestBody Map<String, Object> data) throws Exception {
- SampleProductDto2 sampleProductDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleProductDto2.class);
+ public Result<?> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto) {
return Result.success(insOrderService.selectSampleAndProductByOrderId(sampleProductDto));
}
//鏁版嵁鏌ョ湅涓嬬殑鏌ョ湅璇︽儏锛堝崟鏍瑰瀭鐩寸噧鐑у拰鏉惧绠�
@@ -142,6 +147,7 @@
@ApiOperation(value = "瀵煎嚭宸叉濮旀墭鍗�")
@PostMapping("/exportChecked")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.EXPORT)
public void exportChecked(@RequestBody Map<String, Object> data, HttpServletResponse response) {
insOrderService.exportChecked(data,response);
}
@@ -155,6 +161,7 @@
@ApiOperation(value = "鎾ら攢鎸夐挳")
@PutMapping("/updateStatus")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> updateStatus(Integer id) {
insOrderService.updateStatus(id);
return Result.success();
@@ -209,6 +216,7 @@
* @param data
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@PostMapping("/revoke")
public Result<?> revoke(@RequestBody Map<String, Object> data) {
insProductService.revoke(data);
@@ -253,13 +261,12 @@
return Result.success(insProductService.revokeReviewProduct(orderId,sampleId));
}
-
-
/**
* 鎾ら攢瀹℃牳閫氳繃
* @param orderId
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@GetMapping("/revocationPassed")
public Result<?> revocationPassed(Integer orderId){
insProductService.revocationPassed(orderId);
@@ -271,6 +278,7 @@
* @param orderId
* @return
*/
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
@GetMapping("/revocationCancel")
public Result<?> revocationCancel(Integer orderId){
insProductService.revocationCancel(orderId);
@@ -280,6 +288,7 @@
@ApiOperation(value = "寰呮鐨勬挙閿�")
@PutMapping("/updateInspected")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> updateInspected(Integer orderId,String ids){
insProductService.updateInspected(orderId,ids);
return Result.success();
@@ -287,6 +296,7 @@
@ApiOperation(value = "鎾ら攢瀹℃牳鎸夐挳")
@PostMapping("/checkUpdate")
+ @Log(title = "妫�楠屼笅鍗�", businessType = BusinessType.UPDATE)
public Result<?> checkUpdate(Integer orderId,Integer state){
insProductService.checkUpdate(orderId,state);
return Result.success();
--
Gitblit v1.9.3