From 44281ff10837487a1f974f7256ad5829a8e9bb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 17 Feb 2025 01:10:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/TicketController.java | 2 +- .../mobilebroken/cfs/controller/TiketController.java | 2 +- .../nflg/mobilebroken/common/pojo/vo/AppMessageVO.java | 10 +++++++++- .../repository/service/impl/AppUserServiceImpl.java | 2 +- .../service/impl/DictionaryItemServiceImpl.java | 3 +++ .../src/main/resources/mapper/AppMessageMapper.xml | 4 ++-- .../src/main/resources/mapper/AppUserMapper.xml | 2 +- 7 files changed, 18 insertions(+), 7 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 49cd4d04..7c1bfde6 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 @@ -386,7 +386,7 @@ public class TicketController extends ControllerBase { } private TicketEvaluateVO getTicketEvaluate(Integer ticketId) { - TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId); + TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one(); if (Objects.isNull(ticketEvaluate)) { return null; } diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java index bc223b24..835e9136 100644 --- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java +++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java @@ -221,7 +221,7 @@ public class TiketController extends ControllerBase { } private TicketEvaluateVO getTicketEvaluate(Integer ticketId) { - TicketEvaluate ticketEvaluate = ticketEvaluateService.getById(ticketId); + TicketEvaluate ticketEvaluate = ticketEvaluateService.lambdaQuery().eq(TicketEvaluate::getTicketId,ticketId).one(); if (Objects.isNull(ticketEvaluate)) { return null; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java index 5e98f62e..23ff62f7 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppMessageVO.java @@ -1,5 +1,6 @@ package com.nflg.mobilebroken.common.pojo.vo; +import com.nflg.mobilebroken.common.constant.MessageSubType; import lombok.Data; import lombok.experimental.Accessors; @@ -20,9 +21,16 @@ public class AppMessageVO { //工单标题 private String ticketTitle; - //提醒事项 + //任务事项，5：工单新消息；6：工单完成；10：工单超时 + private Integer subType; + + //任务事项描述 private String content; + public String getContent() { + return MessageSubType.findByValue(subType).getDescription(); + } + //消息时间 private LocalDateTime createTime; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index a6738c14..b2f97f0b 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -369,7 +369,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setUserName(d.getUserName()) .setCompanyName(company.getAgencyCompanyName()) .setLanguageCode(d.getLanguageCode()) - .setName(d.getSalesUserName()) + .setName(d.getUserName()) .setEmail(d.getUserEmail()) .setSalesUserName(d.getSalesUserName()) .setAreaName(area.getName()) 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 e5d75575..e64ff75d 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 @@ -105,6 +105,9 @@ public class DictionaryItemServiceImpl extends ServiceImpl forAdd = new ArrayList<>(); List forUpdate = new ArrayList<>(); for (TranslateMap translate : request.getLanguages()) { + if(StrUtil.isBlank(translate.getValue())){ + continue; + } DictionaryItemTranslate t = new DictionaryItemTranslate() .setDictionaryItemId(id) .setLanguageCode(translate.getCode()) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml index 1ae86be3..084e0a12 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppMessageMapper.xml @@ -3,7 +3,7 @@