增加维修人电话

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;
     /**
      * 维修人员反馈时间
      */

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());

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()));

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;
 }