From f715b9c1a18e2c9f4219972d1d3e5df93d74ef63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 27 Mar 2026 14:52:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-1372=20=E5=B7=A5=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=B1=BB=E5=9E=8B=E4=BB=8E=E5=AD=97=E5=85=B8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/TicketController.java | 12 +++++++++--- .../nflg/mobilebroken/common/constant/Constant.java | 2 ++ .../pojo/request/SaveDictionaryItemRequest.java | 5 +++++ .../common/pojo/vo/DictionaryItemVO.java | 5 +++++ .../gongfu/controller/TicketController.java | 11 ++++++++--- .../repository/entity/DictionaryItem.java | 5 +++++ .../repository/mapper/DictionaryItemMapper.java | 2 ++ .../repository/service/IDictionaryItemService.java | 2 ++ .../service/impl/DictionaryItemServiceImpl.java | 7 +++++++ .../main/resources/mapper/DictionaryItemMapper.xml | 6 ++++++ 10 files changed, 51 insertions(+), 6 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index db7ab5fa..ab525692 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -151,6 +151,7 @@ public class TicketController extends ControllerBase { @Resource private DeepSeekTranslate deepSeekTranslate; + @Resource private ILanguageService languageService; @@ -161,9 +162,14 @@ public class TicketController extends ControllerBase { @GetMapping("getQuestions") @ApiMark(moduleName = "工单管理", apiName = "获取问题类型", isPublic = true) public ApiResult> getQuestions() { - return ApiResult.success(Arrays.asList("技术设计问题", "装配工艺问题", "焊接质量问题", "机组装配质量问题", "电控问题" - , "工况方案问题", "客户操作不当", "原材料配件质量问题", "QC检验遗漏/误差", "部件/整机外观", "安装问题", "调试问题" - , "外购件质量问题", "运输问题", "非故障问题/参数咨询")); +// return ApiResult.success(Arrays.asList("技术设计问题", "装配工艺问题", "焊接质量问题", "机组装配质量问题", "电控问题" +// , "工况方案问题", "客户操作不当", "原材料配件质量问题", "QC检验遗漏/误差", "部件/整机外观", "安装问题", "调试问题" +// , "外购件质量问题", "运输问题", "非故障问题/参数咨询")); + return ApiResult.success(dictionaryItemService.getListByDictionaryCodeAndType(Constant.DICTIONARY_TICKET_QUESTION,"移动破") + .stream() + .map(DictionaryItem::getName) + .collect(Collectors.toList()) + ); } /** diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java index 42d2aeb4..953f8750 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/Constant.java @@ -143,4 +143,6 @@ public class Constant { * 移动破产品线名称 */ public static final String MOBILE_BROKEN = "移动破碎"; + + public static final String DICTIONARY_TICKET_QUESTION = "Question"; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SaveDictionaryItemRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SaveDictionaryItemRequest.java index bfcf336c..2a217b61 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SaveDictionaryItemRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/SaveDictionaryItemRequest.java @@ -28,6 +28,11 @@ public class SaveDictionaryItemRequest { @NotBlank(message = "属性值不能为空") private String value; + /** + * 类型（分组） + */ + private String type; + //多语言翻译 private List languages; } \ No newline at end of file diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemVO.java index 2e5c7957..4ac06255 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemVO.java @@ -24,6 +24,11 @@ public class DictionaryItemVO { */ private String value; + /** + * 类型（分组） + */ + private String type; + /** * 创建人 */ diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java index 496cef02..4ad3604a 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java @@ -154,9 +154,14 @@ public class TicketController extends ControllerBase { @GetMapping("getQuestions") @ApiMark(moduleName = "工单管理", apiName = "获取问题类型", isPublic = true) public ApiResult> getQuestions() { - return ApiResult.success(Arrays.asList("技术设计问题", "装配工艺问题", "焊接质量问题", "机组装配质量问题", "电控问题" - , "工况方案问题", "客户操作不当", "原材料配件质量问题", "QC检验遗漏/误差", "部件/整机外观", "安装问题", "调试问题" - , "外购件质量问题", "运输问题", "非故障问题/参数咨询")); +// return ApiResult.success(Arrays.asList("技术设计问题", "装配工艺问题", "焊接质量问题", "机组装配质量问题", "电控问题" +// , "工况方案问题", "客户操作不当", "原材料配件质量问题", "QC检验遗漏/误差", "部件/整机外观", "安装问题", "调试问题" +// , "外购件质量问题", "运输问题", "非故障问题/参数咨询")); + return ApiResult.success(dictionaryItemService.getListByDictionaryCodeAndType(Constant.DICTIONARY_TICKET_QUESTION,"工服") + .stream() + .map(DictionaryItem::getName) + .collect(Collectors.toList()) + ); } /** diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java index 006a2ce7..75ba4c4a 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DictionaryItem.java @@ -48,6 +48,11 @@ public class DictionaryItem implements Serializable { */ private String value; + /** + * 类型（分组） + */ + private String type; + /** * 创建人 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java index 66c31981..2b5907a0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemMapper.java @@ -25,4 +25,6 @@ public interface DictionaryItemMapper extends BaseMapper { List getListByDictionaryCode(String code,String language); DictionaryItem getByCode(String dictionaryCode, String dictionaryItemCode); + + List getListByDictionaryCodeAndType(String dictionaryCode, String type); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java index 2232c1c1..3c2640d6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemService.java @@ -29,4 +29,6 @@ public interface IDictionaryItemService extends IService { List getListByDictionaryCode(String code,String language); DictionaryItem getByCode(String dictionaryCode, String DictionaryItemCode); + + List getListByDictionaryCodeAndType(String dictionaryCode,String type); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java index 0ee9bf1b..6bb4ec1f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemServiceImpl.java @@ -86,6 +86,7 @@ public class DictionaryItemServiceImpl extends ServiceImpl getListByDictionaryCodeAndType(String dictionaryCode, String type) { + return baseMapper.getListByDictionaryCodeAndType(dictionaryCode, type); + } } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml index bc395ffd..3fb05e48 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemMapper.xml @@ -24,4 +24,10 @@ INNER JOIN dictionary_item di ON d.id=di.dictionary_id WHERE d.`code`= #{dictionaryCode} AND di.`code`= #{dictionaryItemCode} +