From cf7fde24bf5a20ca8328729406f85ee16984da7a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 14 三月 2026 21:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java
index 8121a05..c5fbb55 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpFeedbackTypeManagementController.java
@@ -1,8 +1,11 @@
package com.xiaopeng.operation.controller;
+import com.xiaopeng.api.feignClient.maintenance.XpWorkOrderClient;
import com.xiaopeng.api.model.operation.XpFeedbackType;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.exception.ServiceException;
+import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.service.IXpFeedbackTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,9 +31,14 @@
private final IXpFeedbackTypeService xpFeedbackTypeService;
+ private final XpWorkOrderClient xpWorkOrderClient;
- public XpFeedbackTypeManagementController(IXpFeedbackTypeService xpFeedbackTypeService) {
+
+
+ public XpFeedbackTypeManagementController(IXpFeedbackTypeService xpFeedbackTypeService, XpWorkOrderClient xpWorkOrderClient) {
this.xpFeedbackTypeService = xpFeedbackTypeService;
+ this.xpWorkOrderClient = xpWorkOrderClient;
+
}
@GetMapping("/getList")
@ApiOperation(value = "获取意见反馈类型列表")
@@ -51,6 +59,11 @@
@ApiOperation(value = "删除意见反馈类型")
@DeleteMapping(value = "/deleteFeedbackType")
public R<Boolean> deleteFeedbackType(Long id) {
+ // 判断工单是否包含这个类型
+ R<Boolean> include = xpWorkOrderClient.include(id);
+ if(include==null || include.getData()){
+ throw new ServiceException("该类型被工单引用，无法删除",I18nKeyConstant.INCLUDE);
+ }
return R.ok(xpFeedbackTypeService.removeById(id));
}
}
--
Gitblit v1.7.1