部门导出增加进入并审时间

审核端填报项全部置灰底

app/admin/controller/Talent.php

@@ -1771,12 +1771,14 @@ class Talent extends AdminController {
         $names["street"] = "所属镇街";
         $names["checkState"] = "审核状态";
         $names["checkMsg"] = "审核意见";
+        $names["first_dept_check_time"] = "进入并审时间";
         $names["verifyDepts"] = "审核部门";
         $names["deptPass"] = "部门通过";
         $names["deptReject"] = "部门驳回";
         $names["deptWait"] = "部门待审";
         $list = VerifyApi::getExportDatas($process, $params);
         if ($process == 4 && in_array($company["code"], ["super", "rsj"])) {
+            $fields[] = "first_dept_check_time";
             $fields[] = "verifyDepts";
             $fields[] = "deptPass";
             $fields[] = "deptReject";

app/admin/view/talent/talentInfo_common_check.html

@@ -2,7 +2,7 @@
 {block name="content"}
 <style type="text/css">
     td{white-space: normal;word-break: normal;}
-    .form-control{height:auto;}
+    .form-control{height:auto;background:#eee;min-height:32px;}
     .panel-heading{
         color:#333;
         background-color:#f5f5f5;
@@ -352,8 +352,8 @@
                                         <tr>
                                             <td>
                                                 <div class="rowGroup word-wrap">
-                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>
-                                                    {if condition="$info['salary_pay_way']==1"}本单位{else/}本单位所属集团公司及权属公司{/if}
+                                                    <label class=" control-label spacing td-label"><span style="color: red">*</span>工资发放渠道</label>                                                    
+                                                    <div class="form-control">{if condition="$info['salary_pay_way']==1"}本单位{else/}本单位所属集团公司及权属公司{/if}</div>                                                    
                                                 </div>
                                             </td>
                                             <td>

app/common/api/VerifyApi.php

@@ -778,6 +778,7 @@ class VerifyApi {
             } else {
                 $fields[] = "tl.active";
                 $fields[] = "tl.new_state as deptCheckState";
+                $fields[] = "tl.createTime as first_dept_check_time";
                 $list = Talent::alias("ti")
                                 ->leftJoin("new_talent_condition tc", "tc.id=ti.talent_condition")
                                 ->leftJoin("un_enterprise e", "e.id=ti.enterprise_id")
@@ -905,6 +906,7 @@ class VerifyApi {
                 foreach ($companys as $k => $companyId) {
                     $company = getCacheById("Company", $companyId);
                     $log = TalentLogApi::getCompanyNewestCheckedLog($item["id"], $companyId);
+                    $item["first_dept_check_time"] = $log["createTime"];
                     $verifyDepts[$k] = $company["name"];
                     if ($log["active"] == 1) {
                         if ($log["new_state"] == 9) {