1

.idea/workspace.xml

@@ -2,14 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/application/common/model/UserFollow.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Forum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Forum.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/General.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/General.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recruit.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Supplier.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/PlatformSwitch.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/PlatformSwitch.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -215,7 +213,7 @@
       <workItem from="1671152221434" duration="19086000" />
       <workItem from="1672793409629" duration="408000" />
       <workItem from="1672793834653" duration="24306000" />
-      <workItem from="1672880479757" duration="18331000" />
+      <workItem from="1672880479757" duration="20218000" />
     </task>
     <servers />
   </component>
@@ -337,10 +335,10 @@
     </option>
   </component>
   <component name="WindowStateProjectService">
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1672904726293">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1672907099992">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1672904726293" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1672907099992" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1672820850032">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
@@ -395,6 +393,15 @@
           <line>45</line>
           <option name="timeStamp" value="2" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="php-line-method">
+          <url>file://$PROJECT_DIR$/application/api/controller/Recruit.php</url>
+          <line>572</line>
+          <properties>
+            <option name="className" value="\app\api\controller\Recruit" />
+            <option name="methodName" value="getFollowUpList" />
+          </properties>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>

application/api/controller/Article.php

@@ -51,6 +51,7 @@ class Article extends Base
         'getReplyComment',
         'getTagsArticle',
         'getBoundList',
+        'getFollowUpList',
     ];
     public function initialize()
     {

application/api/controller/Datum.php

@@ -5,6 +5,7 @@ use app\common\model\DatumCate;
 use app\common\model\DatumIntro;
 use app\common\model\DatumLike;
 use app\common\model\DatumUrl;
+use app\common\model\PlatformSwitch;
 use app\common\model\User;
 use app\common\model\UserCollect;
 use app\common\model\UserDatum;
@@ -39,6 +40,7 @@ class Datum extends Base
         'getLearnHistory',
         'getDatumCollect',
         'getBoundList',
+        'getFollowUpList',
     ];
     public function initialize()
     {
@@ -626,6 +628,18 @@ class Datum extends Base
     }
 
 
+
+    /**
+     * @title 以下接口为二期需求
+     * @desc  以下接口为二期需求
+     * @author  qc
+     * @url /api/Datum/secondPhase
+     * @method GET
+     * @return name:1 type:string default:-- desc:以下接口为二期需求
+     */
+    public function secondPhase(){}
+
+
     /**
      * @title 我的绑定【后台资料绑定该会员】
      * @desc 后台资料绑定该会员
@@ -665,5 +679,36 @@ class Datum extends Base
 
 
 
+    /**
+     * @title 我的追更列表
+     * @desc 我的追更列表
+     * @author qc
+     * @method GET
+     * @url /api/Datum/getFollowUpList
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:title type:string default:-- desc:标题
+     * @param  name:page type:int default:0 desc:页数
+     * @param  name:page_num type:int default:20 desc:每页数
+     * @return name:create_at type:string default:-- desc:追更设置时间
+     * @return name:recruit_id type:int default:-- desc:资料id
+     * @return name:title type:string default:-- desc:标题
+     */
+    public function getFollowUpList()
+    {
+        $sel_where  = [];
+        $sel_where[] = ['p.user_id','=',$this->user_id];
+        $sel_where[] = ['p.type','=',6];
+        $sel_where[] = ['p.switch_id','=',1];
+        $field = 'p.id,p.switch_id as article_id,p.create_at,a.title';
+        $list  = PlatformSwitch::field($field)
+            ->alias('p')
+            ->leftJoin('DatumUrl a','p.switch_id = a.id')
+            ->where($sel_where)
+            ->limit($this->off_set,$this->page_num)
+            ->order('p.id desc')
+            ->select()->toArray();
+        $this->success('ok',['list'=>$list]);
+    }
+
 
 }

application/api/controller/Recruit.php

@@ -26,6 +26,7 @@ class Recruit extends Base
         'getOwnRecruitList',
         'getBrowseList',
         'getRecruitCollect',
+        'getFollowUpList',
     ];
     public function initialize()
     {

application/api/controller/Supplier.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\api\controller;
 use app\common\model\PlatformLike;
+use app\common\model\PlatformSwitch;
 use app\common\model\PressComment;
 use app\common\model\SupplierCate;
 use app\common\model\UserCollect;
@@ -27,6 +28,7 @@ class Supplier extends Base
         'getSupplierGoodsTrack',
         'getTagsSupplierGoods',
         'getCollectSupplierGoods',
+        'getFollowUpList',
         ];
     public function initialize()
     {
@@ -635,6 +637,49 @@ class Supplier extends Base
     }
 
 
+    /**
+     * @title 以下接口为二期需求
+     * @desc  以下接口为二期需求
+     * @author  qc
+     * @url /api/Supplier/secondPhase
+     * @method GET
+     * @return name:1 type:string default:-- desc:以下接口为二期需求
+     */
+    public function secondPhase(){}
+
+
+
+    /**
+     * @title 我的追更列表
+     * @desc 我的追更列表
+     * @author qc
+     * @method GET
+     * @url /api/Datum/getFollowUpList
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:title type:string default:-- desc:标题
+     * @param  name:page type:int default:0 desc:页数
+     * @param  name:page_num type:int default:20 desc:每页数
+     * @return name:create_at type:string default:-- desc:追更设置时间
+     * @return name:recruit_id type:int default:-- desc:资料id
+     * @return name:title type:string default:-- desc:标题
+     * @return name:label type:string default:-- desc:标签
+     */
+    public function getFollowUpList()
+    {
+        $sel_where  = [];
+        $sel_where[] = ['p.user_id','=',$this->user_id];
+        $sel_where[] = ['p.type','=',6];
+        $sel_where[] = ['p.switch_id','=',1];
+        $field = 'p.id,p.switch_id as article_id,p.create_at,a.title,a.label';
+        $list  = PlatformSwitch::field($field)
+            ->alias('p')
+            ->leftJoin('Supplier a','p.switch_id = a.id')
+            ->where($sel_where)
+            ->limit($this->off_set,$this->page_num)
+            ->order('p.id desc')
+            ->select()->toArray();
+        $this->success('ok',['list'=>$list]);
+    }
 
 
 }

application/api/controller/Video.php

@@ -49,6 +49,7 @@ class Video extends Base
         'getTagsVideo',
         'getVideoDetail',
         'getBoundList',
+        'getFollowUpList',
     ];
 
     public function initialize()