From 43f87574d44c8f162c7c229d5ed2ed82b97a03eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 9 Mar 2025 17:27:42 +0800 Subject: [PATCH] fix: BUG-706 --- .../admin/controller/TicketController.java | 9 +++++++ .../request/AdminTicketSearchRequest.java | 6 ++--- .../common/pojo/vo/AdminTicketVO.java | 22 +++++++++++------ .../common/pojo/vo/DeviceAgentVO.java | 13 ++++++++++ .../repository/mapper/DeviceMapper.java | 3 +++ .../repository/service/IDeviceService.java | 3 +++ .../service/impl/DeviceServiceImpl.java | 6 +++++ .../main/resources/mapper/DeviceMapper.xml | 6 +++++ .../main/resources/mapper/TicketMapper.xml | 24 +++++++++---------- 9 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentVO.java 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 b9c27639..b5f32733 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 @@ -205,6 +205,15 @@ public class TicketController extends ControllerBase { return ApiResult.success(partService.getSimpleList(name)); } + /** + * 获取所有设备代理商 + * @return 代理商列表 + */ + @GetMapping("getDeviceAgents") + public ApiResult> getDeviceAgents(){ + return ApiResult.success(deviceService.getAgents()); + } + /** * 搜索工单 * @param request 请求参数 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java index c0b0215b..18be83e0 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java @@ -14,9 +14,6 @@ public class AdminTicketSearchRequest extends TicketSearchRequest { //工单处理人 private String handleUserName; - //代理商id - private Integer companyId; - //问题类型 private String question; @@ -35,4 +32,7 @@ public class AdminTicketSearchRequest extends TicketSearchRequest { //区域编码 private String areaCode; + + //代理商编码 + private String agentCode; } \ No newline at end of file diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminTicketVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminTicketVO.java index fc1d38b2..a17bb123 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminTicketVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminTicketVO.java @@ -63,17 +63,25 @@ public class AdminTicketVO { @ExcelColumn("区域") private String areaName; - //代理商名称 - @ExcelColumn("代理商") - private String primaryUserName; +// //代理商名称 +// @ExcelColumn("代理商") +// private String primaryUserName; - @JsonIgnore - @IgnoreExport - private String companyId; +// @JsonIgnore +// @IgnoreExport +// private String companyId; + +// //客户 +// @ExcelColumn("客户") +// private String companyName; + + //代理商 + @ExcelColumn("代理商") + private String agentName; //客户 @ExcelColumn("客户") - private String companyName; + private String customerName; //设备编号 @ExcelColumn("设备编号") diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentVO.java new file mode 100644 index 00000000..1c7f9927 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DeviceAgentVO.java @@ -0,0 +1,13 @@ +package com.nflg.mobilebroken.common.pojo.vo; + +import lombok.Data; + +@Data +public class DeviceAgentVO { + + //代理编码 + private String agentCode; + + //代理名称 + private String agentName; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java index cad31b1f..8a9595d0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; import com.nflg.mobilebroken.common.pojo.vo.ComponentInfo; +import com.nflg.mobilebroken.common.pojo.vo.DeviceAgentVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; import com.nflg.mobilebroken.repository.entity.Device; @@ -43,4 +44,6 @@ public interface DeviceMapper extends BaseMapper { void taskWarrantyStateNotOutsideWithinWarranty(); List getComponents(Integer componentId,String language); + + List getAgents(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java index 49d2d290..774178c7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; +import com.nflg.mobilebroken.common.pojo.vo.DeviceAgentVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; import com.nflg.mobilebroken.repository.entity.Device; @@ -35,4 +36,6 @@ public interface IDeviceService extends IService { void taskWarrantyStateNotOutsideWarranty(); void taskWarrantyStateNotOutsideWithinWarranty(); + + List getAgents(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java index 4cdeb569..bf439b0d 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.mobilebroken.common.pojo.query.PageBaseQuery; import com.nflg.mobilebroken.common.pojo.request.SearchDeviceRequest; +import com.nflg.mobilebroken.common.pojo.vo.DeviceAgentVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO; import com.nflg.mobilebroken.common.pojo.vo.DeviceVO; import com.nflg.mobilebroken.common.util.AppUserUtil; @@ -69,4 +70,9 @@ public class DeviceServiceImpl extends ServiceImpl impleme public void taskWarrantyStateNotOutsideWithinWarranty(){ baseMapper.taskWarrantyStateNotOutsideWithinWarranty(); } + + @Override + public List getAgents() { + return baseMapper.getAgents(); + } } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 37a3ef41..84730754 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -97,4 +97,10 @@ LEFT JOIN t_base_language_data ld ON dcd.model_part_id = ld.source_id WHERE p.enable=1 AND dcd.device_component_id=#{componentId} AND ld.language_code=#{language} + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 84409a7e..db71b0ab 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -47,8 +47,8 @@ AND t.handle_name LIKE CONCAT('%', #{request.handleUserName}, '%') - - AND u.company_id=#{request.companyId} + + AND d.agent_code=#{request.agentCode} AND FIND_IN_SET(#{request.areaCode},c.area_code)>0 @@ -118,10 +118,10 @@ SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName' - ,d.customer_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 'customerName',d.agent_name AS 'agentName',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' ,t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc',d.device_type AS 'deviceType' ,d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate',IF(tf.id IS NULL, false, true) AS 'followed',auc.user_name AS 'cqm' - ,t.solve_time AS 'closeTime',u.name AS 'primaryUserName',auh.user_name AS 'currentHandle',dt.cqm_person_name AS 'cqms' + ,t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle',dt.cqm_person_name AS 'cqms' ,t.handle_name AS 'handle' FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id @@ -171,10 +171,10 @@ SELECT t.id,t.`no`,t.title,t.state,t.urgency,t.component,t.question,t.solution ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName' - ,d.customer_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 'customerName',d.agent_name AS 'agentName',u.`name` AS 'createBy',t.device_no AS 'deviceNo',t.use_time AS 'useTime' ,t.create_time AS 'createTime',t.update_time AS 'completeTime',di.name AS 'warrantyStatusDesc',true AS 'followed' - ,auc.user_name AS 'cqm',t.solve_time AS 'closeTime',u.name AS 'primaryUserName',auh.user_name AS 'currentHandle' + ,auc.user_name AS 'cqm',t.solve_time AS 'closeTime',auh.user_name AS 'currentHandle' ,dt.cqm_person_name AS 'cqms',t.handle_name AS 'handle' FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id @@ -224,10 +224,10 @@