From dd2554435b9ced61e2a6a06627145fca3bf2685b Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期一, 04 九月 2023 17:17:17 +0800 Subject: [PATCH] 修改bug --- inspection-server/src/main/resources/mapper/QualificationRateStatisticsMapper.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inspection-server/src/main/resources/mapper/QualificationRateStatisticsMapper.xml b/inspection-server/src/main/resources/mapper/QualificationRateStatisticsMapper.xml index a9a3d21..51f01da 100644 --- a/inspection-server/src/main/resources/mapper/QualificationRateStatisticsMapper.xml +++ b/inspection-server/src/main/resources/mapper/QualificationRateStatisticsMapper.xml @@ -13,7 +13,7 @@ INNER JOIN inspection_material im ON i.id = im.inspection_id where (i.state = 1 and im.state=1) <if test="dto.beginDate!=null and dto.endDate!=null"> - DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} + and DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} AND #{dto.endDate} AND DATE_FORMAT( i.start_time, '%Y-%m-%d' )>= #{dto.beginDate} </if> @@ -56,7 +56,7 @@ AND ipr.test_state is not null AND ipr.test_state = 0 <if test="dto.beginDate!=null and dto.endDate!=null"> - DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} + and DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} AND #{dto.endDate} AND DATE_FORMAT( i.start_time, '%Y-%m-%d' )>= #{dto.beginDate} </if> @@ -87,7 +87,7 @@ AND im.state = 1 AND ipr.state = 1 <if test="dto.beginDate!=null and dto.endDate!=null"> - DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} + and DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} AND #{dto.endDate} AND DATE_FORMAT( i.start_time, '%Y-%m-%d' )>= #{dto.beginDate} </if> @@ -124,7 +124,7 @@ INNER JOIN inspection_material im ON i.id = im.inspection_id where (i.state = 1 and im.state=1) <if test="dto.beginDate!=null and dto.endDate!=null"> - DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} + and DATE_FORMAT( i.end_time, '%Y-%m-%d' ) BETWEEN #{dto.beginDate} AND #{dto.endDate} AND DATE_FORMAT( i.start_time, '%Y-%m-%d' )>= #{dto.beginDate} </if> -- Gitblit v1.9.3