健康公示墙bug修复

common/src/main/java/com/jpsoft/smart/modules/base/service/PersonDeviceLogService.java

@@ -44,7 +44,7 @@ public interface PersonDeviceLogService {
 
     Page<PersonDeviceLog> findVisitorLogByDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<String> deviceNoList, int pageIndex, int pageSize);
 
-    Page<PersonDeviceLog> findAllPersonLogByCompanyListAndDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<CompanyInfo> list,List<String> deviceNoList, int pageIndex, int pageSize);
+    Page<PersonDeviceLog> findAllPersonLogByCompanyListAndDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<CompanyInfo> list, int pageIndex, int pageSize);
 
 
     Page<PersonDeviceLog> findLastTeacherLogByCompanyList(Date beginOfDay, Date endOfDay, List<CompanyInfo> list, int pageIndex, int pageSize);

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceLogServiceImpl.java

@@ -224,7 +224,7 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
     @Override
     public Page<PersonDeviceLog> findLastPersonLogByCompanyList(DateTime beginOfDay, DateTime endOfDay, List<CompanyInfo> list,int pageNum, int pageSize) {
 
-        Page<PersonDeviceLog> page = PageHelper.startPage(pageNum, pageSize).doSelectPage(() -> {
+        Page<PersonDeviceLog> page = PageHelper.startPage(pageNum, pageSize,false).doSelectPage(() -> {
             personDeviceLogDAO.findLastPersonLogByCompanyList(beginOfDay,endOfDay,list);
         });
 
@@ -233,7 +233,7 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
 
     @Override
     public Page<PersonDeviceLog> findVisitorLogByDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<String> deviceNoList, int pageIndex, int pageSize) {
-        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize).doSelectPage(() -> {
+        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize,false).doSelectPage(() -> {
             personDeviceLogDAO.findVisitorLogByDeviceNoList(beginOfDay,endOfDay,deviceNoList);
         });
 
@@ -241,17 +241,16 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
     }
 
     @Override
-    public Page<PersonDeviceLog> findAllPersonLogByCompanyListAndDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<CompanyInfo> list, List<String> deviceNoList, int pageIndex, int pageSize) {
-        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize).doSelectPage(() -> {
-            personDeviceLogDAO.findLastPersonLogByCompanyList(beginOfDay,endOfDay,list).addAll(personDeviceLogDAO.findVisitorLogByDeviceNoList(beginOfDay,endOfDay,deviceNoList));
+    public Page<PersonDeviceLog> findAllPersonLogByCompanyListAndDeviceNoList(DateTime beginOfDay, DateTime endOfDay, List<CompanyInfo> list,  int pageIndex, int pageSize) {
+        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize,false).doSelectPage(() -> {
+            personDeviceLogDAO.findLastPersonLogByCompanyList(beginOfDay,endOfDay,list);
         });
-
         return page;
     }
 
     @Override
     public Page<PersonDeviceLog> findLastTeacherLogByCompanyList(Date beginOfDay, Date endOfDay, List<CompanyInfo> list, int pageIndex, int pageSize) {
-        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize).doSelectPage(() -> {
+        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize,false).doSelectPage(() -> {
             personDeviceLogDAO.findLastTeacherLogByCompanyList(beginOfDay,endOfDay,list);
         });
 
@@ -260,7 +259,7 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
 
     @Override
     public Page<PersonDeviceLog> findLastStudentLogByCompanyList(Date beginOfDay, Date endOfDay, List<CompanyInfo> list, int pageIndex, int pageSize) {
-        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize).doSelectPage(() -> {
+        Page<PersonDeviceLog> page = PageHelper.startPage(pageIndex, pageSize,false).doSelectPage(() -> {
             personDeviceLogDAO.findLastStudentLogByCompanyList(beginOfDay,endOfDay,list);
         });
 

common/src/main/resources/mapper/base/PersonDeviceLog.xml

@@ -204,8 +204,8 @@
         select count(*) from base_person_device_log where person_id = 0
         and record_time >=#{startTime}
         and record_time <= #{endTime}
-        and device_no in
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   #{item}
+
+        <foreach collection="list" index="index" item="item" open="and device_no in(" separator="," close=")">   #{item}
         </foreach>
     </select>
 
@@ -231,11 +231,10 @@
         where person_id = 0
         and record_time>=#{startTime}
         and record_time &lt;= #{endTime}
-        and device_no in
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   #{item}
+
+        <foreach collection="list" index="index" item="item" open="and device_no in(" separator="," close=")">   #{item}
         </foreach>
         ORDER BY record_time DESC
-
     </select>
 
     <select id="findLastTeacherLogByCompanyList" resultMap="PersonDeviceLogMap">
@@ -246,8 +245,8 @@
         where record_time>=#{startTime}
         and record_time &lt;= #{endTime}
         and popedom_ like '%2%'
-        and company_id in
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   #{item.id}
+
+        <foreach collection="list" index="index" item="item" open="and company_id in(" separator="," close=")">   #{item.id}
         </foreach>
         ORDER BY record_time DESC) a
         where person_id != 0  GROUP BY a.person_id ORDER BY record_time desc
@@ -261,8 +260,8 @@
         where record_time>=#{startTime}
         and record_time &lt;= #{endTime}
         and popedom_ = '1'
-        and company_id in
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">   #{item.id}
+
+        <foreach collection="list" index="index" item="item" open="and company_id in(" separator="," close=")">   #{item.id}
         </foreach>
         ORDER BY record_time DESC) a
         where person_id != 0  GROUP BY a.person_id ORDER BY record_time desc

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/HealthShowApiController.java

@@ -106,14 +106,21 @@ public class HealthShowApiController {
                 for (CompanyInfo companyInfo1 : list) {
                     List<DeviceInfo> deviceInfoList = companyDeviceRelationService.findDeviceByCompanyId(companyInfo1.getId());
                     for (DeviceInfo deviceInfo : deviceInfoList) {
-                        if (!deviceNoList.contains(deviceInfo.getDeviceNo())) {
+                        if (!deviceInfo.getDelFlag() && !deviceNoList.contains(deviceInfo.getDeviceNo())) {
                             deviceNoList.add(deviceInfo.getDeviceNo());
                         }
                     }
                 }
                 Integer personNum = Math.toIntExact(personInfoService.countByCompanyList(list));
                 Integer checkedPersonNum = personDeviceFilterLogService.getDayCheckedPersonNumByCompanyList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), list, null);
-                Integer checkedVisitorNum = personDeviceLogService.getDayCheckedVistorNumByDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), deviceNoList);
+
+                Integer checkedVisitorNum = 0;
+                if (deviceNoList.size()>0){
+                     checkedVisitorNum = personDeviceLogService.getDayCheckedVistorNumByDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), deviceNoList);
+                }
+
+
+
                 Integer num = checkNumCompanyService.getDayCheckNumByCompanyList(DateUtil.format(new Date(), "yyyy-MM-dd"), list);
                 Integer totalNum = totalCheckCompanyService.getTotalCheckNum(list);
                 Integer dayCheckNum = num == null ? 0 : num;
@@ -210,11 +217,14 @@ public class HealthShowApiController {
                 }
                 Page<PersonDeviceLog> personDeviceLogList = new Page<>();
                 if ("all".equals(type)) {
-                    personDeviceLogList = personDeviceLogService.findAllPersonLogByCompanyListAndDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), list, deviceNoList, pageIndex, pageSize);
+                    personDeviceLogList = personDeviceLogService.findAllPersonLogByCompanyListAndDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), list, pageIndex, pageSize);
                 } else if ("person".equals(type)) {
                     personDeviceLogList = personDeviceLogService.findLastPersonLogByCompanyList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), list, pageIndex, pageSize);
                 } else if ("visitor".equals(type)) {
-                    personDeviceLogList = personDeviceLogService.findVisitorLogByDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), deviceNoList, pageIndex, pageSize);
+                    if (deviceNoList.size()>0){
+                        personDeviceLogList = personDeviceLogService.findVisitorLogByDeviceNoList(DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()), deviceNoList, pageIndex, pageSize);
+                    }
+
 
                 }