add：服务单元管理bug

sop-business/src/main/java/com/qmth/sop/business/bean/result/CrmServiceResult.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.bean.result;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.ServiceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -18,6 +19,9 @@ public class CrmServiceResult {
     @ApiModelProperty("服务单元名称")
     private String serviceUnitName;
 
+    @ApiModelProperty("服务单元状态")
+    private ServiceStatusEnum serviceUnitStatus;
+
     @ApiModelProperty("派单id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long crmId;
@@ -96,6 +100,14 @@ public class CrmServiceResult {
         this.serviceUnitName = serviceUnitName;
     }
 
+    public ServiceStatusEnum getServiceUnitStatus() {
+        return serviceUnitStatus;
+    }
+
+    public void setServiceUnitStatus(ServiceStatusEnum serviceUnitStatus) {
+        this.serviceUnitStatus = serviceUnitStatus;
+    }
+
     public Long getCrmId() {
         return crmId;
     }

sop-business/src/main/java/com/qmth/sop/business/bean/result/ServiceRegionResult.java

@@ -3,6 +3,7 @@ package com.qmth.sop.business.bean.result;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.sop.business.bean.dto.AreaDto;
+import com.qmth.sop.common.enums.ServiceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -24,6 +25,9 @@ public class ServiceRegionResult {
     @ApiModelProperty(value = "服务单元名称")
     private String serviceUnitName;
 
+    @ApiModelProperty(value = "服务单元状态")
+    private ServiceStatusEnum serviceUnitStatus;
+
     @ApiModelProperty(value = "大区经理")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long leadId;
@@ -65,6 +69,14 @@ public class ServiceRegionResult {
         this.serviceUnitName = serviceUnitName;
     }
 
+    public ServiceStatusEnum getServiceUnitStatus() {
+        return serviceUnitStatus;
+    }
+
+    public void setServiceUnitStatus(ServiceStatusEnum serviceUnitStatus) {
+        this.serviceUnitStatus = serviceUnitStatus;
+    }
+
     public Long getLeadId() {
         return leadId;
     }

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBCrmResult.java

@@ -2,6 +2,7 @@ package com.qmth.sop.business.bean.result;
 
 import com.qmth.sop.business.entity.TBCrm;
 import com.qmth.sop.common.enums.ProductTypeEnum;
+import com.qmth.sop.common.enums.ServiceStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -29,6 +30,9 @@ public class TBCrmResult extends TBCrm implements Serializable {
     @ApiModelProperty(value = "提交人")
     private String createName;
 
+    @ApiModelProperty(value = "服务单元状态")
+    private ServiceStatusEnum serviceUnitStatus;
+
     public String getService() {
         return service;
     }
@@ -84,4 +88,12 @@ public class TBCrmResult extends TBCrm implements Serializable {
     public void setCreateName(String createName) {
         this.createName = createName;
     }
+
+    public ServiceStatusEnum getServiceUnitStatus() {
+        return serviceUnitStatus;
+    }
+
+    public void setServiceUnitStatus(ServiceStatusEnum serviceUnitStatus) {
+        this.serviceUnitStatus = serviceUnitStatus;
+    }
 }

sop-business/src/main/resources/mapper/TBCrmMapper.xml

@@ -14,7 +14,8 @@
             sc.province,
             sc.city,
             sc.area,
-            sl.level
+            sl.level,
+            tbs.status AS serviceUnitStatus
         FROM
             t_b_crm tbc
                 LEFT JOIN
@@ -199,7 +200,8 @@
         sc.type custom_type,
         p.name product,
         lu.real_name leadName,
-        cu.real_name createName
+        cu.real_name createName,
+        tbs.status serviceUnitStatus
         FROM
         t_b_crm a
         LEFT JOIN sys_user cru ON cru.id = a.crm_user_id

sop-business/src/main/resources/mapper/TBDeviceInOutMapper.xml

@@ -158,6 +158,7 @@
             ss.name AS supplierName,
             sd.status AS deviceStatus,
             sd.scan_count AS scanCount,
+            sd.device_code AS deviceNo,
             sd.location
         FROM
             sys_device sd
@@ -185,6 +186,7 @@
             ss.name AS supplierName,
             sd.status AS deviceStatus,
             sd.scan_count AS scanCount,
+            sd.device_code AS deviceNo,
             sd.location,
             ss.name AS address
         FROM

sop-business/src/main/resources/mapper/TBServiceRegionMapper.xml

@@ -8,7 +8,8 @@
             tbs.id AS serviceUnitId,
             tbs.name AS serviceUnitName,
             leader.id AS leadId,
-            leader.real_name AS leadName
+            leader.real_name AS leadName,
+            tbs.status AS serviceUnitStatus
         FROM
             t_b_service_region tbsr
                 LEFT JOIN