From 671b836ea629891889fad234c135f7e6f4b17745 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 12 五月 2025 19:34:46 +0800 Subject: [PATCH] 质检功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java index a3cfdec..af8e95b 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java @@ -13,12 +13,15 @@ import com.vincent.rsf.server.manager.controller.params.IsptOrderParam; import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; import com.vincent.rsf.server.manager.entity.QlyInspect; +import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.manager.service.QlyInspectService; +import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.vincent.rsf.server.system.constant.SerialRuleCode; import com.vincent.rsf.server.system.controller.BaseController; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,12 +30,15 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; +@Slf4j @Api(tags = "璐ㄦ淇℃伅") @RestController public class QlyInspectController extends BaseController { @Autowired private QlyInspectService qlyInspectService; + @Autowired + private QlyIsptItemService qlyIsptItemService; @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/qlyInspect/page") @@ -140,7 +146,11 @@ return R.error("鏈夋槑缁嗗崟鎹凡鍦ㄨ川妫�涓紒锛�"); } if (!qlyInspectService.removeByIds(Arrays.asList(ids))) { - return R.error("Delete Fail"); + return R.error("涓诲崟鍒犻櫎澶辫触锛侊紒"); + } + + if (!qlyIsptItemService.remove(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getIspectId, ids))) { + return R.error("鏄庣粏鍒犻櫎澶辫触锛侊紒"); } return R.ok("Delete Success").add(ids); } -- Gitblit v1.9.1