Merge branch 'feature/active_user'

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -1350,10 +1350,10 @@
                               AND DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') <= #{endTime}
 
                           </if>
-                 		  <if test="operationStartTime != null and operationStartTime != '' and operationEndTime != null and operationEndTime != ''">
-                              and (#{operationStartTime} BETWEEN DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') and  DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d')
-                                     or
-                                    #{operationEndTime} BETWEEN DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') and DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d'))
+                          <if test="operationStartTime != null and operationStartTime != '' and operationEndTime != null and operationEndTime != ''">
+                              and (DATE_FORMAT(ecu.REACH_ACTIVE_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} and  #{operationEndTime}
+                                  or
+                                  DATE_FORMAT(ecu.VALID_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} and #{operationEndTime})
                           </if>
                 group by ecu.USER_ID -- 去重
                 )total