Forráskód Böngészése

售后工程师名称,维修工程师名称

lyhzzz 2 éve
szülő
commit
e8e2b270c1

+ 1 - 0
src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -66,6 +66,7 @@ public class RepairPersonnelService {
         List<Integer> repairStatus = StatusUtil.getRepairerStatus(param.getStatusParam());
         param.setStatusList(repairStatus);
         Page<RepairerVo>  voPage = repairService.repairerOrderList(param);
+        sysUserService.setSaleNameAndRepairManName(voPage.getRecords());
         return PageInfo.PageInfo(voPage);
     }
 

+ 1 - 0
src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -64,6 +64,7 @@ public class RepairSaleService {
         List<Integer> repairStatus = StatusUtil.getSaleStatus(param.getStatusParam());
         param.setStatusList(repairStatus);
         Page<RepairerVo>  voPage = repairService.saleOrderList(param);
+        sysUserService.setSaleNameAndRepairManName(voPage.getRecords());
         for (RepairerVo record : voPage.getRecords()) {
             BigDecimal payAmount = priceListService.getAmountByRepairId(record.getRepairId());
             record.setPayAmount(payAmount);

+ 0 - 1
src/main/java/com/fdkankan/sale/service/impl/RepairServiceImpl.java

@@ -141,7 +141,6 @@ public class RepairServiceImpl extends ServiceImpl<IRepairMapper, Repair> implem
             }
         }
         Page<RepairerVo> page = getBaseMapper().pageInfoList(new Page<>(param.getPageNum(), param.getPageSize()), param);
-
         sysUserService.setSaleNameAndRepairManName(page.getRecords());
         return page;
     }

+ 1 - 0
src/main/java/com/fdkankan/sale/service/impl/RepairSupplyService.java

@@ -60,6 +60,7 @@ public class RepairSupplyService {
         List<Integer> repairStatus = StatusUtil.getSupplyStatus(param.getStatusParam());
         param.setStatusList(repairStatus);
         Page<RepairerVo>  voPage = repairService.supplyOrderList(param);
+        sysUserService.setSaleNameAndRepairManName(voPage.getRecords());
         return PageInfo.PageInfo(voPage);
     }
 

+ 6 - 6
src/main/resources/mapper/sale/RepairMapper.xml

@@ -4,13 +4,13 @@
 
 
     <select id="saleOrderList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
-        select  r.* ,rr.check_result,c.customer_name, cd.send_type,cd.send_tracking_num,s.nick_name as saleName
+        select  r.* ,rr.check_result,c.customer_name, cd.send_type,cd.send_tracking_num,
+        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  t_customer_address cd on r.repair_id = cd.repair_id
-            left join  sys_user s on o.sys_user_id = s.id
         where r.rec_status = 'A' and r.status in
         <foreach item="status" collection="param.statusList" open="(" separator="," close=")">
             #{status}
@@ -37,12 +37,12 @@
 
 
     <select id="supplyOrderList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
-        select  r.*,rr.check_result,o.create_time as orderReceivingTime,s.nick_name as repairManName,c.customer_name
+        select  r.*,rr.check_result,o.create_time as orderReceivingTime,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 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}
@@ -61,12 +61,12 @@
 
 
     <select id="repairerOrderList" resultType="com.fdkankan.sale.vo.response.RepairerVo">
-        select  r.*,o.create_time as orderReceivingTime,s.nick_name as repairManName,c.customer_name
+        select  r.*,o.create_time as orderReceivingTime,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 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}