内蒙新时空对接(内蒙)

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml

@@ -65,7 +65,6 @@
         DATE_FORMAT(r.time,'%Y-%m-%d %H:%i:%S') as time,
         r.deviceid as deviceId,
         r.bsobjectvaluetype as bsobjectvaluetype,
-        (select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,
         p.xm as xm,
         p.mz as mz,
         p.img as img,

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml

@@ -91,7 +91,7 @@ SELECT
 	a.fssj,
 	a.isdeleted,
     CASE WHEN (tasktype like CONCAT('skph_','%')or tasktype like CONCAT('skbs','%'))  then
-    (SELECT count(distinct(t.objectValue)) FROM sk_regionals_result t WHERE t.taskId = a.taskId)
+    (SELECT count(distinct t.objectValue,t.deviceid) FROM sk_regionals_result t WHERE t.taskId = a.taskId)
     ELSE
     ( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId)end AS resultCount
 FROM