1

src/main/java/com/fdkankan/sale/service/ISysUserService.java

@@ -5,8 +5,10 @@ import com.fdkankan.sale.entity.SysUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.sale.vo.request.SysUserParam;
 import com.fdkankan.sale.vo.response.ManageLoginResponse;
+import com.fdkankan.sale.vo.response.RepairerVo;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -40,4 +42,6 @@ public interface ISysUserService extends IService<SysUser> {
     HashMap<Long, SysUser> getMapByIds(Set<Long> userIds);
 
     Object allList(String userName);
+
+    void setSaleNameAndRepairManName(List<RepairerVo> records);
 }

src/main/java/com/fdkankan/sale/service/IUserService.java

@@ -1,7 +1,12 @@
 package com.fdkankan.sale.service;
 
+import com.fdkankan.sale.entity.SysUser;
 import com.fdkankan.sale.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.sale.vo.response.RepairerVo;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>

src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -142,18 +142,7 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
         }
         Page<RepairerVo> page = getBaseMapper().pageInfoList(new Page<>(param.getPageNum(), param.getPageSize()), param);
 
-        Set<Long> saleIds = page.getRecords().stream().map(RepairerVo::getSaleId).collect(Collectors.toSet());
-        Set<Long> repairManIds = page.getRecords().stream().map(RepairerVo::getRepairManId).collect(Collectors.toSet());
-        saleIds.addAll(repairManIds);
-        HashMap<Long,SysUser> userMap = sysUserService.getMapByIds(saleIds);
-        for (RepairerVo record : page.getRecords()) {
-            if(record.getSaleId() !=null && userMap.get(record.getSaleId()) !=null){
-                record.setSaleName(userMap.get(record.getSaleId()).getNickName());
-            }
-            if(record.getRepairManId() !=null && userMap.get(record.getRepairManId()) !=null){
-                record.setRepairManName(userMap.get(record.getRepairManId()).getNickName());
-            }
-        }
+        sysUserService.setSaleNameAndRepairManName(page.getRecords());
         return page;
     }
 

src/main/java/com/fdkankan/sale/service/impl/RepairTesterService.java

@@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.sale.common.PageInfo;
 import com.fdkankan.sale.common.ResultCode;
 import com.fdkankan.sale.entity.RepairTest;
+import com.fdkankan.sale.entity.SysUser;
 import com.fdkankan.sale.exception.BusinessException;
-import com.fdkankan.sale.service.IRepairLogService;
-import com.fdkankan.sale.service.IRepairService;
-import com.fdkankan.sale.service.IRepairTestService;
+import com.fdkankan.sale.service.*;
 import com.fdkankan.sale.util.DateUtil;
 import com.fdkankan.sale.util.StatusUtil;
 import com.fdkankan.sale.vo.request.RepairParam;
@@ -18,7 +17,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class RepairTesterService {
@@ -29,6 +31,8 @@ public class RepairTesterService {
     IRepairTestService repairTestService;
     @Autowired
     IRepairLogService repairLogService;
+    @Autowired
+    ISysUserService sysUserService;
 
 
     /**
@@ -41,6 +45,9 @@ public class RepairTesterService {
         List<Integer> repairStatus = StatusUtil.getTesterStatus(param.getStatusParam());
         param.setStatusList(repairStatus);
         Page<RepairerVo> voPage = repairService.testOrderList(param);
+
+       sysUserService.setSaleNameAndRepairManName(voPage.getRecords());
+
         return PageInfo.PageInfo(voPage);
     }
 

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -20,6 +20,7 @@ import com.fdkankan.sale.service.ISysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.sale.vo.request.SysUserParam;
 import com.fdkankan.sale.vo.response.ManageLoginResponse;
+import com.fdkankan.sale.vo.response.RepairerVo;
 import com.fdkankan.sale.vo.response.SysRoleVo;
 import com.fdkankan.sale.vo.response.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +31,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -185,4 +187,21 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
         }
         return this.list(wrapper);
     }
+
+
+    @Override
+    public void setSaleNameAndRepairManName(List<RepairerVo> records) {
+        Set<Long> saleIds =records.stream().map(RepairerVo::getSaleId).collect(Collectors.toSet());
+        Set<Long> repairManIds =records.stream().map(RepairerVo::getRepairManId).collect(Collectors.toSet());
+        saleIds.addAll(repairManIds);
+        HashMap<Long, SysUser> userHashMap = this.getMapByIds(saleIds);
+        for (RepairerVo record : records) {
+            if(record.getSaleId() != null && userHashMap.get(record.getSaleId()) !=null){
+                record.setSaleName(userHashMap.get(record.getSaleId()).getNickName());
+            }
+            if(record.getRepairManId() != null && userHashMap.get(record.getRepairManId()) !=null){
+                record.setRepairManName(userHashMap.get(record.getRepairManId()).getNickName());
+            }
+        }
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/UserServiceImpl.java

@@ -2,13 +2,20 @@ package com.fdkankan.sale.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.sale.entity.SysUser;
 import com.fdkankan.sale.entity.User;
 import com.fdkankan.sale.mapper.IUserMapper;
 import com.fdkankan.sale.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.sale.vo.response.RepairerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 用户信息表 服务实现类

src/main/resources/mapper/sale/RepairMapper.xml

@@ -42,7 +42,7 @@
             left join  t_order_receiving o on r.repair_id = o.repair_id
             left join  t_repair_register rr on r.repair_id = rr.repair_id
             left join  t_customer c on r.repair_id = c.repair_id
-            left join  sys_user s on o.supply_admin_id = s.id
+            left join  sys_user s on rr.sys_user_id = s.id
         where r.rec_status = 'A' and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
@@ -66,7 +66,7 @@
         left join  t_order_receiving o on r.repair_id = o.repair_id
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
-        left join  sys_user s on o.repair_man_id = s.id
+        left join  sys_user s on rr.sys_user_id = s.id
         where r.rec_status = 'A' and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
@@ -81,12 +81,14 @@
     </select>
 
     <select id="testOrderList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
-        select  r.*,rr.check_result,o.create_time as orderReceivingTime, s.nick_name as testerName,c.customer_name
+        select  r.*,rr.check_result,o.create_time as orderReceivingTime, s.nick_name as testerName,c.customer_name,
+               o.sys_user_id as saleId,rr.sys_user_id as repairManId
         from t_repair r
         left join  t_order_receiving o on r.repair_id = o.repair_id
         left join  t_repair_register rr on r.repair_id = rr.repair_id
         left join  t_customer c on r.repair_id = c.repair_id
-        left join  sys_user s on o.tester_id = s.id
+        left join t_repair_test rt on r.repair_id = rt.repair_id
+        left join  sys_user s on rt.sys_user_id = s.id
         where r.rec_status = 'A' and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}