user_status

application/index/service/PhoneFollowUpService.php

@@ -103,7 +103,9 @@ class PhoneFollowUpService
 
         $date = date("Y-m-d", time());
 
-        if ($start_time >= $date && $start_time <= $date . " 23:59:59" ) {
+        if ($end_time < $date && $end_time < $date . " 23:59:59" ) {
+            $this->phoneFollowUp->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
+        } elseif ($start_time >= $date && $start_time <= $date . " 23:59:59" ) {
             $data = $this->phoneFollowUpTemporary->getFollowList($page_no, $page_size, $order_ = 'id desc', $field, $where);
         } else {
             $data = $this->phoneFollowUpTemporary->getFollowListV3($this->siteId,$page_no, $page_size, $where, $field);

public/resource/template/remark_follow_template_tpl.html

@@ -22,14 +22,13 @@
         <td width="46%" class="text-left follow-up-home">
             [% if(it[item]['label_name']) { %]
                 【[%= it[item]['label_name'] %]】
+            [% } %]
+            [% if(it[item]['user_status'] == 0) { %]
+            【求租】
+            [% } else if(it[item]['user_status'] == 1) {  %]
+            【已租】
             [% }else{ %]
-                [% if(it[item]['user_status'] == 0) { %]
-                    【求租】
-                [% } else if(it[item]['user_status'] == 1) {  %]
-                    【已租】
-                [% }else{ %]
-                    【无效】
-                [% } %]
+            【无效】
             [% } %]
             [%= dealPunctuation(it[item]['content']) %]
         </td>