跟进任务排序

coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml

@@ -169,7 +169,13 @@
             <if test="deadlineEndTime != null">
                 <![CDATA[ and a.deadline <= #{deadlineEndTime}]]>
             </if>
-        order by a.deadline desc, a.id desc
+            <if test="taskStatus == 0">
+                order by a.deadline asc, a.id desc
+            </if>
+            <if test="taskStatus == 2">
+                order by a.deadline desc, a.id desc
+            </if>
+
     </select>
 
     <select id="getFollowTask" resultMap="BaseResultMap">

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml

@@ -326,9 +326,6 @@
     and (cr.id in (
     select max(id) maxId
     from call_record group by partner_line_id) or cr.id is null)
-    <if test="filter">
-      and b.deleted = 0
-    </if>
     <if test="workflowStage!=null and workflowStage!=''">
       and hpli.workflow_stage = #{workflowStage}
     </if>