Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -73,11 +73,13 @@
             </if>
             <if test="employeeName !=null and employeeName !=''">
                 AND employee_name like CONCAT('%',#{employeeName},'%')
-
             </if>
             <if test="employeeTel !=null and employeeTel !=''">
                 AND employee_tel like CONCAT('%',#{employeeTel},'%')
             </if>
+            <if test="employeeState !=null ">
+                AND employee_state = #{employeeState}
+            </if>
         </where>
         ORDER BY employee_id DESC
     </select>

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

@@ -45,6 +45,7 @@ public class AdminPtsEmployeeController {
         String employeeName = request.getParameter("employeeName");
         String employeeNo = request.getParameter("employeeNo");
         String employeeTel = request.getParameter("employeeTel");
+        String employeeState = request.getParameter("employeeState");
 
         if (employeeName != null && !"".equals(employeeName)) {
             employee.setEmployeeName(employeeName);
@@ -55,6 +56,9 @@ public class AdminPtsEmployeeController {
         if (employeeTel != null && !"".equals(employeeTel)) {
             employee.setEmployeeTel(employeeTel);
         }
+        if (employeeState != null && !"".equals(employeeState)) {
+            employee.setEmployeeState(Integer.valueOf(employeeState));
+        }
 
         PagedResult<PtsEmployee> pagedResult = ptsEmployeeService.getEmployeeList(pageNO, pageSize, employee, totalNum == 0);
         if(totalNum != 0) {
@@ -68,6 +72,7 @@ public class AdminPtsEmployeeController {
         mv.addObject("employeeName", employeeName);
         mv.addObject("employeeNo", employeeNo);
         mv.addObject("employeeTel", employeeTel);
+        mv.addObject("employeeState", employeeState);
         mv.addObject("page", pagedResult);
         mv.addObject("url", sb.toString());
         return mv;

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -27,6 +27,11 @@
             <input type="text" class="input-text" style="width:150px" value="${employeeNo!}" placeholder="员工编号" id="employeeNo" name="employeeNo">
             <input type="text" class="input-text" style="width:150px" value="${employeeName!}" placeholder="员工姓名" id="employeeName" name="employeeName">
             <input type="text" class="input-text" style="width:150px" value="${employeeTel!}" placeholder="员工电话" id="employeeTel" name="employeeTel">
+            <select class="select" name="employeeState" style="height: 30px;width: 150px">
+                <option value ="">全部</option>
+                <option value ="0" <#if employeeState??><#if employeeState == "0">selected="selected"</#if></#if>>停止使用</option>
+                <option value ="1" <#if employeeState??><#if employeeState == "1">selected="selected"</#if></#if>>正常使用</option>
+            </select>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>