From eb41ab8e08866b93906a6a7765a9e02a059a2dad Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Wed, 28 Aug 2024 09:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=B4=E4=BF=AE=E4=BA=BA?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ics/admin/domain/Repair.java     |  5 +++++
 .../admin/service/impl/RepairServiceImpl.java |  1 +
 .../service/impl/RepairStatsServiceImpl.java  |  4 +++-
 .../java/com/ics/admin/vo/RepairStatsVo.java  | 22 +++++++++----------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java
index e3df05f..c16300d 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/Repair.java
@@ -145,6 +145,11 @@ public class Repair extends BaseEntity<Repair> {
      */
     @TableField(exist = false)
     private String repairUserName;
+    /**
+     * 维修人员电话
+     */
+    @TableField(exist = false)
+    private String repairUserPhone;
     /**
      * 维修人员反馈时间
      */
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 d26496f..c7bbca0 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
@@ -334,6 +334,7 @@ public class RepairServiceImpl implements IRepairService {
         if (repair.getRepairUserId() != null && repair.getRepairUserId() > 0) {
             IcsCustomerStaff repairUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getRepairUserId());
             repair.setRepairUserName(repairUser.getUsername());
+            repair.setRepairUserPhone(repairUser.getMobile());
         }
         if (repair.getEvalUserId() != null && repair.getEvalUserId() > 0) {
             IcsCustomerStaff evalUser = customerStaffMapper.selectIcsCustomerStaffById(repair.getEvalUserId());
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
index 7761797..e6a6dd8 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/RepairStatsServiceImpl.java
@@ -77,7 +77,9 @@ public class RepairStatsServiceImpl implements IRepairStatsService {
         } else if ("end".equals(type)) {
             List<Map<String, Object>> wc = new ArrayList<>();
             wc.add(getMap("已完成", repairStatsVo.getWc()));
-            wc.add(getMap("未完成", repairStatsVo.getZs() - repairStatsVo.getWc()));
+            int wwc = 0;
+            if (repairStatsVo.getWc() != null) wwc = repairStatsVo.getZs() - repairStatsVo.getWc();
+            wc.add(getMap("未完成", wwc));
             map.put("wc", wc);
             List<Map<String, Object>> timeout = new ArrayList<>();
             timeout.add(getMap("严重超时", repairStatsVo.getHtimeout()));
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java
index d02b199..12db6e1 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/RepairStatsVo.java
@@ -24,56 +24,56 @@ public class RepairStatsVo implements Serializable {
     /**
      * 待维修工单
      */
-    private Integer wait;
+    private Integer wait = 0;
 
     /**
      * 超时量
      */
-    private Integer timeout;
+    private Integer timeout = 0;
     /**
      * 评价总数
      */
     @JsonIgnore
-    private Integer pj;
+    private Integer pj = 0;
 
     /**
      * 好评
      */
-    private Integer h;
+    private Integer h = 0;
 
     /**
      * 中评
      */
-    private Integer m;
+    private Integer m = 0;
 
     /**
      * 差评
      */
-    private Integer l;
+    private Integer l = 0;
 
     /**
      * 已完成
      */
     @JsonIgnore
-    private Integer wc;
+    private Integer wc = 0;
     /**
      * 严重超时
      */
     @JsonIgnore
-    private Integer htimeout;
+    private Integer htimeout = 0;
     /**
      * 超时
      */
     @JsonIgnore
-    private Integer mtimeout;
+    private Integer mtimeout = 0;
     /**
      * 轻微超时
      */
     @JsonIgnore
-    private Integer ltimeout;
+    private Integer ltimeout = 0;
     /**
      * 未超时
      */
     @JsonIgnore
-    private Integer ntimeout;
+    private Integer ntimeout = 0;
 }