From 3a344a98e3e2ee732aab2158670cbe837a4b1458 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 11:15:34 +0800
Subject: [PATCH] fix:不合格管理查询
---
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index b015150..9bfa47a 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -1,9 +1,13 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -16,6 +20,7 @@
*/
@RestController
@RequestMapping("/quality/qualityUnqualified")
+@Api(tags = "涓嶅悎鏍肩鐞�")
public class QualityUnqualifiedController {
@Resource
@@ -28,6 +33,8 @@
* @return
*/
@PostMapping("/add")
+ @ApiOperation("鏂板涓嶅悎鏍肩鐞�")
+ @Log(title = "鏂板涓嶅悎鏍肩鐞�", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
qualityUnqualified.setInspectState(0);
return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
@@ -39,10 +46,14 @@
* @return
*/
@DeleteMapping("/del")
+ @ApiOperation("鍒犻櫎涓嶅悎鏍肩鐞�")
+ @Log(title = "鍒犻櫎涓嶅悎鏍肩鐞�", businessType = BusinessType.DELETE)
public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
+ qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
+ if (qualityUnqualified.getInspectState()==1){
+ throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
+ }
+ });
return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
}
@@ -52,8 +63,10 @@
* @return
*/
@GetMapping("/{id}")
+ @ApiOperation("涓嶅悎鏍肩鐞嗚鎯�")
+ @Log(title = "涓嶅悎鏍肩鐞嗚鎯�", businessType = BusinessType.OTHER)
public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getById(id));
+ return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -62,6 +75,8 @@
* @return
*/
@PostMapping("/update")
+ @ApiOperation("涓嶅悎鏍肩鐞嗕慨鏀�")
+ @Log(title = "涓嶅悎鏍肩鐞嗕慨鏀�", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
}
@@ -73,6 +88,8 @@
* @return
*/
@GetMapping("/listPage")
+ @ApiOperation("涓嶅悎鏍肩鐞嗗垎椤垫煡璇�")
+ @Log(title = "涓嶅悎鏍肩鐞嗗垎椤垫煡璇�", businessType = BusinessType.OTHER)
public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
}
@@ -83,6 +100,8 @@
* @param qualityUnqualified
*/
@PostMapping("/export")
+ @ApiOperation("涓嶅悎鏍肩鐞嗗鍑�")
+ @Log(title = "涓嶅悎鏍肩鐞嗗鍑�", businessType = BusinessType.EXPORT)
public void qualityUnqualifiedExport(HttpServletResponse response,QualityUnqualified qualityUnqualified) {
qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
}
@@ -93,9 +112,11 @@
* @return
*/
@PostMapping("/deal")
+ @ApiOperation("涓嶅悎鏍肩鐞嗗鐞�")
+ @Log(title = "涓嶅悎鏍肩鐞嗗鐞�", businessType = BusinessType.UPDATE)
public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3