update 修改服务查询 增加 条件查询

health-admin/src/main/resources/templates/server/serv/serv.html

@@ -17,12 +17,12 @@
 						<div class="select-list">
 							<ul>
 								<li>
-									查询名称：<input type="text" name="loginName"/>
+									服务编号：<input type="text" name="serviceTypeNumber"/>
 								</li>
 								<li>
-									手机号码：<input type="text" name="phonenumber"/>
+									服务名称：<input type="text" name="serviceTypeName"/>
 								</li>
-								<li>
+								<!--li>
 									用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
 										<option value="">所有</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -33,7 +33,7 @@
 									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
 									<span>-</span>
 									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
-								</li>
+								</li>-->
 								<li>
 									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -79,7 +79,7 @@
 
 		$(function() {
 		    var panehHidden = false;
-		    if ($(this).width() < 769) {
+		    if ($(this).width() < 1590) {
 		        panehHidden = true;
 		    }
 		    $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
@@ -190,7 +190,6 @@
 		$('#btnRefresh').click(function() {
 			queryDeptTree();
 		});
-
 		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 		function resetPre() {
 			resetDate();

health-system/src/main/resources/mapper/system/ServerMapper.xml

@@ -5,9 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="ServerMapper">
 
 	<select id="selectServerList" parameterType="pd" resultType="pd">
-		select * from s_ffgl_servicetypeinfo
-		<if test="serviceId != null ">
-		    where serviceId=#{serviceId}
+		select * from s_ffgl_servicetypeinfo where 1=1
+		<if test="serviceId != null and serviceId!=''">
+		    and serviceId=#{serviceId}
+		</if>
+		<if test="serviceTypeNumber != null and serviceTypeNumber!=''">
+			and serviceTypeNumber=#{serviceTypeNumber}
+		</if>
+		<if test="serviceTypeName != null and serviceTypeName!=''">
+			and serviceTypeName=#{serviceTypeName}
 		</if>
 	</select>