条件判断

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/ReportServiceMapper.xml

@@ -21,11 +21,14 @@
                 <where>
                     <!--   1本周  -->
                     <if test="null != reportReq.value and reportReq.value == 1">
-                        yearweek(date_format(generate_time,'%Y-%m-%d')) = yearweek(now())
+                        yearweek(date_format(package.generate_time,'%Y-%m-%d')) = yearweek(now())
                     </if>
                     <!--  2本月 -->
                     <if test="null != reportReq.value and reportReq.value == 2">
-                       and date_format(generate_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                       and date_format(package.generate_time,'%Y-%m')=date_format(now(),'%Y-%m')
+                    </if>
+                    <if test="null != reportReq.beginTime and null != reportReq.endTime">
+                        and #{reportReq.beginTime} &lt; package.generate_time &lt; #{reportReq.endTime}
                     </if>
                 </where>
                 ORDER BY per DESC