商记

src/main/java/com/ssj/sys/controller/FxController.java

@@ -139,12 +139,19 @@ public class FxController  extends BaseController {
 		
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("LIKE_imei", request.getParameter("LIKE_imei")==null?"":request.getParameter("LIKE_imei"));
-        params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
-        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
+        
+        String inDeviceNumber=request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber");
+        String inDeviceRealNumber=request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber");
+        if(StringUtils.isNotEmpty(inDeviceNumber)) {
+        	params.put("IN_deviceNumber", Arrays.asList(inDeviceNumber.split(" ")));
+        }
+        if(StringUtils.isNotEmpty(inDeviceRealNumber)) {
+        	params.put("IN_deviceRealNumber", Arrays.asList(inDeviceRealNumber.split(" ")));
+        }
+        
         params.put("LIKE_deviceModel", request.getParameter("LIKE_deviceModel")==null?"":request.getParameter("LIKE_deviceModel"));
         params.put("LIKE_deviceCode", request.getParameter("LIKE_deviceCode")==null?"":request.getParameter("LIKE_deviceCode"));
         
-       
         params.put("EQ_isSpan", request.getParameter("EQ_isSpan")==null?"":request.getParameter("EQ_isSpan"));
         params.put("EQ_status", request.getParameter("EQ_status")==null?"":request.getParameter("EQ_status"));
         
@@ -162,6 +169,9 @@ public class FxController  extends BaseController {
         sp.setParams(params);
         Page<Device> page = deviceService.findDeviceByPage(params, initPage(pageNo, pageSize, Direction.DESC, new String[]{"updateTime"}));
         sp.setRowCnt((int) page.getTotalElements());
+        
+        params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
+        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
         model.addAttribute("list", page.getContent());
         model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
         model.addAttribute("page", sp);
@@ -183,8 +193,16 @@ public class FxController  extends BaseController {
 		Merchant merchant=merchantService.getMerchantByPosCode(admin.getLoginName());
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("LIKE_imei", request.getParameter("LIKE_imei")==null?"":request.getParameter("LIKE_imei"));
-        params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
-        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
+        
+        String inDeviceNumber=request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber");
+        String inDeviceRealNumber=request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber");
+        if(StringUtils.isNotEmpty(inDeviceNumber)) {
+        	params.put("IN_deviceNumber", Arrays.asList(inDeviceNumber.split(" ")));
+        }
+        if(StringUtils.isNotEmpty(inDeviceRealNumber)) {
+        	params.put("IN_deviceRealNumber", Arrays.asList(inDeviceRealNumber.split(" ")));
+        }
+
         params.put("LIKE_deviceModel", request.getParameter("LIKE_deviceModel")==null?"":request.getParameter("LIKE_deviceModel"));
         params.put("LIKE_deviceCode", request.getParameter("LIKE_deviceCode")==null?"":request.getParameter("LIKE_deviceCode"));
         
@@ -228,6 +246,10 @@ public class FxController  extends BaseController {
 				orderList.add(device);
 			}
 		}
+	    
+	    params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
+        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
+        
         model.addAttribute("list",orderList);
         model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
         model.addAttribute("page", sp);

src/main/resources/templates/sys/fx/deviceAllList.html

@@ -29,19 +29,26 @@
 <div class="rightinfo">
 	<form id="seachform" th:action="@{/sys/fx/deviceAllList.html}" method="post">
 	  <input type="hidden" name="reportType" id="reportType" />
-	<ul class="seachform">
-			<li>
-				<label>IMEI号</label>
-				<input type="text" id="imei1" name="LIKE_imei" th:value="${search.get('LIKE_imei')}" class="scinput date_width " placeholder="IMEI号">
+	  
+	   <ul class="seachform">
+	  		<li style="width: 100%">
+				<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;小塾编号</label>
+				<input style="width: 50%" type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号，支持多编号查询，空格分隔">
 			</li>
-			
-			<li>
+		 
+		</ul>
+		
+		<ul class="seachform">
+		  	<li style="width: 100%">
 				<label>实际小塾编号</label>
-				<input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号">
+				<input style="width: 50%" type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号，支持多编号查询，空格分隔">
 			</li>
+		</ul>
+	  
+	<ul class="seachform">
 			<li>
-				<label>小塾编号</label>
-				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号">
+				<label>IMEI号</label>
+				<input type="text" id="imei1" name="LIKE_imei" th:value="${search.get('LIKE_imei')}" class="scinput date_width " placeholder="IMEI号">
 			</li>
 			
 			<li>

src/main/resources/templates/sys/fx/deviceList.html

@@ -31,21 +31,28 @@
 <div class="rightinfo">
 	<form id="seachform" th:action="@{/sys/fx/deviceList.html}" method="post">
 	  <input type="hidden" name="reportType" id="reportType" />
+	  
+	   <ul class="seachform">
+	  		<li style="width: 100%">
+				<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;小塾编号</label>
+				<input style="width: 50%" type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号，支持多编号查询，空格分隔">
+			</li>
+		 
+		</ul>
+		
+		<ul class="seachform">
+		  	<li style="width: 100%">
+				<label>实际小塾编号</label>
+				<input style="width: 50%" type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号，支持多编号查询，空格分隔">
+			</li>
+		</ul>
+		
 	  <ul class="seachform">
 			<li>
 				<label>IMEI号</label>
 				<input type="text" id="imei1" name="LIKE_imei" th:value="${search.get('LIKE_imei')}" class="scinput date_width " placeholder="IMEI号">
 			</li>
-		  <li>
-			  <label>实际小塾编号</label>
-			  <input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="实际小塾编号">
-		  </li>
-
-			<li>
-				<label>小塾编号</label>
-				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾编号">
-			</li>
-			
+		
 			<li>
 				<label>ICCID编号</label>
 				<input type="text" id="imei1" name="LIKE_deviceModel" th:value="${search.get('LIKE_deviceModel')}" class="scinput date_width " placeholder="ICCID编号">