diff --git a/erp_web/js/pages/financial/financial_base.js b/erp_web/js/pages/financial/financial_base.js
index 54645980..65a3864b 100644
--- a/erp_web/js/pages/financial/financial_base.js
+++ b/erp_web/js/pages/financial/financial_base.js
@@ -959,6 +959,14 @@
}
function showAccountHeadDetails(pageNo,pageSize){
+ var beginTime = $.trim($("#searchBeginTime").val());
+ var endTime = $.trim($("#searchEndTime").val());
+ if(beginTime) {
+ beginTime = beginTime + ' 00:00:00';
+ }
+ if(endTime) {
+ endTime = endTime + ' 23:59:59';
+ }
$.ajax({
type:"get",
url: "/accountHead/list",
@@ -967,8 +975,8 @@
search: JSON.stringify({
type: listType,
billNo: $.trim($("#searchBillNo").val()),
- beginTime: $("#searchBeginTime").val(),
- endTime: $("#searchEndTime").val()
+ beginTime: beginTime,
+ endTime: endTime
}),
currentPage: pageNo,
pageSize: pageSize
diff --git a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
index d5f894b0..f1ab4536 100644
--- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -22,10 +22,10 @@
and ah.Type='${type}'
- and ah.BillTime >= '%${beginTime}%'
+ and ah.BillTime >= '${beginTime}'
- and ah.BillTime <= '%${endTime}%'
+ and ah.BillTime <= '${endTime}'
and ifnull(ah.delete_Flag,'0') !='1'
order by ah.Id desc
@@ -47,10 +47,10 @@
and Type='${type}'
- and BillTime >= '%${beginTime}%'
+ and BillTime >= '${beginTime}'
- and BillTime <= '%${endTime}%'
+ and BillTime <= '${endTime}'
and ifnull(delete_Flag,'0') !='1'