【feat】查询打耳标流水

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagEartagRegister2ServiceImpl.java

@@ -52,10 +52,18 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
         wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
+        //吴老师要求，屏蔽耳标
+//        wrapper.ne("earmark","133308351200023");
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
         if (page.getRecords().size() == 0){
             minEarTemp = 0F;
         }
+        Map map = new HashMap();
+        long allCount = this.count(wrapper);
+
+        //在线
+        wrapper.eq("live_status", 1);
+        long onCount = this.count(wrapper);
         List<EartagEartagRegister2> list = this.list(wrapper);
         for (EartagEartagRegister2 record : list) {
             Float earTemp1 = record.getEarTemp1();
@@ -63,11 +71,7 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }
 
-        Map map = new HashMap();
-        long allCount = this.count(wrapper);
-        //在线
-        wrapper.eq("live_status", 1);
-        long onCount = this.count(wrapper);
+
         map.put("countOff",allCount-onCount);
         map.put("countOn",onCount);
         map.put("countAll",allCount);