From 7d43b5891fd288f163c05452301336a1400d3201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 13 Feb 2025 14:11:41 +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 | 6 +++--- .../cfs/controller/TiketController.java | 17 +++++++++++++++++ .../mobilebroken/common/constant/Constant.java | 2 ++ .../common/exception/NflgException.java | 2 ++ .../pojo/request/AddChatMessageRequest.java | 2 -- .../pojo/request/TicketSearchRequest.java | 6 ++++++ .../common/pojo/vo/CompanySimpleVO.java | 3 +++ .../common/pojo/vo/DeviceInfoVO.java | 3 +++ .../pojo/vo/DictionaryItemTranslateVO.java | 9 +++++++++ .../common/pojo/vo/TicketInfoVO.java | 3 +++ .../mapper/DictionaryItemTranslateMapper.java | 2 ++ .../repository/service/IAppAreaService.java | 4 ++++ .../IDictionaryItemTranslateService.java | 2 ++ .../service/impl/AppAreaServiceImpl.java | 16 ++++++++++++++++ .../service/impl/AppUserServiceImpl.java | 4 ++-- .../DictionaryItemTranslateServiceImpl.java | 7 ++++++- .../service/impl/TBaseCustomerServiceImpl.java | 13 +++++++++++-- .../service/impl/TicketServiceImpl.java | 7 +++++-- .../src/main/resources/mapper/DeviceMapper.xml | 4 ++-- .../mapper/DictionaryItemTranslateMapper.xml | 10 ++++++++++ .../src/main/resources/mapper/TicketMapper.xml | 16 +++++++++++----- .../advice/GlobalRestControllerAdvice.java | 2 +- 22 files changed, 120 insertions(+), 20 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 76d50b33..6d4d45ae 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 @@ -86,7 +86,6 @@ public class TicketController extends ControllerBase { /** * 获取问题类型 - * * @return 问题类型列表 */ @GetMapping("getQuestions") @@ -263,7 +262,7 @@ public class TicketController extends ControllerBase { Ticket ticket = ticketService.getById(id); AppUser user = appUserService.getById(ticket.getUserId()); AppArea appArea = appAreaService.getById(user.getAreaId()); - TBaseCustomer company = customerService.getById(Integer.valueOf(user.getCompanyId())); +// TBaseCustomer company = customerService.getById(Integer.valueOf(user.getCompanyId())); DeviceInfoVO device = deviceService.getByDeviceNo(ticket.getDeviceNo()); String warrantyStateDesc = ""; if (Objects.nonNull(device.getWarrantyState())) { @@ -278,6 +277,7 @@ public class TicketController extends ControllerBase { AppUser primaryUser = appUserService.getPrimaryByCompanyId(user.getCompanyId()); TicketInfoVO vo = new TicketInfoVO() .setId(ticket.getId()) + .setNo(ticket.getNo()) .setTitle(ticket.getTitle()) .setDeviceNo(ticket.getDeviceNo()) .setModelNo(device.getModelNo()) @@ -301,7 +301,7 @@ public class TicketController extends ControllerBase { .setCreateUserAvatar(user.getAvatar()) .setCreateTime(ticket.getCreateTime()) .setAreaName(appArea.getName()) - .setCompanyName(company.getAgencyCompanyName()) + .setCompanyName(device.getCustomerName()) .setHandle(handle); return ApiResult.success(vo); } 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 6c37bab5..9540fc93 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 @@ -3,6 +3,7 @@ package com.nflg.mobilebroken.cfs.controller; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.mobilebroken.common.constant.Constant; import com.nflg.mobilebroken.common.constant.TicketState; import com.nflg.mobilebroken.common.pojo.ApiResult; import com.nflg.mobilebroken.common.pojo.PageData; @@ -99,6 +100,21 @@ public class TiketController extends ControllerBase { return ApiResult.success(deviceService.getByDeviceNo(StrUtil.trim(deviceNo))); } + /** + * 获取所有设备部件 + * + * @return 设备部件列表 + **/ + @GetMapping("getAllDeviceComponents") + public ApiResult> getAllDeviceComponents() { + return ApiResult.success( + dictionaryItemTranslateService.getAllByDictionaryCode(Constant.DICTIONARY_ITEM_DEVICECOMPONENT, MultilingualUtil.getLanguage()) + .stream() + .map(DictionaryItemTranslateVO::getValue) + .collect(Collectors.toList()) + ); + } + /** * 获取工单状态 * @return 工单状态列表 @@ -176,6 +192,7 @@ public class TiketController extends ControllerBase { } TicketInfoVO vo = new TicketInfoVO() .setId(ticket.getId()) + .setNo(ticket.getNo()) .setTitle(ticket.getTitle()) .setDeviceNo(ticket.getDeviceNo()) .setModelNo(device.getModelNo()) 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 c3ad9dba..3237a6ab 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 @@ -12,6 +12,8 @@ public class Constant { public static final String DICTIONARY_TYPE_TITLE_CQM = "CQM"; + public static final String DICTIONARY_ITEM_DEVICECOMPONENT = "modelComponents"; + public static final String REDIS_KEY_USER_RESETPASSWORD_RANDOM_CODE_APP = "app:kaptcha:user:resetpassword:{}"; public static final String REDIS_KEY_USER_UPDATE_KAPTCHA_APP = "app:kaptcha:user:update:{}"; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/exception/NflgException.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/exception/NflgException.java index 9cedf5c0..55b5aab1 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/exception/NflgException.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/exception/NflgException.java @@ -1,7 +1,9 @@ package com.nflg.mobilebroken.common.exception; import com.nflg.mobilebroken.common.constant.STATE; +import lombok.Data; +@Data public class NflgException extends RuntimeException{ private final STATE state; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java index bc58132c..ea157e7c 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AddChatMessageRequest.java @@ -3,7 +3,6 @@ package com.nflg.mobilebroken.common.pojo.request; import com.nflg.mobilebroken.common.pojo.dto.ChatMessageDTO; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; @@ -15,7 +14,6 @@ public class AddChatMessageRequest { private Integer ticketId; //消息内容 - @NotBlank private String content; //附件列表 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketSearchRequest.java index bb258c42..e1c3491b 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketSearchRequest.java @@ -1,10 +1,12 @@ package com.nflg.mobilebroken.common.pojo.request; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; import java.time.LocalDate; +import java.util.List; @EqualsAndHashCode(callSuper = false) @Data @@ -29,6 +31,10 @@ public class TicketSearchRequest extends PageRequest { //区域id private Integer areaId; + //区域ids + @JsonIgnore + private List areaIds; + //开始日期 private LocalDate startTime; diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java index 28dad9d5..6fbb4932 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/CompanySimpleVO.java @@ -10,6 +10,9 @@ public class CompanySimpleVO { // 公司id private Long id; + // 公司编码 + private String code; + // 公司名称 private String name; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceInfoVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceInfoVO.java index bd076a67..e174fd4f 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceInfoVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceInfoVO.java @@ -44,4 +44,7 @@ public class DeviceInfoVO { public List getComponents(){ return StrUtil.split(component,";"); } + + //客户名称 + private String customerName; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemTranslateVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemTranslateVO.java index a76077ec..ffe5dee3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemTranslateVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DictionaryItemTranslateVO.java @@ -15,4 +15,13 @@ public class DictionaryItemTranslateVO { //翻译内容 private String value; + + //字典值id + private Integer dictionaryItemId; + + //字典值编号 + private String dictionaryItemCode; + + //字典值名称 + private String dictionaryItemName; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java index a0a8404c..d15f4c88 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketInfoVO.java @@ -14,6 +14,9 @@ public class TicketInfoVO { //工单id private int id; + //工单编号 + private String no; + //工单标题 private String title; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemTranslateMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemTranslateMapper.java index 5b85f9ff..3b631f31 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemTranslateMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DictionaryItemTranslateMapper.java @@ -25,4 +25,6 @@ public interface DictionaryItemTranslateMapper extends BaseMapper getListByDictionaryCode(String dictionaryCode, String language); + + List getAllByDictionaryCode(String code, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppAreaService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppAreaService.java index a14f6d37..38455db9 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppAreaService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppAreaService.java @@ -6,6 +6,8 @@ import com.nflg.mobilebroken.common.pojo.request.AreaSearchRequest; import com.nflg.mobilebroken.common.pojo.vo.AreaVO; import com.nflg.mobilebroken.repository.entity.AppArea; +import java.util.List; + /** *

* 服务类 @@ -17,4 +19,6 @@ import com.nflg.mobilebroken.repository.entity.AppArea; public interface IAppAreaService extends IService { IPage search(AreaSearchRequest request); + + List getAllhildrens(Integer areaId); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java index 450dc298..1c0bb489 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryItemTranslateService.java @@ -30,4 +30,6 @@ public interface IDictionaryItemTranslateService extends IService getAllByDictionaryCode(String code, String language); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppAreaServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppAreaServiceImpl.java index e555a532..41f050bc 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppAreaServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppAreaServiceImpl.java @@ -91,6 +91,22 @@ public class AppAreaServiceImpl extends ServiceImpl impl } } + @Override + public List getAllhildrens(Integer areaId) { + List list = getChildrens(areaId).stream().map(AppArea::getId).collect(Collectors.toList()); + list.add(areaId); + return list; + } + + private List getChildrens(Integer areaId) { + List areas = lambdaQuery() + .eq(AppArea::getEnable, true) + .eq(AppArea::getParentId, areaId) + .list(); + areas.addAll(areas.stream().map(a -> getChildrens(a.getId())).flatMap(List::stream).collect(Collectors.toList())); + return areas; + } + private IPage convertToPage1(List list, Integer pageNum, Integer pageSize) { int num = (pageNum - 1) * pageSize; if (num >= list.size()) { 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 aae3f51f..528f1f13 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 @@ -197,7 +197,7 @@ public class AppUserServiceImpl extends ServiceImpl impl lambdaUpdate() .set(AppUser::getCompanyId, request.getCompanyId()) .set(AppUser::getExpireTime, appUser.getExpireTime()) - .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) +// .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .eq(AppUser::getIsPrimary, false) .in(AppUser::getId, request.getUserIds()) @@ -250,7 +250,7 @@ public class AppUserServiceImpl extends ServiceImpl impl public void enable(EnableAppUserRequest request) { lambdaUpdate() .set(AppUser::getState, request.getEnable() ? UserState.Activated.getState() : UserState.Disabled.getState()) - .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) +// .set(AppUser::getUpdateBy, AdminUserUtil.getUserId()) .set(AppUser::getUpdateTime, LocalDateTime.now()) .in(AppUser::getId, request.getIds()) .update(); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemTranslateServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemTranslateServiceImpl.java index 17c17c53..937be095 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemTranslateServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryItemTranslateServiceImpl.java @@ -103,4 +103,9 @@ public class DictionaryItemTranslateServiceImpl extends ServiceImpl getAllByDictionaryCode(String code, String language) { + return baseMapper.getAllByDictionaryCode(code, language); + } +} \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java index c3d56978..27046486 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java @@ -50,7 +50,11 @@ public class TBaseCustomerServiceImpl extends ServiceImpl new CompanySimpleVO().setId(d.getId()).setName(d.getAgencyCompanyName())).collect(Collectors.toList()); + return datas.stream() + .map(d -> new CompanySimpleVO() + .setId(d.getId()) + .setName(d.getAgencyCompanyName())) + .collect(Collectors.toList()); } @Override @@ -59,6 +63,11 @@ public class TBaseCustomerServiceImpl extends ServiceImpl new CompanySimpleVO().setId(d.getId()).setName(d.getAgencyCompanyName())).collect(Collectors.toList()); + return datas.stream() + .map(d -> new CompanySimpleVO() + .setId(d.getId()) + .setCode(d.getAgencyCompanyCode()) + .setName(d.getAgencyCompanyName())) + .collect(Collectors.toList()); } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java index e9402612..a93d5996 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java @@ -15,7 +15,7 @@ import com.nflg.mobilebroken.common.util.TicketUtl; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.Ticket; import com.nflg.mobilebroken.repository.mapper.TicketMapper; -import com.nflg.mobilebroken.repository.service.IAdminUserService; +import com.nflg.mobilebroken.repository.service.IAppAreaService; import com.nflg.mobilebroken.repository.service.ITicketService; import org.springframework.stereotype.Service; @@ -37,7 +37,7 @@ import java.util.Objects; public class TicketServiceImpl extends ServiceImpl implements ITicketService { @Resource - private IAdminUserService adminUserService; + private IAppAreaService appAreaService; @Override public Integer add(TicketAddRequest request, Integer userId) { @@ -65,6 +65,9 @@ public class TicketServiceImpl extends ServiceImpl impleme @Override public IPage search(TicketSearchRequest request, UserDTO user) { + if (Objects.nonNull(request.getAreaId())) { + request.setAreaIds(appAreaService.getAllhildrens(request.getAreaId())); + } if (request.getType()==1){ return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId()); }else if (request.getType()==2){ diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 230a2aa1..7f26c5be 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -5,7 +5,7 @@ SELECT d.device_no AS 'deviceNo',d.device_name AS 'deviceName',d.model_no AS 'modelNo',d.device_type AS 'deviceType',d.shipment_date AS 'shipmentDate' FROM device d - INNER JOIN t_base_customer c ON d.agent_code=c.sap_customer_no + INNER JOIN t_base_customer c ON d.agent_code=c.agency_company_code WHERE d.data_valid_state=1 AND c.id IN #{companyId} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml index 8304bdd6..f79953bf 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DictionaryItemTranslateMapper.xml @@ -34,4 +34,14 @@ LEFT JOIN dictionary_item_translate dit ON di.id=dit.dictionary_item_id AND dit.language_code=#{language} WHERE d.`code`=#{dictionaryCode} + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index e927cd4f..a2f26a9d 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -3,6 +3,12 @@ + + AND u.area_id IN + + #{areaId} + + AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%')) @@ -10,7 +16,7 @@ AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%') - AND t.component LIKE CONCAT('%', #{request.component}, '%') + AND t.component=#{request.component} AND t.state=#{request.state} @@ -98,7 +104,7 @@ SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution,a.`name` AS 'areaName' - ,c.agency_company_name AS 'companyName',u.company_id AS 'companyId',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' + ,d.customer_name AS 'companyName',u.company_id AS 'companyId',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' ,t.create_time AS 'createTime',t.handle,t.solve_time AS 'solveTime',di.name AS 'warrantyStatusDesc' FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id @@ -135,7 +141,7 @@ SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution,a.`name` AS 'areaName' - ,c.agency_company_name AS 'companyName',u.company_id AS 'companyId',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' + ,d.customer_name AS 'companyName',u.company_id AS 'companyId',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' ,t.create_time AS 'createTime',t.handle,t.solve_time AS 'solveTime',di.name AS 'warrantyStatusDesc',IF(tf.id IS NULL, false, true) AS 'followed' FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id diff --git a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java index 6e23c4cf..4033d92e 100644 --- a/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java +++ b/nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/GlobalRestControllerAdvice.java @@ -29,7 +29,7 @@ public class GlobalRestControllerAdvice { @ExceptionHandler(NflgException.class) public ApiResult handleNflgException(NflgException ex) { log.error("业务错误: ", ex); - return ApiResult.error(STATE.BusinessError,ex.getMessage()); + return ApiResult.error(ex.getState(), ex.getMessage()); } @ExceptionHandler(ConstraintViolationException.class)