bug修复

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

@@ -125,9 +125,12 @@ public class ApiAppDeviceLogController {
                     param.getCheckStatus().toString() + ")");
         }
 
+        if (!StringUtils.isEmpty(param.getSn())) {
+            sql.append(" AND sn like '%" + param.getSn() + "%'");
+        }
+
         log.info("SQL: {}", sql.toString());
 
-        param.addParam(QueryParamExp.like("sn", "%".concat(param.getSn()).concat("%")));
         ApiPageDTO page = appDeviceService.getListBySQL(sql.toString(), new HashMap<>(), param);
         if (null != page.getData()) {
             // 组装数据
@@ -270,7 +273,7 @@ public class ApiAppDeviceLogController {
             // 组装数据
             List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
             for (Map<String, Object> p : list) {
-                AppDevice device = new AppDevice();
+                AppDevice device = appDeviceService.getOne(QueryParamExp.eq("sn",p.get("sn")));
                 device.setImei(ObjectUtil.obj2String(p.get("imei")));
                 appDeviceService.addImeiTitle(device);
 
@@ -279,6 +282,7 @@ public class ApiAppDeviceLogController {
                 p.put("deliver_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("deliver_time")), DateUtils.YMD));
                 p.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
                 p.put("operator", "admin");
+                p.put("instorageTime", device.getInstorageTime());
             }
             page.setData(list);
         }

src/main/java/cn/fastfun/controller/param/DeviceOperateQueryParam.java

@@ -19,16 +19,14 @@ public class DeviceOperateQueryParam extends QueryParam {
         addParam(QueryParamExp.eq("operateID", operateID));
 
     }
-    @ApiModelProperty(value = "SN", name = "sn", required = true)
     public void setSn(String sn) {
         if (!StringUtils.isEmpty(sn))
-            addParam(QueryParamExp.eq("sn", sn));
+            addParam(QueryParamExp.like("sn", "%".concat(sn).concat("%")));
     }
 
-    @ApiModelProperty(value = "IMEI", name = "imei", required = true)
     public void setImei(String imei) {
         if (!StringUtils.isEmpty(imei))
-            addParam(QueryParamExp.eq("imei", imei));
+            addParam(QueryParamExp.like("imei", "%".concat(imei).concat("%")));
     }
 
     @ApiModelProperty(value = "设备状态", name = "status", example = "[], 0：未入库,1:已入库,2:已调拨，3:已出库，4:已处置")