专项任务增加排序功能,来函号查询改为模糊查询
This commit is contained in:
@@ -57,7 +57,8 @@
|
|||||||
<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
|
<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
|
||||||
</if>
|
</if>
|
||||||
<if test="requestNumber != null and requestNumber != ''">
|
<if test="requestNumber != null and requestNumber != ''">
|
||||||
AND r.request_number=#{requestNumber}
|
AND r.request_number like
|
||||||
|
<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
|
||||||
</if>
|
</if>
|
||||||
<if test="isAudit != null">
|
<if test="isAudit != null">
|
||||||
AND r.is_audit=${isAudit}
|
AND r.is_audit=${isAudit}
|
||||||
|
|||||||
@@ -64,7 +64,14 @@
|
|||||||
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
|
<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
|
||||||
AND r.edit_time between #{dobeginDate} and #{doendDate}
|
AND r.edit_time between #{dobeginDate} and #{doendDate}
|
||||||
</if>
|
</if>
|
||||||
order by r.create_time desc
|
<choose>
|
||||||
|
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
|
||||||
|
ORDER BY ${page.orderBy}
|
||||||
|
</when>
|
||||||
|
<otherwise>
|
||||||
|
ORDER BY r.create_time desc
|
||||||
|
</otherwise>
|
||||||
|
</choose>
|
||||||
</select>
|
</select>
|
||||||
<!-- 根据来函号查询 -->
|
<!-- 根据来函号查询 -->
|
||||||
<select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
|
<select id="getTaskInfoByTaskName" parameterType="java.lang.String" resultMap="BaseResultMap">
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<!-- 筛选按钮展开状态-->
|
<!-- 筛选按钮展开状态-->
|
||||||
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
|
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${taskInfo.isFilterAction }"/>
|
||||||
|
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
|
||||||
<!-- 搜索内容与操作按钮栏 -->
|
<!-- 搜索内容与操作按钮栏 -->
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-btn">
|
<div class="input-group-btn">
|
||||||
<input id="taskName" name="taskName" class="form-control input-medium" placeholder=<spring:message code="input_title"/> type="text" value="${taskInfo.taskName }">
|
<input id="taskName" name="taskName" class="form-control input-medium" type="text" value="${taskInfo.taskName }">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-group-btn">
|
<div class="input-group-btn">
|
||||||
@@ -163,11 +163,11 @@
|
|||||||
<th><spring:message code="task_time"></spring:message></th>
|
<th><spring:message code="task_time"></spring:message></th>
|
||||||
<th><spring:message code="state"></spring:message></th>
|
<th><spring:message code="state"></spring:message></th>
|
||||||
<th><spring:message code="creator"></spring:message></th>
|
<th><spring:message code="creator"></spring:message></th>
|
||||||
<th><spring:message code="create_time"></spring:message></th>
|
<th class="sort-column createTime"><spring:message code="create_time"/></th>
|
||||||
<th><spring:message code="editor"></spring:message></th>
|
<th><spring:message code="editor"/></th>
|
||||||
<th><spring:message code="edit_time"></spring:message></th>
|
<th class="sort-column editTime"><spring:message code="edit_time"/></th>
|
||||||
<th><spring:message code="auditor"></spring:message></th>
|
<th><spring:message code="auditor"></spring:message></th>
|
||||||
<th><spring:message code="audit_time"></spring:message></th>
|
<th class="sort-column auditTime"><spring:message code="audit_time"></spring:message></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -233,12 +233,13 @@
|
|||||||
|
|
||||||
|
|
||||||
function resetx(){
|
function resetx(){
|
||||||
// $("#searchForm").reset();
|
$("select.selectpicker").each(function(){
|
||||||
$(':input','#searchForm')
|
$(this).selectpicker('val',$(this).find('option:first').val());
|
||||||
.not(':button,:submit,:reset,:hidden')
|
$(this).find("option").attr("selected",false);
|
||||||
.val('')
|
$(this).find("option:first").attr("selected",true);
|
||||||
.removeAttr('checked')
|
});
|
||||||
.removeAttr('selected');
|
$(".Wdate").attr("value",'');
|
||||||
|
$("#searchForm")[0].reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user