bug修复

src/main/java/cn/fastfun/controller/api/ApiAppDeviceLogController.java

@@ -137,19 +137,17 @@ public class ApiAppDeviceLogController {
             List<Map<String, Object>> listRes = new ArrayList<>();
             for (Map<String, Object> p : list) {
                 Map<String, Object> pTemp = new HashMap<>();
-                AppDevice device = new AppDevice();
-                device.setImei(ObjectUtil.obj2String(p.get("imei")));
+                AppDevice device = appDeviceService.getOne(QueryParamExp.eq("sn", p.get("sn")));
                 appDeviceService.addImeiTitle(device);
-                AppDevice appDevice = appDeviceService.getOne(QueryParamExp.eq("sn", p.get("sn")));
                 pTemp.put("sn", p.get("sn"));
                 pTemp.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
                 pTemp.put("type_title", device.getTypeTitle());
                 pTemp.put("pack_title", device.getPackTitle());
-                pTemp.put("batch_num", appDevice.getBatchNum());
-                pTemp.put("check_status", appDevice.getCheckStatus());
-                pTemp.put("status", appDevice.getStatus());
-                pTemp.put("received_place", appDevice.getReceivedPlace());
-                pTemp.put("deliver_time", DateUtils.toString(ObjectUtil.obj2Date(appDevice.getDeliverTime()), DateUtils.YMD));
+                pTemp.put("batch_num", device.getBatchNum());
+                pTemp.put("check_status", device.getCheckStatus());
+                pTemp.put("status", device.getStatus());
+                pTemp.put("received_place", device.getReceivedPlace());
+                pTemp.put("operate_time", DateUtils.toString(ObjectUtil.obj2Date(device.getUpdateTime()), DateUtils.YMD));
 
                 listRes.add(pTemp);
             }
@@ -393,10 +391,10 @@ public class ApiAppDeviceLogController {
         StringBuffer sql = new StringBuffer();
         sql.append("select t1.batch_num,t1.operate_id,t1.operator,t1.sn,t1.imei,t1.deliver_time,count(0) as total,count(if(status = 1,true,null)) as in_storage,count(if(status = 2,true,null)) as transfer,");
         sql.append("count(if(status = 3,true,null)) as out_storage,count(if(status = 4,true,null)) as handle,");
-        sql.append("t1.add_time,t1.received_place from app_device t1");
+        sql.append("t1.add_time,t1.received_place from app_device t1 where t1.type = 2");
 
         if (!StringUtils.isEmpty(param.getBatchNum())) {
-            sql.append(" where t1.batch_num like '%").append(param.getBatchNum()).append("%'");
+            sql.append(" and t1.batch_num like '%").append(param.getBatchNum()).append("%'");
         }
 
         sql.append(" group by t1.operate_id");