设备管理新增查询条件

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -59,7 +59,8 @@ public class StorageDeviceInputController {
   	@ApiImplicitParams({
   			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
   			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query"),
+			@ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
     public PageInfo<StorageDeviceinput> getList(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceType) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
@@ -245,14 +246,18 @@ public class StorageDeviceInputController {
   	@ApiImplicitParams({
   			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
   			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
-  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query"),
+			@ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
-    public PageInfo<StorageDeviceinput> getDeviceAccountList(HttpServletRequest request,Integer pageNum, Integer pageSize, Integer deviceType ,String orgName) throws Exception{
+    public PageInfo<StorageDeviceinput> getDeviceAccountList(HttpServletRequest request,Integer pageNum, Integer pageSize, Integer deviceType ,String orgName,String deviceName) throws Exception{
     	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
     	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
     	if(ParameterUtil.isnotnull(deviceType)){
     		criteria.andDeviceTypeEqualTo(deviceType);
     	}
+		if(ParameterUtil.isnotnull(deviceName)){
+			criteria.andDeviceNameLike(deviceName);
+		}
         //排序
         storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
    

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceKeepController.java

@@ -55,6 +55,7 @@ public class StorageDeviceKeepController {
   	@ApiImplicitParams({
   			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
   			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
   	})
     public PageInfo<StorageDevicekeep> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, 
     		Integer keepStatus, Integer orgId) throws Exception{