打卡记录优化，由查deviceId改为查deviceNo，提升查询性能。

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

@@ -154,9 +154,9 @@
 		]]>
         <where>
             and a.del_flag = false
-            <if test="searchParams.deviceIdList != null">
-                and b.id_ in
-                <foreach item="item" collection="searchParams.deviceIdList"  open="(" separator="," close=")">
+            <if test="searchParams.deviceNoList != null">
+                and a.device_no in
+                <foreach item="item" collection="searchParams.deviceNoList"  open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/PersonDeviceLogController.java

@@ -125,10 +125,10 @@ public class PersonDeviceLogController {
             //需要查出已删除的设备
             List<DeviceInfo> deviceInfoList = deviceInfoService.findByCompanyId(userCompanyId);
 
-            List<String> deviceIdList = new ArrayList<String>();
+            List<String> deviceNoList = new ArrayList<>();
 
             for (DeviceInfo deviceInfo : deviceInfoList) {
-                deviceIdList.add(deviceInfo.getId());
+                deviceNoList.add(deviceInfo.getDeviceNo());
             }
 
             //查询关联单位表
@@ -138,17 +138,17 @@ public class PersonDeviceLogController {
                 List<DeviceInfo> relateDevices = deviceInfoService.findByCompanyId(companyInfo.getId());
 
                 for (DeviceInfo deviceInfo : relateDevices) {
-                    if (!deviceIdList.contains(deviceInfo.getId())){
-                        deviceIdList.add(deviceInfo.getId());
+                    if (!deviceNoList.contains(deviceInfo.getDeviceNo())){
+                        deviceNoList.add(deviceInfo.getDeviceNo());
                     }
                 }
             }
 
-            if (deviceIdList.size() == 0) {
-                deviceIdList.add("-1");
+            if (deviceNoList.size() == 0) {
+                deviceNoList.add("-1");
             }
 
-            searchParams.put("deviceIdList", deviceIdList);
+            searchParams.put("deviceNoList", deviceNoList);
             searchParams.put("relateCompanyList", relateCompanyList);
 
             CompanyInfo companyInfo = companyInfoService.get(userCompanyId);
@@ -345,17 +345,17 @@ public class PersonDeviceLogController {
                 //去掉了删除判断
                 //需要查出已删除的设备
                 List<DeviceInfo> deviceInfoList = deviceInfoService.findByCompanyId(userCompanyId);
-                List<String> deviceIdList = new ArrayList<String>();
+                List<String> deviceNoList = new ArrayList<String>();
 
                 for (DeviceInfo deviceInfo : deviceInfoList) {
-                    deviceIdList.add(deviceInfo.getId());
+                    deviceNoList.add(deviceInfo.getDeviceNo());
                 }
 
-                if (deviceIdList.size() == 0) {
-                    deviceIdList.add("-1");
+                if (deviceNoList.size() == 0) {
+                    deviceNoList.add("-1");
                 }
 
-                searchParams.put("deviceIdList", deviceIdList);
+                searchParams.put("deviceNoList", deviceNoList);
             }
 
             if (StringUtil.isNotEmpty(deviceNo)) {