Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/CrmInvoiceInfo.java

@@ -112,5 +112,5 @@ public class CrmInvoiceInfo implements Serializable {
      * 项目编号
      */
     @TableField(exist = false)
-    private Integer projectId;
+    private String projectId;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmInvoiceInfoExportVO.java

@@ -19,7 +19,7 @@ public class CrmInvoiceInfoExportVO  implements Serializable {
      * 项目编号
      */
     @Excel(name = "项目编号")
-    private Integer projectId;
+    private String projectId;
 
     /**
      * 发票抬头

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceStatusMapper.xml

@@ -19,7 +19,7 @@
         count(service_status = 2 or null) as jhCount,
         count(service_status) as zcCount,
         count(device_status = 1 or null) as dzcCount,
-        count(device_status = 4 or null) as dlxCount
+        count(device_status = 2 or null) as dlxCount
         from dmp_device ddi
         left join dmp_device_status dds
         on ddi.device_id  = dds.device_id
@@ -73,7 +73,7 @@
         count(service_status = 2 or null) as jhCount,
         count(service_status) as zcCount,
         count(device_status = 1 or null) as dzcCount,
-        count(device_status = 4 or null) as dlxCount
+        count(device_status = 2 or null) as dlxCount
         from dmp_device ddi
         left join dmp_device_status dds
         on ddi.device_id  = dds.device_id