rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/master-20250425' into feature/202504-1

This commit is contained in:
曹鹏飞 2025-04-25 15:03:50 +08:00
parent 651d6189bc 3a697996f2
commit db56f891b9
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/TiketController.java
View File

@ -158,7 +158,7 @@ public class TiketController extends ControllerBase {
**/ **/
@PostMapping("searchTickets") @PostMapping("searchTickets")
public ApiResult<PageData<TicketVO>> searchTickets(@Valid @RequestBody TicketSearchRequest request){ public ApiResult<PageData<TicketVO>> searchTickets(@Valid @RequestBody TicketSearchRequest request){
IPage<TicketVO> datas = ticketService.search(request, AppUserUtil.getUser()); IPage<TicketVO> datas = ticketService.search(request, AppUserUtil.getUser(),MultilingualUtil.getLanguage());
return ApiResult.success(PageUtil.convert(datas, d -> { return ApiResult.success(PageUtil.convert(datas, d -> {
if (StrUtil.isNotBlank(d.getHandle())) { if (StrUtil.isNotBlank(d.getHandle())) {
List<AdminUser> adminUsers = adminUserService.listByIds(StrUtil.split(d.getHandle(),",").stream().map(Integer::parseInt).collect(Collectors.toList())); List<AdminUser> adminUsers = adminUserService.listByIds(StrUtil.split(d.getHandle(),",").stream().map(Integer::parseInt).collect(Collectors.toList()));

6
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TicketMapper.java
View File

@ -21,11 +21,11 @@ import java.util.List;
*/ */
public interface TicketMapper extends BaseMapper<Ticket> { public interface TicketMapper extends BaseMapper<Ticket> {
IPage<TicketVO> searchMy(IPage<?> page, TicketSearchRequest request, Integer userId); IPage<TicketVO> searchMy(IPage<?> page, TicketSearchRequest request, Integer userId,String language);
IPage<TicketVO> searchFollow(IPage<?> page, TicketSearchRequest request, Integer userId); IPage<TicketVO> searchFollow(IPage<?> page, TicketSearchRequest request, Integer userId,String language);
IPage<TicketVO> searchArea(IPage<?> page, TicketSearchRequest request, List<Integer> companyIds, Integer userId); IPage<TicketVO> searchArea(IPage<?> page, TicketSearchRequest request, List<Integer> companyIds, Integer userId,String language);
IPage<AdminTicketVO> searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage<?> page); IPage<AdminTicketVO> searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage<?> page);

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java
View File

@ -23,7 +23,7 @@ public interface ITicketService extends IService<Ticket> {
Ticket add(TicketAddRequest request, Integer userId); Ticket add(TicketAddRequest request, Integer userId);
IPage<TicketVO> search(TicketSearchRequest request, UserDTO user); IPage<TicketVO> search(TicketSearchRequest request, UserDTO user,String language);
IPage<AdminTicketVO> searchPage(AdminTicketSearchRequest request); IPage<AdminTicketVO> searchPage(AdminTicketSearchRequest request);

8
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
View File

@ -120,7 +120,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
} }
@Override @Override
public IPage<TicketVO> search(TicketSearchRequest request, UserDTO user) { public IPage<TicketVO> search(TicketSearchRequest request, UserDTO user,String language) {
if (Objects.nonNull(request.getAreaId())) { if (Objects.nonNull(request.getAreaId())) {
request.setAreaIds(appAreaService.getAllhildrens(request.getAreaId())); request.setAreaIds(appAreaService.getAllhildrens(request.getAreaId()));
} }
@ -128,11 +128,11 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
request.setEndTime(request.getEndTime().plusDays(1)); request.setEndTime(request.getEndTime().plusDays(1));
} }
if (request.getType()==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){ }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) { }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; return null;
} }

9
nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
View File

@ -82,13 +82,14 @@
<select id="searchMy" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO"> <select id="searchMy" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed' SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed'
,u.`name` AS 'createBy',t.handle,p.part_name AS 'component' ,u.`name` AS 'createBy',t.handle,IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component'
FROM ticket t FROM ticket t
LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_user u ON t.user_id=u.id
LEFT JOIN app_area a2 ON u.area_id=a2.id LEFT JOIN app_area a2 ON u.area_id=a2.id
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=0 LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=0
LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2 LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2
LEFT JOIN t_base_part p ON t.component_id=p.id 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 t.user_id=#{userId} AND t.state!=4 WHERE t.user_id=#{userId} AND t.state!=4
<include refid="searchWhereCondition"/> <include refid="searchWhereCondition"/>
ORDER BY t.id DESC ORDER BY t.id DESC
@ -96,12 +97,13 @@
<select id="searchFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO"> <select id="searchFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',true AS 'followed' 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 FROM ticket t
LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_user u ON t.user_id=u.id
LEFT JOIN app_area a2 ON u.area_id=a2.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 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_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 WHERE tf.user_id=#{userId} AND t.state!=4
<include refid="searchWhereCondition"/> <include refid="searchWhereCondition"/>
ORDER BY t.id DESC ORDER BY t.id DESC
@ -109,12 +111,13 @@
<select id="searchArea" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO"> <select id="searchArea" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed' SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed'
,u.`name` AS 'createBy',t.handle,p.part_name AS 'component' ,u.`name` AS 'createBy',t.handle,IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component'
FROM ticket t FROM ticket t
LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_user u ON t.user_id=u.id
LEFT JOIN app_area a2 ON u.area_id=a2.id LEFT JOIN app_area a2 ON u.area_id=a2.id
LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=0 LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=0
LEFT JOIN t_base_part p ON t.component_id=p.id 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 t.state!=4 AND u.company_id IN WHERE t.state!=4 AND u.company_id IN
<foreach collection="companyIds" item="companyId" open="(" separator="," close=")"> <foreach collection="companyIds" item="companyId" open="(" separator="," close=")">
#{companyId} #{companyId}