更改一些说明表述

app/admin/view/talent/talentInfo_common_check.html

@@ -442,7 +442,7 @@
                                                 入选条款： {$info["fj_talent_condition_text"]}
                                             </td>
                                             <td align="center" class="word-wrap" width="50%">
-                                                {$info["fj_talent_info"]}
+                                                {$info["fj_talent_info"]|raw}
                                             </td>
                                         </tr>
                                         {/if}
@@ -458,7 +458,7 @@
                                                 认定条件： {$info["qz_talent_condition_text"]}
                                             </td>
                                             <td align="center" class="word-wrap" width="50%">
-                                                {$info["qz_talent_info"]}
+                                                {$info["qz_talent_info"]|raw}
                                             </td>
                                         </tr>
                                         {/if}

app/common/api/VerifyApi.php

@@ -2,6 +2,7 @@
 
 namespace app\common\api;
 
+use app\admin\model\Notice as NoticeModel;
 use app\enterprise\model\Talent;
 use app\common\api\DictApi;
 use app\admin\model\Enterprise;
@@ -79,7 +80,12 @@ class VerifyApi {
                 list($tmp1, $timeStart) = explode("：", $qz_talent_info[1]);
                 list($tmp2, $timeEnd) = explode("：", $qz_talent_info[2]);
                 if (strtotime($timeStart)) {
-                    $qz_talent_info[1] = implode("：", [$tmp1, date("Y-m-d", strtotime($timeStart))]);
+                    $tmp_time = date("Y-m-d", strtotime($timeStart));
+                    $qz_talent_info[1] = implode("：", [$tmp1, $tmp_time]);
+                    $batch_info = NoticeModel::where('batch',$tmp_time)->find();
+                    if($batch_info){
+                        $qz_talent_info[1] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] ."'>".$qz_talent_info[1]."</a>";
+                    }
                 }
                 if (strtotime($timeEnd)) {
                     $qz_talent_info[2] = implode("：", [$tmp2, date("Y-m-d", strtotime($timeEnd))]);
@@ -92,7 +98,12 @@ class VerifyApi {
                 list($tmp2, $validYear) = explode("：", $fj_talent_info[2]);
                 $timeStart = str_replace(["."], "-", $timeStart);
                 if (strtotime($timeStart)) {
-                    $fj_talent_info[0] = implode("：", [$tmp1, date("Y-m-d", strtotime($timeStart))]);
+                    $tmp_time = date("Y-m-d", strtotime($timeStart));
+                    $fj_talent_info[0] = implode("：", [$tmp1, $tmp_time]);
+                    $batch_info = NoticeModel::where('batch',$tmp_time)->find();
+                    if($batch_info){
+                        $fj_talent_info[0] = "<a target='_blank' href='/common/notice/view/id/" . $batch_info['id'] ."'>".$fj_talent_info[0]."</a>";
+                    }
                     if (strtotime($validYear)) {
                         $fj_talent_info[2] = implode("：", [$tmp2, date("Y-m-d", strtotime($validYear))]);
                     } else {

app/common/controller/Notice.php

@@ -38,7 +38,7 @@ class Notice extends BaseController {
         if ($this->request->isAjax()) {
             $pageSize = $this->request->param("pageSize") ?: 6;
             $page = $this->request->param("page") ?: 1;
-            $list = NoticeModel::order(["isTop", "topTime" => "desc", "createTime" => "desc"])->page($page, $pageSize)->select();
+            $list = NoticeModel::where('batch','null')->order(["isTop", "topTime" => "desc", "createTime" => "desc"])->page($page, $pageSize)->select();
             return json($list);
         }
     }