From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:36 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
index ca3a5b9..0591244 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
@@ -1,16 +1,14 @@
package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.ProductPartDto;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.pojo.ProductPart;
import com.ruoyi.basic.service.ProductPartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -21,7 +19,7 @@
private ProductPartService productPartService;
@ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ闆朵欢")
- @PostMapping("/selectByProductId")
+ @GetMapping("/selectByProductId")
public Result selectByProductId(Page page,ProductPart productPart){
return Result.success(productPartService.selectByProductId(page,productPart));
}
@@ -40,11 +38,30 @@
return Result.success();
}
+ @ApiOperation(value = "浜у搧闆朵欢澶嶆牳")
+ @PostMapping("/productPartReview")
+ public Result productPartReview(@RequestBody ProductPartDto productPartDto) {
+ productPartService.productPartReviewById(productPartDto);
+ return Result.success();
+ }
+
@ApiOperation(value = "鍒犻櫎浜у搧闆朵欢")
- @PostMapping("/deleteProductPart")
+ @DeleteMapping("/deleteProductPart")
public Result deleteProductPart(Integer id) {
productPartService.removeById(id);
return Result.success();
}
+ @ApiOperation(value = "鎴愬搧杩涘巶妫�楠岄」")
+ @GetMapping("/inspectionItems")
+ public Result inspectionItems(String sample,String productName){
+ return Result.success(productPartService.inspectionItems(sample,productName));
+ }
+
+ @ApiOperation(value = "浜у搧闆朵欢鏃ュ織鏌ヨ")
+ @GetMapping("/productPartLogList")
+ public Result productPartLogList(Page page,Integer id,String type){
+ return Result.success(productPartService.productPartLogList(page,id,type));
+ }
+
}
--
Gitblit v1.9.3