From 0c28d4fea9189a03bf8618f80070eb8977d97a02 Mon Sep 17 00:00:00 2001 From: lujiang Date: Wed, 14 Aug 2024 11:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/RepairServiceImpl.java | 17 ++++++++++++++++- .../src/main/resources/application-dev.yml | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java index 9a3f203..99446c8 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairServiceImpl.java @@ -220,7 +220,22 @@ public class RepairServiceImpl implements IRepairService { */ @Override public Repair selectRepairById(Long id) { - return repairMapper.selectRepairById(id); + Repair repair = repairMapper.selectRepairById(id); + if (repair.getPerUserId() != null && repair.getPerUserId() > 0) { + IcsCustomerStaff perUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getPerUserId()); + repair.setPerUserName(perUser.getUsername()); + } + if (repair.getRepairUserId() != null && repair.getRepairUserId() > 0) { + IcsCustomerStaff repairUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getRepairUserId()); + repair.setRepairUserName(repairUser.getUsername()); + } + if (repair.getEvalUserId() != null && repair.getEvalUserId() > 0) { + IcsCustomerStaff evalUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getEvalUserId()); + repair.setEvalUserName(evalUser.getUsername()); + } + IcsCustomerStaff createUser = customerStaffMapper.selectIcsCustomerStaffById(Long.valueOf(repair.getCreateBy())); + repair.setExt2(createUser.getUsername()); + return repair; } /** diff --git a/shoot-hand/ics-web/src/main/resources/application-dev.yml b/shoot-hand/ics-web/src/main/resources/application-dev.yml index c491e86..1001cee 100644 --- a/shoot-hand/ics-web/src/main/resources/application-dev.yml +++ b/shoot-hand/ics-web/src/main/resources/application-dev.yml @@ -72,8 +72,8 @@ dfs: #path: /Users/lihongyuan/IdeaProjects/saas-ics/ics/ # domain: http://222.184.49.22:9227 # path: D:/ruoyi/uploadPath - domain: http://192.168.0.11:9227 - path: F:/ruoyi/uploadPath + domain: http://127.0.0.1:9227 + path: E:/ruoyi/uploadPath # 公众号配置(必填) wx: