nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MessageController.java

@@ -1,6 +1,5 @@
 package com.nflg.mobilebroken.admin.controller;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nflg.mobilebroken.admin.annotation.ApiMark;
 import com.nflg.mobilebroken.common.constant.Constant;
@@ -12,7 +11,6 @@ import com.nflg.mobilebroken.common.pojo.vo.AdminMessageVO;
 import com.nflg.mobilebroken.common.pojo.vo.MessageConfigVO;
 import com.nflg.mobilebroken.common.util.AdminUserUtil;
 import com.nflg.mobilebroken.common.util.PageUtil;
-import com.nflg.mobilebroken.repository.entity.AdminUser;
 import com.nflg.mobilebroken.repository.entity.AppUser;
 import com.nflg.mobilebroken.repository.entity.AppUserApplyfor;
 import com.nflg.mobilebroken.repository.entity.Ticket;
@@ -69,14 +67,9 @@ public class MessageController extends ControllerBase {
         return ApiResult.success(PageUtil.convert(datas, d -> {
             if (Objects.equals(d.getSource(), 0)) {
                 Ticket ticket = ticketService.getById(d.getSourceId());
+                AppUser appUser = appUserService.getById(ticket.getUserId());
                 d.setSourceCreateTime(ticket.getCreateTime());
-                if (StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_ADMIN)) {
+                d.setSourceCreateUserName(appUser.getName());
-                    AdminUser adminUser = adminUserService.getById(ticket.getUserId());
-                    d.setSourceCreateUserName(adminUser.getUserName());
-                } else {
-                    AppUser appUser = appUserService.getById(ticket.getUserId());
-                    d.setSourceCreateUserName(appUser.getName());
-                }
             } else if (Objects.equals(d.getSource(), 1)) {
                 AppUserApplyfor appUserApplyfor = appUserApplyforService.getById(d.getSourceId());
                 AppUser appUser = appUserService.getById(appUserApplyfor.getCreateBy());

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java

@@ -570,10 +570,8 @@ public class TicketController extends ControllerBase {
     @GetMapping("getTicket")
     public ApiResult<TicketInfoVO> getTicket(@Valid @RequestParam @NotNull Integer id) {
         Ticket ticket = ticketService.getById(id);
-        AdminUser adminUser=StrUtil.equals(ticket.getUserPlatform(),Constant.FROM_ADMIN)?adminUserService.getById(ticket.getUserId()):null;
+        AppUser user = appUserService.getById(ticket.getUserId());
-        AppUser user = StrUtil.equals(ticket.getUserPlatform(), Constant.FROM_APP) ? appUserService.getById(ticket.getUserId()) : null;
         String areaName = "";
-        if (Objects.nonNull(user))
         if (user.getIsPrimary()){
             areaName=StrUtil.join(",",customerService.getAreas(Arrays.stream(user.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList())));
         }else if (Objects.nonNull(user.getAreaId())){
@@ -619,8 +617,8 @@ public class TicketController extends ControllerBase {
                 .setImages(getFileVOs(ticket.getImages()))
                 .setAttachments(getFileVOs(ticket.getAttachments()))
                 .setCreateUserId(ticket.getUserId())
-                .setCreateUserName(Objects.nonNull(user)?user.getName():adminUser.getUserName())
+                .setCreateUserName(user.getName())
-                .setCreateUserAvatar(Objects.nonNull(user)?user.getAvatar():adminUser.getAvatar())
+                .setCreateUserAvatar(user.getAvatar())
                 .setCreateTime(ticket.getCreateTime())
                 .setAreaName(areaName)
                 .setCompanyName(device.getCustomerName())

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

@@ -25,7 +25,7 @@ public interface TicketMapper extends BaseMapper<Ticket> {
 
     IPage<TicketVO> searchFollow(IPage<?> page, TicketSearchRequest request, Integer userId,String from,String language);
 
-    IPage<TicketVO> searchArea(IPage<?> page, TicketSearchRequest request, String companyId, Integer userId,String language,Boolean isPrimary,String companyCode,String from);
+    IPage<TicketVO> searchArea(IPage<?> page, TicketSearchRequest request, String companyId, Integer userId,String language,Boolean isPrimary,String companyCode);
 
     IPage<AdminTicketVO> searchFromAdmin(AdminTicketSearchRequest request, Integer userId, IPage<?> page);
 

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nflg.mobilebroken.common.constant.Constant;
 import com.nflg.mobilebroken.common.constant.TicketState;
 import com.nflg.mobilebroken.common.constant.TicketUrgency;
 import com.nflg.mobilebroken.common.pojo.dto.UserDTO;
@@ -133,23 +132,19 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             request.setEndTime(request.getEndTime().plusDays(1));
         }
         if (request.getType()==1){
-            return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(), user.getFrom(), language);
+            return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),user.getFrom(),language);
-        } else if (request.getType() == 2) {
+        }else if (request.getType()==2){
-            return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(), user.getFrom(), language);
+            return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),user.getFrom(),language);
-        } else if (request.getType() == 3) {
+        }else if (request.getType()==3) {
-            if (StrUtil.equals(AppUserUtil.getFrom(), Constant.FROM_ADMIN)) {
+            String companyCode = "";
-                return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request, null, user.getId(), language, null, null, user.getFrom());
+            if (!user.getIsPrimary()){
-            } else {
+                TBaseCustomer customer=customerService.getById(user.getCompanyIds().get(0));
-                String companyCode = "";
+                if (Objects.nonNull(customer)){
-                if (!user.getIsPrimary()) {
+                    companyCode = customer.getAgencyCompanyCode();
-                    TBaseCustomer customer = customerService.getById(user.getCompanyIds().get(0));
-                    if (Objects.nonNull(customer)) {
-                        companyCode = customer.getAgencyCompanyCode();
-                    }
                 }
-                return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request
-                        , StrUtil.join(",", user.getCompanyIds()), user.getId(), language, user.getIsPrimary(), companyCode, user.getFrom());
             }
+            return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request
+                    , StrUtil.join(",",user.getCompanyIds()), user.getId(),language,user.getIsPrimary(),companyCode);
         }
         return null;
     }

nflg-mobilebroken-repository/src/main/resources/mapper/TBaseDeviceTypeMapper.xml

@@ -36,8 +36,6 @@
         FROM device d
                  INNER JOIN t_base_device_type dt ON d.device_type=dt.device_type
         WHERE dt.device_state=1 AND d.device_no=#{deviceNo}
-        ORDER BY d.id desc
-        LIMIT 1
     </select>
 
     <select id="getDeviceTypeCqmList" resultType="com.nflg.mobilebroken.common.pojo.vo.CqmPersionResultVO">

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

@@ -85,10 +85,9 @@
 
     <select id="searchMy" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
         SELECT IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed'
-        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component',t.*
+        ,u.`name` AS 'createBy',IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component',t.*
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
-        LEFT JOIN admin_user au ON t.user_id=au.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=IF(#{from}='app',0,1)
         LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2
@@ -101,11 +100,10 @@
 
     <select id="searchFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
         SELECT IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',true AS 'followed'
-        ,IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',true AS 'followed',t.handle,IF(LENGTH(l.language_value)>0
+        ,u.`name` AS 'createBy',true AS 'followed',t.handle,IF(LENGTH(l.language_value)>0
         ,l.language_value,p.part_name) AS 'component',t.*
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
-        LEFT JOIN admin_user au ON t.user_id=au.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=IF(#{from}='app',0,1)
         LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2
@@ -118,13 +116,12 @@
 
     <select id="searchArea" resultType="com.nflg.mobilebroken.common.pojo.vo.TicketVO">
         SELECT IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName'
-        ,IF(tf.id IS NULL, false, true) AS 'followed',IF(t.user_platform='admin',au.user_name,u.`name`) AS 'createBy',IF(LENGTH(l.language_value)>0
+        ,IF(tf.id IS NULL, false, true) AS 'followed',u.`name` AS 'createBy',IF(LENGTH(l.language_value)>0
         ,l.language_value,p.part_name) AS 'component',t.*
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
-        LEFT JOIN admin_user au ON t.user_id=au.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=IF(#{from}='app',0,1)
+        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 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}
@@ -136,9 +133,6 @@
         <if test="isPrimary==true">
             AND (u.id=#{userId} OR FIND_IN_SET(u.company_id,#{companyId}))
         </if>
-        <if test="isPrimary==null">
-            AND t.user_platform='admin'
-        </if>
         <include refid="searchWhereCondition"/>
         ORDER BY t.id DESC
     </select>
@@ -146,16 +140,15 @@
     <select id="searchFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
         ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName'
-        ,d.customer_name AS 'customerName',d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,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',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
-        LEFT JOIN admin_user au ON t.user_id=au.id
         LEFT JOIN app_area a2 ON u.area_id=a2.id
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
         LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
@@ -169,16 +162,15 @@
     <select id="searchAllFromAdmin" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
         ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName'
-        ,d.customer_name AS 'customerName',d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,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',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
-        LEFT JOIN admin_user au ON t.user_id=au.id
         LEFT JOIN app_area a2 ON u.area_id=a2.id
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
         LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1
@@ -192,17 +184,16 @@
     <select id="searchFromAdminAndFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
         ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName'
-        ,d.customer_name AS 'customerName',d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,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',true AS 'followed',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
-        LEFT JOIN admin_user au ON t.user_id=au.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.user_id=#{userId} AND tf.from=1
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
         LEFT JOIN admin_user auc ON t.cqm=auc.id
@@ -215,16 +206,15 @@
     <select id="searchAllFromAdminAndFollow" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
         ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName'
-        ,d.customer_name AS 'customerName',d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,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',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
-        LEFT JOIN admin_user au ON t.user_id=au.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.user_id=#{userId} AND tf.from=1
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
         LEFT JOIN admin_user auc ON t.cqm=auc.id
@@ -247,20 +237,19 @@
     <select id="searchByFavouritesId" resultType="com.nflg.mobilebroken.common.pojo.vo.AdminTicketVO">
         SELECT t.id,t.`no`,t.title,t.state,t.urgency,p.part_name AS 'component',t.question,t.reason
         ,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),'') AS 'areaName',IF(u.is_primary,'',a2.`name`) AS 'agentAreaName'
-        ,d.customer_name AS 'customerName',d.agent_name AS 'agentName',IF(t.user_platform='admin',au.user_name,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',true AS 'followed',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
-        LEFT JOIN admin_user au ON t.user_id=au.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.user_id=#{userId} AND tf.from=1
         <if test="favouritesId>0">
             AND tf.favorites_id=#{favouritesId}
         </if>
-        LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1
+        LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
         LEFT JOIN admin_user auc ON t.cqm=auc.id