设备列表。添加设备功能

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsEmployeeController.java

@@ -39,7 +39,7 @@ public class AdminPtsEmployeeController {
                                     @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
                                     @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum) {
         ModelAndView mv = new ModelAndView("pts/employee/employee_list");
-
+        StringBuilder sb = new StringBuilder("/admin/employee/_employee_list?pageSize=" + pageSize);
         PtsEmployee employee = new PtsEmployee();
 
         String employeeName = request.getParameter("employeeName");
@@ -49,15 +49,23 @@ public class AdminPtsEmployeeController {
 
         if (employeeName != null && !"".equals(employeeName)) {
             employee.setEmployeeName(employeeName);
+            sb.append("&employeeName=");
+            sb.append(employeeName);
         }
         if (employeeNo != null && !"".equals(employeeNo)) {
             employee.setEmployeeNo(employeeNo);
+            sb.append("&employeeNo=");
+            sb.append(employeeNo);
         }
         if (employeeTel != null && !"".equals(employeeTel)) {
             employee.setEmployeeTel(employeeTel);
+            sb.append("&employeeTel=");
+            sb.append(employeeTel);
         }
         if (employeeState != null && !"".equals(employeeState)) {
             employee.setEmployeeState(Integer.valueOf(employeeState));
+            sb.append("&employeeState=");
+            sb.append(employeeState);
         }
 
         PagedResult<PtsEmployee> pagedResult = ptsEmployeeService.getEmployeeList(pageNO, pageSize, employee, totalNum == 0);
@@ -65,7 +73,7 @@ public class AdminPtsEmployeeController {
             pagedResult.setTotal(totalNum);
             pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
         }
-        StringBuilder sb = new StringBuilder("/admin/employee/_employee_list?pageSize=" + pageSize);
+
         sb.append("&totalNum=");
         sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
         sb.append("&pageNO=");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/EquipmentController.java

@@ -129,18 +129,26 @@ public class EquipmentController {
         String deviceRemake = request.getParameter("deviceRemake");
         PtsDevice device = new PtsDevice();
         if (StringUtil.isNotEmpty(deviceNumber)) {
+            url.append("&deviceNumber=");
+            url.append(deviceNumber);
             device.setDeviceNumber(deviceNumber);
             mv.addObject("deviceNumber", deviceNumber);
         }
         if (StringUtil.isNotEmpty(deviceName)) {
+            url.append("&deviceName=");
+            url.append(deviceName);
             device.setDeviceName(deviceName);
             mv.addObject("deviceName", deviceName);
         }
         if (StringUtil.isNotEmpty(deviceStatus)) {
+            url.append("&deviceStatus=");
+            url.append(deviceStatus);
             device.setDeviceStatus(Integer.parseInt(deviceStatus));
             mv.addObject("deviceStatus", device.getDeviceStatus());
         }
         if (StringUtil.isNotEmpty(deviceRemake)) {
+            url.append("&deviceRemake=");
+            url.append(deviceRemake);
             device.setDeviceRemake(deviceRemake);
             mv.addObject("deviceRemake", deviceRemake);
         }