Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
fa1c15e8
Commit
fa1c15e8
authored
Jun 12, 2019
by
季圣华
Browse files
解决收支单据无法按时间查询的问题
parent
7b795718
Changes
2
Hide whitespace changes
Inline
Side-by-side
erp_web/js/pages/financial/financial_base.js
View file @
fa1c15e8
...
...
@@ -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
...
...
src/main/resources/mapper_xml/AccountHeadMapperEx.xml
View file @
fa1c15e8
...
...
@@ -22,10 +22,10 @@
and ah.Type='${type}'
</if>
<if
test=
"beginTime != null"
>
and ah.BillTime
>
= '
%
${beginTime}
%
'
and ah.BillTime
>
= '${beginTime}'
</if>
<if
test=
"endTime != null"
>
and ah.BillTime
<
= '
%
${endTime}
%
'
and ah.BillTime
<
= '${endTime}'
</if>
and ifnull(ah.delete_Flag,'0') !='1'
order by ah.Id desc
...
...
@@ -47,10 +47,10 @@
and Type='${type}'
</if>
<if
test=
"beginTime != null"
>
and BillTime
>
= '
%
${beginTime}
%
'
and BillTime
>
= '${beginTime}'
</if>
<if
test=
"endTime != null"
>
and BillTime
<
= '
%
${endTime}
%
'
and BillTime
<
= '${endTime}'
</if>
and ifnull(delete_Flag,'0') !='1'
</select>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment