bug fix

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -290,6 +290,9 @@ public class TaDrainageController extends BaseController {
             queryWrapper.eq("org_id",taDrainage.getOrgId());
             queryWrapper.eq("content_type",CommConstant.EVENT_H5);
             queryWrapper.eq("target_id",taDrainage.getDrainageId());
+
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
+
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);

src/main/resources/mapper/TsActivityDailyMapper.xml

@@ -15,9 +15,9 @@
         (
             SELECT
                 DATE_FORMAT(
-                    DATE_ADD( STR_TO_DATE( '2020-04-18', '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
+                    DATE_ADD( STR_TO_DATE( #{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS statis_date
             FROM sequence
-            WHERE rownum < DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
+            WHERE rownum <= DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' ))
         ) a
         LEFT JOIN (
             SELECT

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -228,7 +228,7 @@
         <if test="personId != null and personId !=''">
             AND t.person_id = #{personId}
         </if>
-        ORDER BY t.create_date DESC
+        ORDER BY f.visit_time DESC
     </select>
 
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">