diff --git a/web/src/main/java/com/example/web/controller/UserController.java b/web/src/main/java/com/example/web/controller/UserController.java index 0469889..8d8038a 100644 --- a/web/src/main/java/com/example/web/controller/UserController.java +++ b/web/src/main/java/com/example/web/controller/UserController.java @@ -116,7 +116,7 @@ public class UserController { } @GetMapping("/users/apply/list") - public List getApplyList( + public List> getApplyList( @RequestParam(required = false) Integer status) { return userService.getApplyList(status); } diff --git a/web/src/main/java/com/example/web/service/CustomerApplyService.java b/web/src/main/java/com/example/web/service/CustomerApplyService.java index 6b8b4ea..3d44db7 100644 --- a/web/src/main/java/com/example/web/service/CustomerApplyService.java +++ b/web/src/main/java/com/example/web/service/CustomerApplyService.java @@ -29,7 +29,7 @@ public interface CustomerApplyService { * @param status 状态,null表示所有状态 * @return 申请列表 */ - List getApplyList(Integer status); + List> getApplyList(Integer status); /** * 根据客户ID和业务员ID查询申请记录 diff --git a/web/src/main/java/com/example/web/service/UserService.java b/web/src/main/java/com/example/web/service/UserService.java index fa3b995..8201fab 100644 --- a/web/src/main/java/com/example/web/service/UserService.java +++ b/web/src/main/java/com/example/web/service/UserService.java @@ -31,7 +31,7 @@ public interface UserService { // 申请相关方法 Map applyCustomer(Map params); Map approveApply(Map params); - List getApplyList(Integer status); + List> getApplyList(Integer status); // 获取人员列表 Map getPersonnelList(); diff --git a/web/src/main/java/com/example/web/service/impl/CustomerApplyServiceImpl.java b/web/src/main/java/com/example/web/service/impl/CustomerApplyServiceImpl.java index da8ed6a..4a2585b 100644 --- a/web/src/main/java/com/example/web/service/impl/CustomerApplyServiceImpl.java +++ b/web/src/main/java/com/example/web/service/impl/CustomerApplyServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -280,16 +281,48 @@ public class CustomerApplyServiceImpl implements CustomerApplyService { } @Override - public List getApplyList(Integer status) { + public List> getApplyList(Integer status) { try { // 切换到wechat数据源 DataSourceContextHolder.setDataSource("wechat"); + List applyList; if (status == null) { - return customerApplyMapper.findAll(); + applyList = customerApplyMapper.findAll(); } else { - return customerApplyMapper.findByStatus(status); + applyList = customerApplyMapper.findByStatus(status); } + + // 转换为包含电话号码的Map列表 + List> resultList = new ArrayList<>(); + for (CustomerApply apply : applyList) { + Map map = new HashMap<>(); + map.put("id", apply.getId()); + map.put("user_id", apply.getUser_id()); + map.put("sales_id", apply.getSales_id()); + map.put("sales_name", apply.getSales_name()); + map.put("original_manager_name", apply.getOriginal_manager_name()); + map.put("status", apply.getStatus()); + map.put("apply_time", apply.getApply_time()); + map.put("approve_time", apply.getApprove_time()); + map.put("approve_by", apply.getApprove_by()); + map.put("reason", apply.getReason()); + + // 使用user_id查询users表获取电话号码 + try { + Users user = usersMapper.findByUserId(apply.getUser_id()); + if (user != null) { + map.put("phone", user.getPhoneNumber()); + } + } catch (Exception e) { + e.printStackTrace(); + System.out.println("查询用户电话号码时发生错误: " + e.getMessage()); + } + + resultList.add(map); + } + + return resultList; } catch (Exception e) { e.printStackTrace(); return null; diff --git a/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java b/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java index 9d6c7ef..39a622a 100644 --- a/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java +++ b/web/src/main/java/com/example/web/service/impl/UserServiceImpl.java @@ -856,7 +856,7 @@ public class UserServiceImpl implements UserService { } @Override - public List getApplyList(Integer status) { + public List> getApplyList(Integer status) { return customerApplyService.getApplyList(status); } diff --git a/web/src/main/resources/static/index.html b/web/src/main/resources/static/index.html index 9a876b7..4d5d633 100644 --- a/web/src/main/resources/static/index.html +++ b/web/src/main/resources/static/index.html @@ -2708,6 +2708,8 @@ var key = trace.userId || (trace.phoneNumber || trace.nickName); if (!groupedTraces[key]) { groupedTraces[key] = { + userId: trace.userId, + traceId: trace.id, // 保存traceId nickName: trace.nickName, phoneNumber: trace.phoneNumber, followup: trace.followup, @@ -2893,7 +2895,7 @@ ${mergedTraces.map((trace, index) => ` - + ${trace.nickName || '-'} ${trace.phoneNumber || '-'} @@ -2903,7 +2905,7 @@ ${trace.responseTime || '-'} ${trace.managerName || '-'} - ${!isAdmin ? `` : '-'} + ${!isAdmin ? `` : '-'} `).join('')} @@ -4125,8 +4127,8 @@ 申请ID - 客户ID - 业务员 + 电话号码 + 申请人 原负责人 申请时间 状态 @@ -4257,7 +4259,7 @@ 申请ID - 客户ID + 电话号码 申请时间 状态 审批时间 @@ -6388,7 +6390,7 @@ var row = ` ${apply.id} - ${apply.user_id} + ${apply.phone || '-'} ${apply.sales_name} ${apply.original_manager_name || '-'} ${formatDateTime(apply.apply_time)} @@ -6527,7 +6529,7 @@ var row = ` ${apply.id} - ${apply.user_id} + ${apply.phone || '-'} ${formatDateTime(apply.apply_time)} ${statusText}