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
86b640bf
Commit
86b640bf
authored
Jun 08, 2021
by
季圣华
Committed by
Gitee
Jun 08, 2021
Browse files
!76 修复首页查询日期范围bug,2月没有31号,会报错
Merge pull request !76 from guwan/master
parents
5c4a0e64
d289e663
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View file @
86b640bf
...
...
@@ -213,7 +213,7 @@
and dh.type='${type}' and dh.sub_type='${subType}'
and di.material_id =${MId}
and dh.oper_time
>
= '${MonthTime}-01 00:00:00'
and dh.oper_time
<
= '${MonthTime}-31 23:59:59'
and dh.oper_time
<
DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH )
and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1'
</select>
...
...
@@ -224,7 +224,7 @@
and dh.type='${type}' and dh.sub_type='${subType}'
and di.material_id =${MId}
and dh.oper_time
>
= '${MonthTime}-01 00:00:00'
and dh.oper_time
<
= '${MonthTime}-31 23:59:59'
and dh.oper_time
<
DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH )
and ifnull(dh.delete_flag,'0') !='1'
and ifnull(di.delete_flag,'0') !='1'
</select>
...
...
@@ -234,7 +234,7 @@
where 1=1
and dh.type='${type}' and dh.sub_type='${subType}'
and dh.oper_time
>
= '${MonthTime}-01 00:00:00'
and dh.oper_time
<
= '${MonthTime}-31 23:59:59'
and dh.oper_time
<
DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH )
and ifnull(dh.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