1、生活补贴初审增加跳过部门审核（需要部门审核曾经通过）

2、驳回短信通知对象更改为企业
3、集成电路人才审核附件悬浮框修复

app/admin/controller/LivingAllowance.php

@@ -109,7 +109,7 @@ class LivingAllowance extends AdminController {
         $responseObj->code = 500;
         switch ($process) {
             case 1:
-                if ($oldInfo["checkState"] != LaState::LA_NEED_FIRST_CHECK && $oldInfo["checkState"] != LaState::LA_DEP_REJECT) {
+                if ($oldInfo["checkState"] != LaState::LA_NEED_FIRST_CHECK && $oldInfo["checkState"] != LaState::LA_DEP_REJECT && $oldInfo["checkState"] != LaState::LA_THIRD_REJECT) {
                     $responseObj->msg = "该申报不在审核范围内，无法审核";
                 } else {
                     $responseObj->code = 200;
@@ -118,7 +118,7 @@ class LivingAllowance extends AdminController {
                 break;
             case 2:
                 $company = getCacheById("Company", $this->user["companyId"]);
-                if ($oldInfo["checkState"] != LaState::LA_NEED_DEP_CHECK && $oldInfo["checkState"] != LaState::LA_THIRD_REJECT) {
+                if ($oldInfo["checkState"] != LaState::LA_NEED_DEP_CHECK) {// && $oldInfo["checkState"] != LaState::LA_THIRD_REJECT
                     $responseObj->msg = "该申报不在审核范围内，无法审核";
                 } else if ($company["code"] != CommonConst::JYJ) {
                     $responseObj->msg = "部门审核仅教育局能够审核！";
@@ -319,7 +319,7 @@ class LivingAllowance extends AdminController {
         if (!$oldInfo["highProcess"]) {
             $updData["highProcess"] = $process;
         } else {
-            $updData["highProcess"] = $oldInfo["process"] < $process ? $process : $oldInfo["highProcess"];
+            $updData["highProcess"] = $oldInfo["highProcess"] < $process ? $process : $oldInfo["highProcess"];
         }
         switch ($process) {
             case 1:
@@ -338,7 +338,19 @@ class LivingAllowance extends AdminController {
                 //审核通过
                 if ($oldLog["state"] == 3) {
                     $updData["checkState"] = LaState::LA_NEED_DEP_CHECK;
-                    $updData["firstPassTime"] = date("Y-m-d H:i:s");
+                    if (!$oldInfo["firstPassTime"]) {
+                        $updData["firstPassTime"] = date("Y-m-d H:i:s");
+                    }
+                }
+                //审核通过,跳过部门并审
+                if ($oldLog["state"] == 4) {
+                    if ($oldInfo["highProcess"] != 3) {
+                        $responseObj->msg = "只有曾经通过部门并审才可以选择跳过部门并审";
+                        return json($responseObj);
+                    }
+                    $updData["checkState"] = LaState::LA_NEED_THIRD;
+                    $_updData = $this->calculateAmount($oldInfo);
+                    $updData = array_merge($updData, $_updData);
                 }
                 break;
             case 2:
@@ -359,7 +371,9 @@ class LivingAllowance extends AdminController {
                 }
                 if ($oldLog["state"] == 3) {
                     $updData["checkState"] = LaState::LA_NEED_THIRD;
-                    $updData["firstDepPassTime"] = date("Y-m-d H:i:s");
+                    if (!$oldInfo["firstDepPassTime"]) {
+                        $updData["firstDepPassTime"] = date("Y-m-d H:i:s");
+                    }
                     $_updData = $this->calculateAmount($oldInfo);
                     $updData = array_merge($updData, $_updData);
                 }
@@ -373,7 +387,7 @@ class LivingAllowance extends AdminController {
                     $updData["recommendIsPay"] = -1;
                 }
                 if ($oldLog["state"] == 2) {
-                    $updData["checkState"] = LaState::LA_DEP_REJECT;
+                    $updData["checkState"] = LaState::LA_THIRD_REJECT;
                     $updData["creditStatus"] = 1;
                     $updData["recommendAmount"] = null;
                     $updData["recommendAmountDesc"] = "";
@@ -409,10 +423,11 @@ class LivingAllowance extends AdminController {
 
             if ($process == 1 && $oldLog["state"] == 2) {
                 //驳回到用户发送短信通知
+                $ep = EnterpriseApi::getOne($oldInfo["enterpriseId"]);
                 $tpl_content = "【晋江市人才服务平台】您好！您提交申请的硕博人才生活补贴因信息填写错误或上传不完整已被退回，请及时联系人才联络员登录申报系统查看审核意见并重新提交。";
 
                 $sms = new ChuanglanSmsApi();
-                $result = $sms->sendSMS($oldInfo["phone"], $tpl_content, true);
+                $result = $sms->sendSMS($ep["agentPhone"], $tpl_content, true);
                 $result = json_decode($result, true);
 
                 $record_data = [
@@ -421,7 +436,7 @@ class LivingAllowance extends AdminController {
                     'bizId' => $result["msgId"],
                     'type' => 2,
                     'smsType' => 2,
-                    'phone' => $oldInfo["phone"],
+                    'phone' => $ep["agentPhone"],
                     'name' => $oldInfo["enterpriseName"],
                     'params' => '硕博人才生活补贴驳回',
                     'templateCode' => $tpl_content,

app/admin/view/living_allowance/detail.html

@@ -501,6 +501,7 @@
             <select class="form-control" id="state" onchange="LivingAllowanceInfoInfoDlg.toggleField()">
                 <option value="">请选择</option>
                 <option value="3">审核通过</option>
+                {if condition="$row['highProcess'] eq 3 and $process eq 1"}<option value="4">审核通过（跳过部门并审）</option>{/if}
                 <option value="2">审核驳回</option>
                 <option value="-1">审核不通过</option>
             </select>

app/common/controller/Api.php

@@ -342,11 +342,11 @@ class Api extends BaseController {
         $where[] = ["type", "=", $type];
         switch ($project) {
             case 1:
-                if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, 0, TalentState::FST_SAVE, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]) && $isMix != 1) {
-                    $where[] = ["step", "=", 1]; //只查找人才第一步所需文件
-                } else {
-                    $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件
-                }
+                //if (in_array($checkState, [TalentState::BASE_VERIFY_FAIL, 0, TalentState::FST_SAVE, TalentState::FST_SUBMIT, TalentState::BASE_VERIFY_PASS]) && $isMix != 1) {
+                //$where[] = ["step", "=", 1]; //只查找人才第一步所需文件
+                //} else {
+                $where[] = ["isConditionFile", "<>", 1]; //排除人才条件上传文件
+                //}
                 if (($talent_condition && in_array($source, [3, 4, 5])) || $type == \app\common\state\CommonConst::ENTERPRISE_WJ || $type == \app\common\state\CommonConst::ENTERPRISE_GJ) {
                     $condition_info = Db::table("new_talent_condition")->findOrEmpty($talent_condition);
                     if ($condition_info["bindFileTypes"]) {

public/static/modular/master/livingAllowanceInfo/livingAllowanceInfo.js

@@ -240,7 +240,14 @@ LivingAllowanceInfo.initColumn = function () {
                 }
                 if (value == 20) {
                     if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
-                        return "<span class='label label-success'>上级驳回</span>"
+                        return "<span class='label label-danger'>上级驳回</span>"
+                    } else {
+                        return "<span class='label label-success'>待审核</span>"
+                    }
+                }
+                if (value == 30) {
+                    if (row.highProcess != null && row.highProcess != '' && row.highProcess >= 1) {
+                        return "<span class='label label-danger'>复核驳回</span>"
                     } else {
                         return "<span class='label label-success'>待审核</span>"
                     }

public/static/modular/talentIdentify/talentInfo/talentInfo_common_check.js

@@ -835,6 +835,11 @@ TalentInfoInfoDlg.createNoFieldCheckModal = function () {
             '                </form>';
 }
 
+TalentInfoInfoDlg.showMiniFileModal = function () {
+    console.log($("#id").val())
+    Feng.showMiniFileModal(CONFIG.project_rcrd, $("#type").val(), $("#id").val());
+}
+
 
 $(function () {
     $("select:not(#checkStateModal,#checkStateFirstModal)").each(function () {
@@ -850,6 +855,9 @@ $(function () {
     if (type == 1) {
         TalentInfoInfoDlg.initFileTable();
     }
+    if (type == 2) {
+        TalentInfoInfoDlg.showMiniFileModal();
+    }
 
     $(".fa").bind("mouseover", function () {
         var htm = $(this).data('msg');