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 984bc872..a9ca4359 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 @@ -158,7 +158,7 @@ public class TiketController extends ControllerBase { **/ @PostMapping("searchTickets") public ApiResult> searchTickets(@Valid @RequestBody TicketSearchRequest request){ - IPage datas = ticketService.search(request, AppUserUtil.getUser()); + IPage datas = ticketService.search(request, AppUserUtil.getUser(),MultilingualUtil.getLanguage()); return ApiResult.success(PageUtil.convert(datas, d -> { if (StrUtil.isNotBlank(d.getHandle())) { List adminUsers = adminUserService.listByIds(StrUtil.split(d.getHandle(),",").stream().map(Integer::parseInt).collect(Collectors.toList())); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java index 95439bf4..884f3d49 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java @@ -21,11 +21,11 @@ import java.util.List; */ public interface TicketMapper extends BaseMapper { - IPage searchMy(IPage page, TicketSearchRequest request, Integer userId); + IPage searchMy(IPage page, TicketSearchRequest request, Integer userId,String language); - IPage searchFollow(IPage page, TicketSearchRequest request, Integer userId); + IPage searchFollow(IPage page, TicketSearchRequest request, Integer userId,String language); - IPage searchArea(IPage page, TicketSearchRequest request, List companyIds, Integer userId); + IPage searchArea(IPage page, TicketSearchRequest request, List companyIds, Integer userId,String language); IPage searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage page); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java index ef236685..c1e32b1e 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java @@ -23,7 +23,7 @@ public interface ITicketService extends IService { Ticket add(TicketAddRequest request, Integer userId); - IPage search(TicketSearchRequest request, UserDTO user); + IPage search(TicketSearchRequest request, UserDTO user,String language); IPage searchPage(AdminTicketSearchRequest request); 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 0289fff1..37f37e4f 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 @@ -120,7 +120,7 @@ public class TicketServiceImpl extends ServiceImpl impleme } @Override - public IPage search(TicketSearchRequest request, UserDTO user) { + public IPage search(TicketSearchRequest request, UserDTO user,String language) { if (Objects.nonNull(request.getAreaId())) { request.setAreaIds(appAreaService.getAllhildrens(request.getAreaId())); } @@ -128,11 +128,11 @@ public class TicketServiceImpl extends ServiceImpl impleme request.setEndTime(request.getEndTime().plusDays(1)); } if (request.getType()==1){ - return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId()); + return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),language); }else if (request.getType()==2){ - return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId()); + return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),language); }else if (request.getType()==3) { - return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request, user.getCompanyIds(), user.getId()); + return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request, user.getCompanyIds(), user.getId(),language); } return null; } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 4fb73945..c3ca22d2 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -79,12 +79,13 @@ SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',true AS 'followed' - ,u.`name` AS 'createBy',true AS 'followed',t.handle,p.part_name AS 'component' + ,u.`name` AS 'createBy',true AS 'followed',t.handle,IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component' FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_area a2 ON u.area_id=a2.id INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.from=0 LEFT JOIN t_base_part p ON t.component_id=p.id + LEFT JOIN t_base_language_data l ON p.id=l.source_id AND l.language_code=#{language} WHERE tf.user_id=#{userId} AND t.state!=4 ORDER BY t.id DESC @@ -105,12 +107,13 @@