1

app/admin/controller/Talent.php

@@ -138,7 +138,18 @@ class Talent extends AdminController {
      * @auth {{/talentInfo/gotoIndex/4}}
      */
     public function pre_list() {
-        return view();
+        if (session("user")["type"] == 1) {
+            $message = [
+                "typeName" => "晋江市优秀人才认定", "address" => "聚才网/人才晋江微信公众号", "dep" => "中共晋江市委人才办、晋江市纪委监委驻市人力资源和社会保障局纪检监察组或晋江市公共就业和人才服务中心",
+                "phone" => "0595-85633128", "email" => "jjrc85661234@163.com"
+            ];
+        } else {
+            $message = [
+                "typeName" => "晋江市集成电路产业优秀人才认定", "address" => "福建（晋江）集成电路产业园官方网站及微信公众号", "dep" => "集成电路产业园区",
+                "phone" => "0595-82250007、0595-82250001", "email" => "jjjcdr@163.com"
+            ];
+        }
+        return view("", ["message" => $message]);
     }
 
     public function selectNeedCheckData() {
@@ -308,12 +319,17 @@ class Talent extends AdminController {
      */
     public function preparePublic() {
         $params = $this->request->param();
-        $isMessage = $params["isMessage"] ?: 2;
         $ids = $params["ids"];
         $publicBatch = $params["batch"];
         if (!$publicBatch || strlen($publicBatch) != 6 || !is_numeric($publicBatch))
             return json(["msg" => "公示批次错误"]);
 
+        $isMessage = $params["isMessage"] == 1 ? true : false;
+        if ($isMessage && (!$params["typeName"] || !$params["address"] || !$params["publicStartTime"] || !$params["publicEndTime"] || !$params["dep"] || !$params["phone"] || !$params["email"])) {
+            return json(["msg" => "短信参数不能为空"]);
+        }
+
+
         $ids = array_filter(explode(",", $ids));
 
         $msg = "已公示";
@@ -322,6 +338,7 @@ class Talent extends AdminController {
         $total = count($ids);
         $error = 0;
         $success = 0;
+        $phones = [];
         foreach ($ids as $id) {
             $talent_info = VerifyApi::getOne($id);
             if ($talent_info["checkState"] != TalentState::ZX_PASS) {
@@ -330,10 +347,20 @@ class Talent extends AdminController {
             }
             if (VerifyApi::setPublic($id, $state, $msg, $publicBatch)) {
                 $success++;
+                $phones[] = $talent_info["phone"];
             } else {
                 $error++;
             }
         }
+        $phones = array_unique(array_filter($phones));
+        if ($isMessage && $phones) {
+            $sms = new \app\common\api\ChuanglanSmsApi();
+            $tpl_content = sprintf("【晋江市人才服务平台】您好！您提交申请的%s已完成初步审核，现通过%s将审核结果予以公示，公示时间%s至%s。公示期间如有异议，请及时向%s反映。电话%s，电子邮箱%s。",
+                    $params["typeName"], $params["address"], $params["publicStartTime"], $params["publicEndTime"], $params["dep"], $params["phone"], $params["email"]);
+            while ($phone = array_shift($phones)) {
+                $sms->sendSMS($phone, $tpl_content);
+            }
+        }
         return json(["code" => 200, "msg" => sprintf("公示完成：共提交%d个人才，通过%d个，失败%d个", $total, $success, $error)]);
     }
 
@@ -702,8 +729,12 @@ class Talent extends AdminController {
 //这边去除已经审核通过的单位，主要通过日志是否存在记录。
             $pass_companyIds = TalentLogApi::getPassDepts($talent_info["id"]); //已经通过的单位
             $unpass_companyIds = array_diff($companyIds, (array) $pass_companyIds); //排除已经通过的单位
-            sort($unpass_companyIds);
-            TalentLogApi::writeDeptLogs($talent_info["id"], $unpass_companyIds, TalentState::FST_VERIFY_PASS);
+            if (!$unpass_companyIds) {
+                $data["pass_dept_check"] = 1; //部门已经全部审核过了，跳过部门审核
+            } else {
+                sort($unpass_companyIds);
+                TalentLogApi::writeDeptLogs($talent_info["id"], $unpass_companyIds, TalentState::FST_VERIFY_PASS);
+            }
         }
         $data["id"] = $talent_info["id"];
         $data["checkState"] = $log["new_state"];
@@ -994,14 +1025,15 @@ class Talent extends AdminController {
                         $tc = TalentConditionApi::getOne($talent_info["talent_condition"]);
                         if ($tc["companyIds"] && $talent_info["pass_dept_check"] != 1) {
                             $process = 3;
+                            $fields = DictApi::getTalentFields(3);
                         } else {
                             $process = 4;
+                            $fields = DictApi::getTalentFields(2);
                         }
-                        $fields = DictApi::getTalentFields($process);
                         break;
                     case 9:
                         $process = 4;
-                        $fields = DictApi::getTalentFields($process);
+                        $fields = DictApi::getTalentFields(2);
                         break;
                 }
                 if ($checkState != 2) {

app/admin/view/talent/pre_list.html

@@ -597,12 +597,12 @@
                     </div>
                     <div class="form-group form-inline" id="messageEdit">
                         <label class=" control-label" style="line-height: 40px;"><span style="color: red;">编辑短信内容</span>：您好！您提交申请的
-                            <input type="text" class="form-control input-sm" id="typeName" value="${message.typeName}" maxlength="20">已完成初步审核，现通过
-                            <input type="text" class="form-control input-sm" id="web" placeholder="公示平台(如聚财网/人才晋江公众号)" value="${message.address}" maxlength="40">将审核结果予以公示，公示时间
+                            <input type="text" class="form-control input-sm" id="typeName" value="{$message.typeName}" maxlength="20">已完成初步审核，现通过
+                            <input type="text" class="form-control input-sm" id="web" placeholder="公示平台(如聚财网/人才晋江公众号)" value="{$message.address}" maxlength="40">将审核结果予以公示，公示时间
                             <input type="text" class="form-control input-sm time" id="publicStartTime" maxlength="15">至<input type="text" class="form-control input-sm time" id="publicEndTime" maxlength="15">。公示期间如有异议，请及时向
-                            <input type="text" class="form-control input-sm" id="dep" placeholder="xx单位/部门" value="${message.dep}" maxlength="30">反映。电话
-                            <input type="text" class="form-control input-sm" id="fyphone" value="${message.phone}" maxlength="30">,电子邮箱
-                            <input type="text" class="form-control input-sm" id="fyemail" value="${message.email}" maxlength="20">。
+                            <input type="text" class="form-control input-sm" id="dep" placeholder="xx单位/部门" value="{$message.dep}" maxlength="30">反映。电话
+                            <input type="text" class="form-control input-sm" id="fyphone" value="{$message.phone}" maxlength="30">,电子邮箱
+                            <input type="text" class="form-control input-sm" id="fyemail" value="{$message.email}" maxlength="20">。
                         </label>
                     </div>
                 </form>

app/admin/view/talent/talentInfo_common_check.html

@@ -326,13 +326,13 @@
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>留学毕业院校</label>
                                                     <input type="text" class="form-control" id="abroad_school" name="abroad_school" value="{$info.abroad_school}"/>
                                                 </div>
                                             </td>
                                             <td>
                                                 <div class="rowGroup abroad_need_this" {if condition='!$info["study_abroad"] or $info["study_abroad"] eq 2'}style="display:none;"{/if}>
-                                                     <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
+                                                    <label class="control-label spacing td-label"><span style="color: red">*</span>留学专业</label>
                                                     <input type="text" class="form-control" id="abroad_major" name="abroad_major" value="{$info.abroad_major}"/>
                                                 </div>
                                             </td>
@@ -423,11 +423,11 @@
                                         <tr>
                                             <td colspan="3">
                                                 <div class="rowGroup col-sm-6" {if condition="!$info['source_city']"}style="display:none;"{/if}>
-                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
+                                                    <label class="control-label spacing"><span style="color: red">*</span>入选来源地级市</label>
                                                     <input type="text" class="form-control" id="source_city" name="source_city" value="{$info.sourceCityName}"/>
                                                 </div>
                                                 <div class="rowGroup col-sm-6" {if condition="!$info['source_county']"}style="display:none;"{/if}>
-                                                     <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
+                                                    <label class="control-label spacing"><span style="color: red">*</span>入选来源县市区</label>
                                                     <input type="text" class="form-control" id="source_county" name="source_county" value="{$info.sourceCountyName}"/>
                                                 </div>
                                             </td>
@@ -486,7 +486,7 @@
                                                     </select>
                                                 </div>
                                                 <div class="rowGroup col-sm-12" {if condition='!$info["annual_salary"]'}style="display:none;"{/if}>
-                                                     <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
+                                                    <label class="control-label spacing"><span style="color: red">*</span>年薪</label>
                                                     <input type="text" class="form-control" id="annual_salary" name="annual_salary" value="{$info.annual_salary}"/>
                                                 </div>
                                             </td>
@@ -527,6 +527,11 @@
                                     </table>
                                 </div>
                             </div>
+                            <div class="panel panel-default">
+                                <div class="panel-heading" onclick="$(this).next().toggle()">日志</div>
+                                <table id="logTable">
+                                </table>
+                            </div>
                         </div>
                     </div>
                 </div>

app/common/api/DictApi.php

@@ -297,7 +297,7 @@ class DictApi {
                     if ($last_state == 8) {
                         $str = '<span class="label label-success">待重审</span>';
                     } else if ($last_state == 7) {
-                        $str = '<span class="label label-danger">部门驳回</span>';
+                        $str = '<span class="label label-danger">复核驳回</span>';
                     } else if ($last_state == 9) {
                         $str = '<span class="label label-danger">复核驳回</span>';
                     } else {