1、修改服务单看板时间查询了未确认的和已取消的bug
2、跟进记录根据时间倒序排序
2 files modified
4 ■■■ changed files
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml 2 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -327,6 +327,8 @@
       <![CDATA[ a.BEGIN_TIME > #{beginTime}
        and a.END_TIME < #{endTime}
        and a.STAFF_ID = #{suId} ]]>
        and  a.STATE !='预约取消'
        and  a.STATE !='待确认'
        order by a.BEGIN_TIME asc
    </select>
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml
@@ -395,7 +395,7 @@
        </where>
        order by a.create_time desc
          limit ${offset},${limit}