From 71d02f23b4b5c155868d37c43338fc1bedb016bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Tue, 8 Jun 2021 17:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!76=20:?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4bug=EF=BC=8C2=E6=9C=88?= =?UTF-8?q?=E6=B2=A1=E6=9C=8931=E5=8F=B7=EF=BC=8C=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper_xml/DepotItemMapperEx.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index 874f2c06..a052b9fd 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -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 < DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH ) + and dh.oper_time <= '${MonthTime}-31 23:59:59' and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1' @@ -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 < DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH ) + and dh.oper_time <= '${MonthTime}-31 23:59:59' and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1' @@ -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 < DATE_ADD(STR_TO_DATE('${MonthTime}','%Y-%m'),INTERVAL 1 MONTH ) + and dh.oper_time <= '${MonthTime}-31 23:59:59' and ifnull(dh.delete_flag,'0') !='1'