sugangqiang 2 years ago
parent
commit
57277cb43b

+ 1 - 0
.gitignore

@@ -7,3 +7,4 @@
 storage
 vendor
 runtime
+/app/test

+ 7 - 7
app/admin/controller/Talent.php

@@ -589,13 +589,13 @@ class Talent extends AdminController {
     }
 
     /**
-     * 预备人才库-批量发
+     * 预备人才库-批量发放人才码
      * @auth {{/talentInfo/prepareCertification}}
      */
     public function prepareCertification() {
         $lockFile = fopen("send_certificate.lock", "a");
         if (flock($lockFile, LOCK_EX | LOCK_NB)) {//文件锁(独占)
-//查询所有待发的数据
+//查询所有待发放人才码的数据
             $params = $this->request->param();
             $ids = array_filter(explode(",", $params["ids"]));
 //晋江市优秀人才证书:当前年份+层次+四位递增数字
@@ -609,7 +609,7 @@ class Talent extends AdminController {
                 foreach ($talent_list as $talent_info) {
                     if ($talent_info["checkState"] != TalentState::PUBLISH_PASS) {
                         Db::rollback();
-                        return json(["msg" => "只能对公布通过的对象进行发证,请核查待发证名单后再重新发证"]);
+                        return json(["msg" => "只能对公布通过的对象发放人才码,请核查待发放人才码名单后再重新发放人才码"]);
                     }
 
                     $no_prefix = $year . $talent_info["talent_arrange"];
@@ -636,7 +636,7 @@ class Talent extends AdminController {
                     $log["mainId"] = $talent_info["id"];
                     $log["companyId"] = $user["companyId"];
                     $log["active"] = 1;
-                    $log["description"] = "人才编号为:" . $max_no;
+                    $log["description"] = "人才为:" . $max_no;
                     $log["createUser"] = sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]);
                     $log["createTime"] = date("Y-m-d H:i:s");
                     Db::table("new_talent_checklog")->insert($log);
@@ -644,14 +644,14 @@ class Talent extends AdminController {
                     $talent_max_no[$talent_info["talent_arrange"]] = $max_no;
                 }
                 Db::commit();
-                return json(["code" => 200, "msg" => "发成功"]);
+                return json(["code" => 200, "msg" => "发放人才码成功"]);
             } catch (\Exception $e) {
                 Db::rollback();
-                return json(["msg" => "发失败:" . $e->getMessage()]);
+                return json(["msg" => "发放人才码失败:" . $e->getMessage()]);
             }
             flock($lockFile, LOCK_UN);
         } else {
-            return json(["msg" => "同一时间只能有一个管理员进行发操作"]);
+            return json(["msg" => "同一时间只能有一个管理员进行发放人才码操作"]);
         }
     }
 

+ 2 - 2
app/admin/view/talent/dept_fst_verify.html

@@ -174,8 +174,8 @@
                                     <option value="2">待公示</option>
                                     <option value="3">公示中</option>
                                     <option value="4">待公布</option>
-                                    <option value="5">待发</option>
-                                    <option value="6">已发</option>
+                                    <option value="5">待发放人才码</option>
+                                    <option value="6">已发放人才码</option>
                                 </#SelectCon>
                             </div>
                             <div class="col-sm-3">

+ 3 - 3
app/admin/view/talent/pre_list.html

@@ -112,8 +112,8 @@
                                         <option value="21">待公示</option>
                                         <option value="23">公示中</option>
                                         <option value="24">待公布</option>
-                                        <option value="26">待发</option>
-                                        <option value="28">已发</option>
+                                        <option value="26">待发放人才码</option>
+                                        <option value="28">已发放人才码</option>
                                         <option value="13">复核不通过</option>
                                         <option value="22">征信不通过</option>
                                         <option value="25">公示审核不通过</option>
@@ -330,7 +330,7 @@
                             {/if}
                             {if condition="chkCommission('/admin/talent/prepareCertification','/talentInfo/prepareCertification')"}
                             <button type="button" class="btn btn-sm btn-primary" onclick="TalentInfo.showDataCheckModal(6)">
-                                <i class="fa fa-newspaper-o"></i>&nbsp;发
+                                <i class="fa fa-newspaper-o"></i>&nbsp;发放人才码
                             </button>
                             {/if}
                             {if condition="chkCommission('/admin/talent/prepareExport','/talentInfo/prepareExport')"}

+ 2 - 2
app/admin/view/talent/talentInfo_library.html

@@ -179,8 +179,8 @@
                                         <option value="2">待公示</option>
                                         <option value="3">公示中</option>
                                         <option value="4">待公布</option>
-                                        <option value="5">待发</option>
-                                        <option value="6">已发</option>
+                                        <option value="5">待发放人才码</option>
+                                        <option value="6">已发放人才码</option>
                                     </#SelectCon>
                                     <#SelectCon id="checkState" name="审核状态">
                                         <option value="">请选择</option>

+ 3 - 3
app/common/api/DictApi.php

@@ -246,7 +246,7 @@ class DictApi {
                 $stepName = '<span class="label label-info">公布</span>';
                 break;
             case 28:
-                $stepName = '<span class="label label-inverse">发</span>';
+                $stepName = '<span class="label label-inverse">发放人才码</span>';
                 break;
             default:
                 $stepName = '<span class="label">用户操作</span>';
@@ -358,10 +358,10 @@ class DictApi {
                 $str = '<span class="label label-success">待公布</span>';
                 break;
             case 26:
-                $str = '<span class="label label-success">待发</span>';
+                $str = '<span class="label label-success">待发放人才码</span>';
                 break;
             case 28:
-                $str = '<span class="label label-primary">已发</span>';
+                $str = '<span class="label label-primary">已发放人才码</span>';
                 break;
         }
         return $str;

+ 2 - 2
app/common/api/TalentState.php

@@ -29,7 +29,7 @@ class TalentState {
     public const ANNOUNCED_REVERIFY_FAIL = 25; //公示再审核不通过
     public const PUBLISH_PASS = 26; //公布通过
     public const PUBLISH_FAIL = 27; //公布不通过
-    public const CERTIFICATED = 28; //已发
+    public const CERTIFICATED = 28; //已发放人才码
     public const BASE_VERIFY_FAIL = -1; //条件验证失败
     public const FST_VERIFY_FAIL = -2; //初审失败
     public const RCRD_BASIC_SAVE = -2;
@@ -90,7 +90,7 @@ class TalentState {
             case 27:
                 return "公布不通过";
             case 28:
-                return "已发";
+                return "已发放人才码";
         }
     }
 

+ 1 - 1
public/static/modular/gate/talentInfo/talentInfo.js

@@ -129,7 +129,7 @@ TalentInfo.initColumn = function () {
                             return "<span class='label label-danger'>公布不通过</span>";
                             break;
                         case 28:
-                            return "<span class='label label-inverse'>已发</span>";
+                            return "<span class='label label-inverse'>已发放人才码</span>";
                             break;
                     }
                 }

+ 7 - 7
public/static/modular/talentIdentify/talentInfo/talentInfo_prepare.js

@@ -74,10 +74,10 @@ TalentInfo.initColumn = function () {
                         return "<span class='label label-success'>待公布</span>";
                         break;
                     case 26:
-                        return "<span class='label label-success'>待发</span>";
+                        return "<span class='label label-success'>待发放人才码</span>";
                         break;
                     case 28:
-                        return "<span class='label label-primary'>已发</span>";
+                        return "<span class='label label-primary'>已发放人才码</span>";
                         break;
                     case 13:
                         return "<span class='label label-danger'>复核失败</span>";
@@ -185,9 +185,9 @@ TalentInfo.showDataCheckModal = function (type) {
             $("#hczxButton").attr("onclick", "TalentInfo.publish()").text("公布");
             $("#exportCommonModalLabel").text("待公布名单");
             break;
-        case 6:                     //待发名单
+        case 6:                     //待发放人才码名单
             $("#hczxButton").attr("onclick", "TalentInfo.sendCard()").text("提交");
-            $("#exportCommonModalLabel").text("待发名单");
+            $("#exportCommonModalLabel").text("待发放人才码名单");
             break;
         case 7:                     //公示名单预览
             $("#hczxButton").attr("onclick", "TalentInfo.needPublicExport()").text("导出");
@@ -802,7 +802,7 @@ TalentInfo.canclePublish = function () {
     }
 }
 
-//发
+//发放人才码
 TalentInfo.sendCard = function () {
     var selected = $('#dataTable').bootstrapTable('getSelections');
     if (!selected || selected.length < 1) {
@@ -823,12 +823,12 @@ TalentInfo.sendCard = function () {
                 Feng.error(data.msg);
             }
         }, function (data) {
-            Feng.error("发失败!" + data.responseJSON.message + "!");
+            Feng.error("发放人才码失败!" + data.responseJSON.message + "!");
         });
         ajax.set("ids", ids);
         ajax.start();
     }
-    Feng.confirm("一旦发证无法修改,确定要发证吗?", operation);
+    Feng.confirm("一旦发放人才码无法修改,确定要发放人才码吗?", operation);
 }
 
 //回调