Răsfoiți Sursa

更新一些修改

sandm 2 ani în urmă
părinte
comite
9d588eb7f3

+ 1 - 1
app/admin/controller/EnterpriseChangeRecord.php

@@ -427,7 +427,7 @@ class EnterpriseChangeRecord extends AdminController {
                 'smsType' => 2,
                 'name' => $ecr['newName'],
                 'phone' => $ecr['newAgentPhone'],
-                'templateCode' => "【晋江市人才服务平台】您好!您提交申请的优秀人才{$checkMsg}因信息填写错误或上传不完整已被退回,请及时登录申报系统查看审核意见并重新提交。",
+                'templateCode' => "【晋江市人才服务平台】您好!您提交申请的晋江市现代产业体系人才机构用户/机构信息变更因信息填写错误或材料不完整已被退回,请及时登录“晋江市人才综合服务申报平台”根据审核意见修改并重新提交。。",
                 'params' => '机构信息变更',
                 'state' => 1,
                 'sendingDate' => date("Y-m-d H:i:s", time()),

+ 30 - 11
app/enterprise/view/talent/no_file_apply.html

@@ -42,11 +42,9 @@
     }
     .word-wrap{
         width:100%;
-        white-space:nowrap;
+        white-space:normal;
         word-wrap:break-word;
         word-break:break-all;
-        text-overflow:ellipsis;
-        overflow:hidden;
     }
     ul{
         padding: 0;
@@ -399,7 +397,7 @@
                                                 </td>
                                                 <td>
                                                     <div class="rowGroup">
-                                                        <label class="control-label spacing td-label">职技术资格</label>
+                                                        <label class="control-label spacing td-label">职技术资格</label>
                                                         <input type="text" class="form-control" id="pro_qua" name="pro_qua" value="{$row.pro_qua}"/>
                                                     </div>
                                                 </td>
@@ -413,17 +411,38 @@
                                         </table>
 
                                         <table style="width: 100%;border-collapse: collapse;" class="table table-bordered">
+                                            {if condition="$row['fjImport'] == 1"}
                                             <tr>
-                                                <td colspan="2" align="center">
-                                                    导入来源标签:
-                                                    {if condition='$row["isImport"] == 1'}福建省高层次人才{/if}
-                                                    {if condition='$row["isImport"] == 2'}泉州市高层次人才{/if}
+                                                <td align="center" class="word-wrap">
+                                                    导入来源标签:福建省高层次人才
                                                 </td>
-                                                <td colspan="2" align="center">
-                                                    认定条件:
-                                                    {$row["talent_condition_text"]}
+                                                <td align="center" class="word-wrap">
+                                                    人才类型:{$row["fj_talent_level"]}
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    入选条款: {$row["fj_talent_condition_text"]}
+                                                </td>
+                                                <td align="center" class="word-wrap" width="25%">
+                                                    {$row["fj_talent_info"]}
+                                                </td>
+                                            </tr>
+                                            {/if}
+                                            {if condition="$row['qzImport'] == 1"}
+                                            <tr>
+                                                <td align="center" class="word-wrap">
+                                                    导入来源标签:泉州市高层次人才
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    人才层次:{$row["qz_talent_level"]}
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    认定条件: {$row["qz_talent_condition_text"]}
+                                                </td>
+                                                <td align="center" class="word-wrap">
+                                                    {$row["qz_talent_info"]}
                                                 </td>
                                             </tr>
+                                            {/if}
                                             <tr>
                                                 <td>
                                                     <div class="rowGroup">

+ 60 - 12
app/job/Import.php

@@ -179,7 +179,8 @@ class Import {
                         $enterprise_name = '';
                         $enterprise_id = '';
                         $action = 'insert';
-                        for ($i = 0; $i < 9; $i++) {
+                        $str = "";
+                        for ($i = 0; $i < 37; $i++) {
                             switch ($i) {
                                 case 0:
                                     if (empty($row[$i])) {
@@ -231,16 +232,47 @@ class Import {
                                     }
                                     break;
                                 case 8:
+                                    if($row[$i] == '女'){
+                                        $item['sex'] = 2;
+                                    }else{
+                                        $item['sex'] = 1;
+                                    }
+                                    break;
+                                case 9:
                                     $item['nationality'] = array_key_exists($row[$i], $country) ? $country[$row[$i]] : 'other';
                                     break;
-                                case 19:
-                                    $item['talent_condition_text'] = $row[$i];
+                                case 15:
+                                    $item['phone'] = $row[$i];
+                                    break;
+                                case 16:
+                                    $item['email'] = $row[$i];
+                                    break;
+                                case 25:
+                                    $item['position'] = $row[$i];
+                                    break;
+                                case 31:
+                                    $item['fj_talent_level'] = $row[$i];
+                                    break;
+                                case 32:
+                                    $item['fj_talent_condition_text'] = $row[$i];
+                                    break;
+                                case 33:
+                                    $str = "认定时间:".$row[$i];
+                                    break;
+                                case 34:
+                                    $str .= ";省级人才证书编号:" . $row[$i];
+                                    break;
+                                case 35:
+                                    $str .= ";有效期:" . $row[$i];
                                     break;
                             }
                         }
+                        $item['source'] = 1;
+                        $item['fj_talent_info'] = $str;
                         $item["checkState"] = \app\common\api\TalentState::SCND_SAVE; //保存未提交
                         $item["highProcess"] = 5; //最高进度
                         $item["isImport"] = 1;//导入人才的标志
+                        $item['fjImport'] = 1;
                         if (count($msg) >= 1) {
                             $sheet->setCellValue('AL' . ($index + 2), '导入失败,失败原因:' . implode(";", $msg));
                         } else {
@@ -269,7 +301,6 @@ class Import {
             }
         }
         elseif ($data['type'] == 3){//泉州人才导入
-
             $id = $data['id'];
             $res = Db::table("new_talent_zhiren")->where('id', $id)->findOrEmpty();
             if ($res) {
@@ -293,6 +324,7 @@ class Import {
                         $enterprise_name = '';
                         $enterprise_id = '';
                         $action = 'insert';
+                        $str = '';
                         for ($i = 0; $i < 28; $i++) {
                             switch ($i) {
                                 case 0:
@@ -356,6 +388,15 @@ class Import {
                                 case 7:
                                     $item['birthday'] = $row[$i];
                                     break;
+                                case 9:
+                                    $item['position'] = $row[$i];
+                                    break;
+                                case 12:
+                                    $item['professional'] = $row[$i];
+                                    break;
+                                case 13:
+                                    $item['pro_qua'] = $row[$i];
+                                    break;
                                 case 16:
                                     $item['phone'] = $row[$i];
                                     break;
@@ -363,21 +404,28 @@ class Import {
                                     $item['email'] = $row[$i];
                                     break;
                                 case 18:
-                                    if (!in_array($row[$i], ['第一层次', '第二层次', '第三层次', '第四层次', '第五层次'])) {
-                                        array_push($msg, "人才层次不正确");
-                                    } else {
-                                        $key = array_search($row[$i], ['第一层次', '第二层次', '第三层次', '第四层次', '第五层次']);
-                                        $item['talent_arrange'] = $key + 1;
-                                    }
+                                    $item['qz_talent_level'] = $row[$i];
                                     break;
                                 case 19:
-                                    $item['talent_condition_text'] = $row[$i];
+                                    $item['qz_talent_condition_text'] = $row[$i];
+                                    break;
+                                case 25:
+                                    $str = "人才证书号码:".$row[$i];
+                                    break;
+                                case 26:
+                                    $str .= ";发证日期:".$row[$i];
+                                    break;
+                                case 27:
+                                    $str .= ";人才证有效期:".$row[$i];
                                     break;
                             }
                         }
+                        $item['source'] = 2;
+                        $item['qz_talent_info'] = $str;
                         $item["checkState"] = \app\common\api\TalentState::SCND_SAVE; //保存未提交
                         $item["highProcess"] = 5; //最高进度
-                        $item["isImport"] = 2;//导入人才的标志
+                        $item["isImport"] = 1;//导入人才的标志
+                        $item['qzImport'] = 1;
                         if (count($msg) >= 1) {
                             $sheet->setCellValue('AC' . ($index + 2), '导入失败,失败原因:' . implode(";", $msg));
                         } else {

+ 1 - 1
config/cache.php

@@ -35,7 +35,7 @@ return [
             'persistent' => false,
             //缓存前缀
             'prefix' => '',
-            'timeout' =>  0,
+            'timeout' => 0,
         ],
     // 更多的缓存连接
     ],