diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index c1ccddf73..890f20906 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -57,7 +57,8 @@ CONCAT('%',#{requestContent},'%') - AND r.request_number=#{requestNumber} + AND r.request_number like + CONCAT('%',#{requestNumber},'%') AND r.is_audit=${isAudit} diff --git a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml index 31cd25671..dfc22d571 100644 --- a/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml @@ -64,7 +64,14 @@ AND r.edit_time between #{dobeginDate} and #{doendDate} - order by r.create_time desc + + + ORDER BY ${page.orderBy} + + + ORDER BY r.create_time desc + + - +
@@ -51,7 +51,7 @@
- type="text" value="${taskInfo.taskName }"> +
@@ -163,11 +163,11 @@ - - - + + + - + @@ -233,12 +233,13 @@ function resetx(){ -// $("#searchForm").reset(); - $(':input','#searchForm') - .not(':button,:submit,:reset,:hidden') - .val('') - .removeAttr('checked') - .removeAttr('selected'); + $("select.selectpicker").each(function(){ + $(this).selectpicker('val',$(this).find('option:first').val()); + $(this).find("option").attr("selected",false); + $(this).find("option:first").attr("selected",true); + }); + $(".Wdate").attr("value",''); + $("#searchForm")[0].reset(); }