bug fix

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

@@ -187,12 +187,11 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             taExtendContentQueryWrapper.eq("org_id", orgId);
             taExtendContentQueryWrapper.eq("status", 1);
             taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+            taExtendContentQueryWrapper.eq("show_position", extendContent.getShowPosition());
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
-            if (CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
-                taExtendContentQueryWrapper.eq("building_id", extendContent.getBuildingId());
-            }
+            taExtendContentQueryWrapper.eq("building_id", extendContent.getBuildingId());
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
             if (!Collections.isEmpty(extContentInfo)){
                 return false;

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -50,8 +50,7 @@
         select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
 
         SELECT
-        DATE_FORMAT(
-        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
         FROM sequence
         WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
 
@@ -73,8 +72,7 @@
         select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
 
         SELECT
-        DATE_FORMAT(
-        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
         FROM sequence
         WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
 
@@ -99,5 +97,6 @@
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date
         ) as tp on date.date = tp.create_time
+        order by date.date
     </select>
 </mapper>

src/main/resources/mapper/statistic/TsUserBehaviorStatisticMapper.xml

@@ -62,7 +62,7 @@
             td_biz_event_type b
             <trim prefix="where">
                 <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
                 </if>
             </trim>
         ) AS temp_date