津补贴++

app/admin/controller/TalentAllowance.php

@@ -540,6 +540,329 @@ class TalentAllowance extends AdminController {
         return new Response(Response::SUCCESS, "核查征信通过成功");
     }
 
+    /**
+     * 公示
+     * */
+    public function publicBatch() {
+        $params = $this->request->param();
+        $ids = $params["ids"];
+        $ids = array_filter(explode(",", $ids));
+        if (!$ids) {
+            return new Response(Response::ERROR, "请至少选择一行数据");
+        }
+        $isMessage = $params["isMessage"] == 1 ? true : false;
+        if ($isMessage && (!$params["typeName"] || !$params["address"] || !$params["publicStartTime"] || !$params["publicEndTime"] || !$params["dep"] || !$params["phone"] || !$params["email"])) {
+            return new Response(Response::ERROR, "短信参数不能为空");
+        }
+        $where = [];
+        $where[] = ["id", "in", $ids];
+        $list = TaModel::where($where)->select()->toArray();
+        Db::startTrans();
+        try {
+            $logList = [];
+            $phones = [];
+            foreach ($list as $info) {
+                $data["id"] = $info["id"];
+                $data["publicState"] = 3;
+                Db::table("un_talent_allowance_info")->update($data);
+                /*                 * 添加日志 */
+                $logList[] = [
+                    "id" => getStringId(),
+                    "type" => ProjectState::JBT,
+                    "mainId" => $info["id"],
+                    "active" => 1,
+                    "state" => 3,
+                    "step" => 5,
+                    "stateChange" => "<span class='label label-success'>待公示</span>-><span class='label label-primary'>公示中</span>",
+                    "description" => "批量公示",
+                    "createTime" => date("Y-m-d H:i:s"),
+                    'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+                ];
+                $phones[] = $info["phone"];
+            }
+            $effect = Db::table("new_talent_checklog")->insertAll($logList);
+            Db::commit();
+            if ($phones && $isMessage && $effect) {
+                $tpl_content = sprintf("【晋江市人才服务平台】您好！您提交申请的%s已完成初步审核，现通过%s将审核结果予以公示，公示时间%s至%s。公示期间如有异议，请及时向%s反映。电话%s，电子邮箱%s。",
+                        $params["typeName"], $params["address"], $params["publicStartTime"], $params["publicEndTime"], $params["dep"], $params["phone"], $params["email"]);
+                $phones = array_filter($phones);
+                foreach ($phones as $phone) {
+                    queue("app\job\Messenger", ["type" => 6, "userId" => 0, "phone" => $phone, "template" => $tpl_content, "processName" => "津补贴-批量公示", "userType" => 3]);
+                }
+            }
+            return new Response(Response::SUCCESS, "公示成功");
+        } catch (\think\db\exception\DbException $e) {
+            Db::rollback();
+            return new Response(Response::SUCCESS, "公示失败：" . $e->getMessage());
+        }
+    }
+
+    /**
+     * 跳转到公示再审核页面
+     * */
+    public function toSupplePage() {
+        $id = $this->request["id"];
+        $process = $this->request["process"];
+        $obj = TalentAllowanceApi::getInfoById($id);
+        $this->translateToChinese($obj);
+        return view("public_check", ["row" => $obj, "process" => $process]);
+    }
+
+    /**
+     * 公示再审核计算津补贴
+     * */
+    public function suppleCheckCalculate() {
+        $id = $this->request["id"];
+        try {
+            $info = TalentAllowanceApi::getInfoById($id);
+            $arrangeList = $this->validateAllowanceType($info);
+            $detailList = \app\common\model\TalentAllowancecontractDetail::where("mainId", $id)->select()->toArray();
+            $talentTypeMap = DictApi::selectByParentCode("enterprise_tag");
+            $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+            foreach ($detailList as &$detail) {
+                $detail["enterpriseName"] = $enterpriseMap[$detail["enterpriseId"]];
+                if (\StrUtil::isNotEmpAndNull($detal["talentType"])) {
+                    $detail["talentTypeName"] = $talentTypeMap[$detail["talentType"]];
+                }
+            }
+            $res = [
+                "info" => $info,
+                "detailList" => $detailList
+            ];
+            return new Response(Response::SUCCESS, "计算成功", $res);
+        } catch (\think\Exception $e) {
+            return new Response(Response::ERROR, "系统异常,请联系管理员");
+        }
+    }
+
+    /**
+     *  公示后审核
+     */
+    public function afterCheck() {
+        $param = $this->request->param();
+        if (!$param["id"]) {
+            return new Response(Response::ERROR, "系统错误，请联系管理员");
+        }
+        $old = TalentAllowanceApi::getInfoById($param["id"]);
+        if ($old["publicState"] != 3) {
+            return new Response(Response::ERROR, "当前记录不是公示中状态，无法审核");
+        }
+        try {
+            $arrangeList = null;
+            $desc = "审核意见：" . $param["checkMsg"] . ";\n";
+            $desc .= "征信：" . ($param["zxState"] == 1 ? "征信通过" : $param["zxMsg"] . ";\n");
+
+            $data["id"] = $param["id"];
+            if ($param["checkState"] == -1) {
+                $data["checkState"] = -1;
+                $data["checkMsg"] = $param["checkMsg"];
+                $data["allowanceType"] = 3;
+                $data["allowanceMsg"] = "审核不通过，原因：" . $param["checkMsg"];
+                $data["outMsg"] = $param["zxState"] == 1 ? "" : $param["zxMsg"];
+            } else if ($param["checkState"] == 3) {
+                if ($param["zxState"] == 1) {
+                    $typeName = "";
+                    $old["recommendAllowanceMsg"] = "";
+                    if ($param["source"] == 1) {            //遵循系统结果
+                        $arrangeList = $this->validateAllowanceType($old);
+                        $typeName = "系统判定:津补贴类型(" . (\app\common\state\AllowanceTypeEnum::getTypeName($old["allowanceType"])) . ");享受月份:" . $old["recommendMonths"] . ";\n";
+                        $old["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $old["recommendAllowanceMsg"] . ";";
+                    } else if ($param["source"] == 2) {
+                        $detailIds = array_column($param["details"], "id");
+                        $where = [];
+                        $where[] = ["id", "in", $detailIds];
+                        $detailList = \app\common\model\TalentAllowancecontractDetail::where($where)->select()->toArray();
+                        $set = [];
+                        if ($params["resAllowanceType"] == 1) {
+                            $monthsMap = [];
+                            for ($i = 0; $i < count($param["details"]); $i++) {
+                                $monthsMap[$param["details"][$i]["id"]] = $param["details"][$i]["months"];
+                            }
+                            foreach ($detailList as &$detail) {
+                                $months = $monthdsMap[$detail["id"]];
+                                if (\StrUtil::isNotEmpAndNull($months)) {
+                                    $detail["months"] = $months;
+                                    $set = array_merge($set, explode(",", $months));
+                                }
+                            }unset($detail);
+                        }
+                        $set = array_filter($set);
+                        usort($set, function($a, $b) {
+                            return (int) $a - (int) $b;
+                        });
+                        $old["recommendAllowanceType"] = $param["resAllowanceType"];
+                        $old["recommendMonths"] = implode(",", $set);
+                        $typeName = "人工判定:津补贴类型(" . (\app\common\state\AllowanceTypeEnum::getTypeName($old["recommendAllowanceType"])) . ");享受月份:" . $old["recommendMonths"] . ";\n";
+                        $old["recommendAllowanceMsg"] = $typeName . "判定说明：\n" . $obj["resAllowanceMsg"] . ";";
+                        $arrangeList = $this->calculateAllowance($old, $set, $detailList);
+                    }
+                    $desc .= "判定结果：" . $typeName;
+                    $data["checkState"] = 30;
+                    $data["outMsg"] = "";
+                    $data["allowanceType"] = $old["recommendAllowanceType"];
+                    $data["allowanceMsg"] = $old["recommendAllowanceMsg"];
+                    $data["months"] = $old["recommendMonths"];
+                    $data["money"] = $old["recommendMoney"];
+                    $data["moneyDesc"] = $old["recommendMoneyDesc"];
+                    $data["jtTalentArrange"] = $old["recommendTalentArrange"];
+                    $data["workAllowanceMoney"] = $old["workAllowanceMoney"];
+                    $data["developAllowanceMoney"] = $old["developAllowanceMoney"];
+                } else {
+                    $data["checkState"] = -1;
+                    $data["outMsg"] = $param["zxMsg"];
+                    $data["allowanceType"] = 3;
+                    $data["allowanceMsg"] = "征信失信(不予兑现)，原因：" . $param["zxMsg"];
+                }
+            }
+            if ($param["allowanceType"] == 3) {
+                $data["months"] = "";
+                $data["money"] = 0;
+                $data["moneyDesc"] = "";
+                $data["jtTalentArrange"] = "";
+                $data["workAllowanceMoney"] = null;
+                $data["developAllowanceMoney"] = null;
+            }
+            $data["isPublicCheck"] = 1;
+            $data["publicState"] = 4;
+            //添加日志            
+            TalentChecklog::create([
+                'id' => getStringId(),
+                'mainId' => $old['id'],
+                'type' => intval(ProjectState::JBT),
+                'typeFileId' => null,
+                'active' => 1,
+                'state' => $param["checkState"] == AllowanceStateEnum::REVIEW_PASS ? 3 : $param["checkState"],
+                'step' => 6,
+                'stateChange' => "<span class='label label-success'>公示中</span>-><span class='label label-primary'>待兑现</span>",
+                'description' => $desc,
+                'createTime' => date("Y-m-d H:i:s", time()),
+                'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+            ]);
+            TaModel::update($data);
+            if ($arrangeList != null) {
+                $taaModel = new TalentAllowanceArrange();
+                $taaModel->saveAll($arrangeList);
+            }
+            return new Response(Response::SUCCESS, "审核成功");
+        } catch (\think\Exception $e) {
+            return new Response(Response::ERROR, "系统异常，请联系管理员");
+        }
+    }
+
+    /**
+     *  批量公示通过
+     */
+    public function publicPass() {
+        $ids = $this->request["ids"];
+        $ids = explode(",", $ids);
+        if (!$ids) {
+            return new Response(Response::ERROR, "请至少选择一行数据");
+        }
+        $where = [];
+        $where[] = ["id", "in"];
+        $list = TaModel::where($where)->select()->toArray();
+        $logList = [];
+        try {
+            Db::startTrans();
+            for ($i = 0; $i < count($list); $i++) {
+                $obj = $list[$i];
+                $upd["id"] = $obj["id"];
+                $upd["publicState"] = 4;
+                $upd["allowanceType"] = $obj["recommendAllowanceType"];
+                $upd["allowanceMsg"] = $obj["recommendAllowanceMsg"];
+                if ($upd["allowanceType"] == 1) {
+                    $upd["months"] = $obj["recommendMonths"];
+                    $upd["money"] = $obj["recommendMoney"];
+                    $upd["moneyDesc"] = $obj["recommendMoneyDesc"];
+                } else if ($upd["allowanceType"] == 2) {
+                    $upd["months"] = "";
+                    $upd["jtTalentArrange"] = $obj["recommendTalentArrange"];
+                    $upd["money"] = $obj["recommendMoney"];
+                    $upd["moneyDesc"] = $obj["recommendMoneyDesc"];
+                    $upd["workAllowanceMoney"] = null;
+                    $upd["developAllowanceMoney"] = null;
+                } else {
+                    $upd["months"] = "";
+                    $upd["money"] = 0.00;
+                    $upd["workAllowanceMoney"] = null;
+                    $upd["developAllowanceMoney"] = null;
+                }
+                Db::table("un_talent_allowance_info")->update($upd);
+                //添加日志
+                $stateChange = null;
+                $desc = null;
+                if ($obj["checkState"] == AllowanceStateEnum::NOTPASS) {
+                    $stateChange = "<span class='label label-success'>公示中</span>-><span class='label label-danger'>审核不通过</span>";
+                    $desc = "审核不通过";
+                } else {
+                    $stateChange = "<span class='label label-success'>公示中</span>-><span class='label label-primary'>待兑现</span>";
+                    $desc = "批量公示";
+                }
+                $logList[] = [
+                    "id" => getStringId(),
+                    "type" => ProjectState::JBT,
+                    "mainId" => $obj["id"],
+                    "active" => 1,
+                    "state" => 3,
+                    "step" => 6,
+                    "stateChange" => $stateChange,
+                    "description" => $desc,
+                    "createTime" => date("Y-m-d H:i:s"),
+                    'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+                ];
+            }
+            Db::table("new_talent_checklog")->insertAll($logList);
+            Db::commit();
+            return new Response(Response::SUCCESS, "批量公示通过成功");
+        } catch (\think\db\exception\DbException $e) {
+            Db::rollback();
+            return new Response(Response::ERROR, "批量公示失败：" . $e->getCode());
+        }
+    }
+
+    /**
+     * 兑现
+     */
+    public function cash() {
+        $ids = $this->request["ids"];
+        $ids = array_filter(explode(",", $ids));
+        if (!$ids) {
+            return new Response(Response::ERROR, "请至少选择一行数据");
+        }
+        $where = [];
+        $where[] = ["id", "in", $ids];
+        $list = TaModel::where($where)->select()->toArray();
+        //添加日志
+        $logList = [];
+        try {
+            Db::startTrans();
+            for ($i = 0; $i < count($list); $i++) {
+                $obj = $list[$i];
+                $upd["id"] = $obj["id"];
+                $upd["publicState"] = 5;
+                Db::table("un_talent_allowance_info")->update($upd);
+                $logList[] = [
+                    "id" => getStringId(),
+                    "type" => ProjectState::JBT,
+                    "mainId" => $obj["id"],
+                    "active" => 1,
+                    "state" => 3,
+                    "step" => 50,
+                    "stateChange" => "<span class='label label-success'>待兑现</span>-><span class='label label-primary'>已兑现</span>;",
+                    "description" => "批量兑现",
+                    "createTime" => date("Y-m-d H:i:s"),
+                    'createUser' => sprintf("%s(%s)", $this->user["account"], $this->user["companyName"])
+                ];
+            }
+            Db::table("new_talent_checklog")->insertAll($logList);
+            Db::commit();
+            return new Response(Response::SUCCESS, "批量兑现成功");
+        } catch (\think\db\exception\DbException $e) {
+            Db::rollback();
+            return new Response(Response::ERROR, "批量兑现失败：" . $e->getCode());
+        }
+    }
+
     /**
      * 公示预览(不予兑现)
      */
@@ -573,6 +896,50 @@ class TalentAllowance extends AdminController {
         }
     }
 
+    /**
+     * 导出公示名单(需要兑现)
+     */
+    public function exportPublic() {
+        //获取字典表人才层次+
+        $levelMap = DictApi::selectByParentCode("talent_arrange");
+        $streetMap = DictApi::selectByParentCode("street");
+        //查询企业信息
+        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
+        /*         * 查询需要公示的数据 */
+        $where = [];
+        $where[] = ["id", "in", explode(",", $this->request["ids"])];
+        $list = TaModel::where($where)->select()->toArray();
+        /*         * 查询相关的津补贴人才层次 */
+        $where = [];
+        $where[] = ["mainId", "in", explode(",", $this->request["ids"])];
+        $arrangeList = TalentAllowanceArrange::where($where)->select()->toArray();
+        foreach ($arrangeList as &$arrange) {
+            $arrange["talentArrangeName"] = $levelMap[$arrange["talentArrange"]];
+        }unset($arrange);
+        /* Map<String,List<TalentAllowanceArrange>> arrangeMap = arrangeList.stream().collect(Collectors.groupingBy(TalentAllowanceArrange::getMainId));
+          Integer sheetSize = 0;
+          for(TalentAllowanceInfo info:allList){
+          info.setEnterpriseName(enterpriseMap.get(info.getEnterpriseId()));
+          info.setAddressName(streetMap.get(info.getAddress()));
+          info.setTalentArrangeName(levelMap.get(info.getTalentArrange()));
+          if(info.getRecommendAllowanceType() == 1){
+          info.setArrangeList(arrangeMap.get(info.getId()));
+          sheetSize = sheetSize + info.getArrangeList().size();
+          }else if(info.getRecommendAllowanceType() == 1){
+          sheetSize++;
+          }
+          } */
+        $filename = ($this->user["type"] == 1 ? "晋江市优秀人才" : "晋江市集成电路人才") . $list[0]["year"] . "年度津补贴拟发放对象名单";
+        $columns = ["序号", "姓名", "工作单位", "镇(街道)", "人才层次", "津补贴享受月份数", "每月享受津贴标准(元)", $list[0]["year"] . "年度累计应享受津补贴金额(元)", "备注"];
+    }
+
+    /**
+     * 导出基本信息
+     */
+    public function exportBasicInfo() {
+        
+    }
+
     private function validateAllowanceType(&$info) {
         $old = TalentAllowanceApi::getInfoById($info["id"]);
         $talentTypeMap = DictApi::selectByParentCode("enterprise_tag");

app/admin/view/talent_allowance/index.html

@@ -447,11 +447,11 @@
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出基础信息
                             </button>
                             {/if}
-                            {if condition="chkCommission('/admin/talentAllowance/prepareExportProjectData','/talentAllowance/prepareExportProjectData')"}
+                            <!--{if condition="chkCommission('/admin/talentAllowance/prepareExportProjectData','/talentAllowance/prepareExportProjectData')"}
                             <button type="button" class="btn btn-sm btn-primary " onclick="TalentAllowanceInfo.showDataModal(9)" id="">
                                 <i class="fa fa-file-excel-o"></i>&nbsp;导出项目核查结果
                             </button>
-                            {/if}
+                            {/if}-->
                             {/eq}
                         </div>
                         <table id="TalentAllowanceInfoTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">

app/admin/view/talent_allowance/info.html

@@ -255,7 +255,7 @@
                                             <div class="col-sm-4 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="oldAllowanceType"
                                                        {eq name="row.recommendAllowanceType" value="1"}
-                                                       value="人才津贴"
+                                                       value="工作津贴"
                                                        {/eq}
                                                        {eq name="row.recommendAllowanceType" value="2"}
                                                        value="一次性交通补贴"

app/admin/view/talent_allowance/public_check.html

@@ -65,44 +65,54 @@
                                 <div class="panel-body" >
                                     <form id="talentAllowanceForm" class="form-horizontal">
                                         <div class="col-sm-12 form-group-sm">
-                                            <input type="hidden" name="id" id="id" value="${item.id}">
-                                            <input type="hidden" name="year" id="year" value="${item.year}">
-                                            <input type="hidden" name="type" id="type" value="${item.type}">
-                                            <input type="hidden" name="talentId" id="talentId" value="${item.talentId}">
-                                            <input type="hidden" name="checkState" id="checkState" value="${item.checkState}">
+                                            <input type="hidden" name="id" id="id" value="{$row.id}">
+                                            <input type="hidden" name="year" id="year" value="{$row.year}">
+                                            <input type="hidden" name="type" id="type" value="{$row.type}">
+                                            <input type="hidden" name="talentId" id="talentId" value="{$row.talentId}">
+                                            <input type="hidden" name="checkState" id="checkState" value="{$row.checkState}">
                                             <input type="hidden" name="process" id="process" value="6">
-                                            <input type="hidden" name="companyId" id="companyId" value="${item.companyId}">
-                                            <input type="hidden" name="allowanceType" id="allowanceType" value="${item.allowanceType}">
-                                            <input type="hidden" name="recommendAllowanceType" id="recommendAllowanceType" value="${item.recommendAllowanceType}">
+                                            <input type="hidden" name="companyId" id="companyId" value="{$row.companyId}">
+                                            <input type="hidden" name="allowanceType" id="allowanceType" value="{$row.allowanceType}">
+                                            <input type="hidden" name="recommendAllowanceType" id="recommendAllowanceType" value="{$row.recommendAllowanceType}">
                                             <div class="row">
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>申报对象</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="${item.name}" >
+                                                        <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$row.name}" >
+                                                    </div>
+                                                </div>
+                                                <div class="rowGroup">
+                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>津补贴类型</label>
+                                                    <div class="col-sm-2 spacing">
+                                                        <select type="text" class="form-control" id="allowanceType" name="allowanceType" value="{$row.allowanceType}" disabled="disabled">
+                                                            <option>请选择</option>
+                                                            <option value="1">工作津贴</option>
+                                                            <option value="2">一次性交通补贴</option>
+                                                        </select>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>申报来源</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="sourceName" name="sourceName" value="${item.sourceName}" >
+                                                        <input type="text" class="form-control" readonly="readonly" id="sourceName" name="sourceName" value="{$row.sourceName}" >
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="talentTypeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才标签</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="talentTypeName" name="talentTypeName" value="${item.talentTypeName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="talentTypeName" name="talentTypeName" value="{$row.talentTypeName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>单位名称</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="enterpriseName" name="enterpriseName" value="${item.enterpriseName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="enterpriseName" name="enterpriseName" value="{$row.enterpriseName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>性别</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <select class="form-control" disabled="disabled" id="sex" name="sex" value="${item.sex}">
+                                                        <select class="form-control" disabled="disabled" id="sex" name="sex" value="{$row.sex}">
                                                             <option value="">请选择</option>
                                                             <option value="1">男</option>
                                                             <option value="2">女</option>
@@ -112,101 +122,97 @@
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>证件号码</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input class="form-control" readonly="readonly" id="idCard" name="idCard" value="${item.idCard}">
+                                                        <input class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$row.idCard}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>籍贯</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="${item.provinceName}${item.cityName}${item.countyName}">
+                                                        <input class="form-control" readonly="readonly" id="provinceCode" name="provinceCode" value="{$row.provinceName}{$row.cityName}{$row.countyName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="introductionModeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>引进方式</label>
                                                     <div class="col-sm-2 spacing" >
-                                                        <input class="form-control" readonly="readonly" id="introductionModeName" name="introductionModeName" value="${item.introductionModeName}">
+                                                        <input class="form-control" readonly="readonly" id="introductionModeName" name="introductionModeName" value="{$row.introductionModeName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="firstInJJTimeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>首次来晋工作时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="firstInJJTime" name="firstInJJTime" value="${item.firstInJJTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="firstInJJTime" name="firstInJJTime" value="{$row.firstInJJTime}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>本单位入职时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="entryTime" name="entryTime" value="${item.entryTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="entryTime" name="entryTime" value="{$row.entryTime}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>职务</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="post" name="post" value="${item.post}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="post" name="post" value="{$row.post}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>手机号码</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="phone" name="phone" value="${item.phone}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="phone" name="phone" value="{$row.phone}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>开户银行</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bank" name="bank" value="${item.bank}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bank" name="bank" value="{$row.bank}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup" id="bankNumberSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>银行行号</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankNumber" name="bankNumber" value="${item.bankNumber}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankNumber" name="bankNumber" value="{$row.bankNumber}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>开户银行网点</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankNetwork" name="bankNetwork" value="${item.bankNetwork}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankNetwork" name="bankNetwork" value="{$row.bankNetwork}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>银行账号</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="bankAccount" name="bankAccount" value="${item.bankAccount}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="bankAccount" name="bankAccount" value="{$row.bankAccount}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才层次</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control"  readonly="readonly"id="talentArrangeName" name="talentArrangeName" value="${item.talentArrangeName}">
+                                                        <input type="text" class="form-control"  readonly="readonly"id="talentArrangeName" name="talentArrangeName" value="{$row.talentArrangeName}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="${item.identifyConditionText}">
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionText" name="identifyConditionText" value="{$row.identifyConditionText}">
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件名称</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="${item.identifyConditionName}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyConditionName" name="identifyConditionName" value="{$row.identifyConditionName}"/>
                                                     </div>
                                                 </div>
                                                 <div class="rowGroup">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>认定条件取得时间</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="${item.identifyGetTime}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="identifyGetTime" name="identifyGetTime" value="{$row.identifyGetTime}"/>
                                                     </div>
                                                 </div>
-                                                <div class="rowGroup" id="wageDiv"
-                                                     @if(item.active != 2){
-                                                     style="display: none"
-                                                     @}
-                                                >
+                                                <div class="rowGroup" id="wageDiv" {if condition="$row['allowanceType' neq 1]"}style="display:none;"{/if}>
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>上一年度年薪(元)</label>
                                                     <div class="col-sm-2 spacing">
-                                                        <input type="text" class="form-control" readonly="readonly" id="wage" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="${item.wage}"/>
+                                                        <input type="text" class="form-control" readonly="readonly" id="wage" placeholder="正常工资薪金、一次性奖金收入" name="wage" value="{$row.wage}"/>
                                                     </div>
                                                 </div>
                                             </div>
@@ -221,7 +227,13 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    <#table id="projectTable"/>
+                                    <table id="projectTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                 </div>
                             </div>
                             <div class="panel panel-default">
@@ -231,7 +243,13 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    <#table id="arrangeTable"/>
+                                    <table id="arrangeTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                 </div>
                             </div>
                             <div id="recommendDiv" class="panel panel-default">
@@ -246,28 +264,27 @@
                                             <label class="col-sm-1 control-label spacing">津补贴类型</label>
                                             <div class="col-sm-5 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="oldAllowanceType"
-                                                       @if(item.recommendAllowanceType == 1){
-                                                       value="人才津贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 2){
+                                                       {eq name="row.recommendAllowanceType" value="1"}
+                                                       value="工作津贴"
+                                                       {/eq}
+                                                       {eq name="row.recommendAllowanceType" value="2"}
                                                        value="一次性交通补贴"
-                                                       @}
-                                                       @if(item.recommendAllowanceType == 3){
+                                                       {/eq}
+                                                       {eq name="row.recommendAllowanceType" value="3"}
                                                        value="不予兑现"
-                                                       @}
-                                                />
+                                                       {/eq}/>                                                
                                             </div>
                                             <label class="col-sm-1 control-label spacing">兑现月份</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="${item.recommendMonths}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="dxMonths" value="{$row.recommendMonths}"/>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴判定详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >${item.recommendAllowanceMsg}</textarea>
+                                                <textarea class="form-control" readonly="readonly" id="allowanceMsg" name="allowanceMsg" rows="4" >{$row.recommendAllowanceMsg}</textarea>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">津补贴计算详情</label>
                                             <div class="col-sm-5 spacing">
-                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="${item.recommendMoneyDesc}"/>
+                                                <input type="text" class="form-control" readonly="readonly" id="moneyDesc" name="moneyDesc" value="{$row.recommendMoneyDesc}"/>
                                             </div>
                                         </div>
                                     </div>
@@ -280,10 +297,16 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body" >
-                                    <#table id="fileTable"/>
+                                    <table id="fileTable" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                                        <thead>
+                                            <tr>
+                                                <th data-field="selectItem" data-checkbox="true"></th>
+                                            </tr>
+                                        </thead>
+                                    </table>
                                     <label style="padding-top: 15px;color: red">*请根据上传的附件材料，编辑好相应的文件夹名称</label><br>
                                     <label style="padding-top: 15px;color: red">声明：本人对输入材料的真实性负全部责任</label>
-                                    <form id="uploadForm" action="${ctxPath}/api/talentInfo/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
+                                    <form id="uploadForm" action="/common/api/addTalentFile" method="post" class="form-horizontal" enctype="multipart/form-data" target="hiddenIframe" style="display: none">
                                         <input type='hidden' id="fileId" name="fileId" >
                                         <input type='file' id="upload_file" name="fileUrl" style='display: none'>
                                         <input type='hidden' id="mainId" name="mainId" >

app/admin/view/talent_allowance/select.html

@@ -306,11 +306,11 @@
                                             <label class="col-sm-1 control-label spacing">津补贴类型</label>
                                             <div class="col-sm-5 spacing">
                                                 <input type="text" class="form-control" readonly="readonly" id="oldAllowanceType"
-                                                       {switch name="row.recommendAllowanceType"}
+                                                       value='{switch name="row.allowanceType"}
                                                        {case value="1"}工作津贴{/case}
                                                        {case value="2"}一次性交通补贴{/case}
                                                        {case value="3"}不予兑现{/case}
-                                                       {/switch}/> />
+                                                       {/switch}'/>
                                             </div>
                                             <label class="col-sm-1 control-label spacing">兑现月份</label>
                                             <div class="col-sm-5 spacing">

app/common/controller/Api.php

@@ -347,6 +347,34 @@ class Api extends BaseController {
         return json(["rows" => $new_list]);
     }
 
+    public function getJbtCheckLog() {
+        $obj = $this->request->param();
+        $where = [];
+        if ($obj["type"] != null) {
+            $where[] = ["type", "=", $obj["type"]];
+        }if (\StrUtil::isNotEmpAndNull($obj["mainId"])) {
+            $where[] = ["mainId", "=", $obj["mainId"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($obj["typeFileId"])) {
+            $where[] = ["typeFileId", "=", $obj["typeFileId"]];
+        } else {
+            $where[] = ["typeFileId", "EXP", Db::raw("is null")];
+        }
+        if ($obj["active"] != null) {
+            $where[] = ["active", "=", $obj["active"]];
+        }
+        $list = TalentChecklog::where($where)->select()->order("createTime desc")->toArray();
+        foreach ($list as &$log) {
+            $log["stateName"] = \app\common\state\AllowanceStateEnum::getStateName($log["state"]);
+            $log["stepName"] = \app\common\state\AllowanceStepEnum::getStepName($log["step"]);
+        }unset($log);
+        $res = [
+            "rows" => $list,
+            "total" => count($list)
+        ];
+        return json($res);
+    }
+
     public function findCommonFileType() {
         $param = $this->request->param();
         $id = $param["mainId"];

app/common/state/AllowanceStepEnum.php

@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace app\common\state;
+
+/**
+ * Description of AllowanceStepEnum
+ *
+ * @author sgq
+ */
+class AllowanceStepEnum {
+
+    const JBT_STEP_USER = 0;
+    const JBT_STEP_FIRST = 1;
+    const JBT_STEP_VISIT = 2;
+    const JBT_STEP_REVIEW = 3;
+    const RCRD_STEP_HCZX = 4;
+    const RCRD_STEP_PUBLIC = 5;
+    const RCRD_STEP_AFTERCHECK = 6;
+    const RCRD_STEP_PUBLISH = 7;
+    const RCRD_STEP_CARD = 8;
+    const RCRD_STEP_CHECK = 11;
+    const RCRD_STEP_TYPE_CHANGE = 20;
+    const RCRD_STEP_WORKUNIT_CHANGE = 21;
+    const RCRD_STEP_QUIT = 22;
+    const RCRD_STEP_BANK_CHANGE = 23;
+    const RCRD_STEP_CASH = 50;
+    const RCRD_STEP_CANCLEPUBLISH = 55;
+    const RCRD_STEP_REMOVEFROMLIBRARY = 60;
+    const RCRD_STEP_RECOVERY = 65;
+    const RCRD_STEP_SETNOTPASS = 70;
+    const ENTERPRISE_STEP_USER = 100;
+    const ENTERPRISE_STEP_CHECK = 101;
+    const ENTERPRISE_STEP_SETFROZEN = 102;
+    const ENTERPRISE_STEP_RESETPWD = 103;
+
+    static function getStepName($code) {
+        switch ($code) {
+            case self::JBT_STEP_USER:
+                return "<span class='label'>用户操作</span>";
+            case self::JBT_STEP_FIRST:
+                return "<span class='label label-primary'>初级审核</span>";
+            case self::JBT_STEP_VISIT:
+                return "<span class='label label-primary'>走访核查</span>";
+            case self::JBT_STEP_REVIEW:
+                return "<span class='label label-danger'>复核</span>";
+            case self::RCRD_STEP_HCZX:
+                return "<span class='label label-warning'>核查征信</span>";
+            case self::RCRD_STEP_PUBLIC:
+                return "<span class='label label-warning'>公示</span>";
+            case self::RCRD_STEP_AFTERCHECK:
+                return "<span class='label label-success'>公示再审核</span>";
+            case self::RCRD_STEP_PUBLISH:
+                return "<span class='label label-warning'>公布</span>";
+            case self::RCRD_STEP_CARD:
+                return "<span class='label label-info'>发证</span>";
+            case self::RCRD_STEP_CHECK:
+                return "<span class='label label-danger'>审核</span>";
+            case self::RCRD_STEP_TYPE_CHANGE:
+                return "<span class='label label-success'>人才层次变更</span>";
+            case self::RCRD_STEP_WORKUNIT_CHANGE:
+                return"<span class='label label-success'>工作单位变更</span>";
+            case self::RCRD_STEP_QUIT:
+                return "<span class='label label-success'>离职变更</span>";
+            case self::RCRD_STEP_BANK_CHANGE:
+                return "<span class='label label-success'>银行账号变更</span>";
+            case self::RCRD_STEP_CASH:
+                return "<span class='label label-primary'>兑现</span>";
+            case self::RCRD_STEP_CANCLEPUBLISH:
+                return "<span class='label label-primary'>撤销公布</span>";
+            case self::RCRD_STEP_REMOVEFROMLIBRARY:
+                return "<span class='label label-primary'>取消优秀人才</span>";
+            case self::RCRD_STEP_RECOVERY:
+                return "<span class='label label-primary'>恢复优秀人才</span>";
+            case self::RCRD_STEP_SETNOTPASS:
+                return "<span class='label label-danger'>设置审核不通过</span>";
+            case self::ENTERPRISE_STEP_USER:
+                return "<span class='label'>用户操作</span>";
+            case self::ENTERPRISE_STEP_CHECK:
+                return "<span class='label label-primary'>审核</span>";
+            case self::ENTERPRISE_STEP_SETFROZEN:
+                return "<span class='label label-danger'>设置冻结</span>";
+            case self::ENTERPRISE_STEP_RESETPWD:
+                return "<span class='label label-info'>重置密码</span>";
+            default:
+                return "";
+        }
+    }
+
+}

app/job/Messenger.php

@@ -178,6 +178,40 @@ class Messenger {
                     return false;
                 }
                 break;
+            case 6:
+                //通用短信                
+                try {
+                    $userId = $data["userId"];
+                    $phone = $data["phone"];
+                    $template = $data["template"];
+                    $userType = $data["userType"];
+                    $processName = $data["processName"];
+                    $smsapi = new ChuanglanSmsApi();
+                    $result = $smsapi->sendSMS($phone, $template);
+                    $result = json_decode($result, true);
+                    $recordId = getStringId();
+                    $record_data = [
+                        'id' => $recordId,
+                        'userId' => $userId,
+                        'bizId' => $result["msgId"],
+                        'type' => $userType,
+                        'smsType' => 1,
+                        'phone' => $phone,
+                        'params' => $processName,
+                        'templateCode' => $template,
+                        'state' => $result['code'] == 0 ? 2 : 3,
+                        'sendingDate' => date("Y-m-d H:i:s", time()),
+                        'createTime' => date("Y-m-d H:i:s", time()),
+                        'msg' => $result['errorMsg']
+                    ];
+                    MessageRecord::create($record_data);
+                    return true;
+                } catch (\think\Exception $e) {
+                    Log::error(json_encode($data));
+                    Log::error($e->getMessage());
+                    return false;
+                }
+                break;
             case 109:
                 //注销审核通过通知
                 try {

public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -649,7 +649,7 @@ TalentAllowanceInfo.exportBasicInfo = function () {
     var process = $("#process").val();
     var queryData = TalentAllowanceInfo.formParams();
     queryData['process'] = process;
-    var url = Feng.setUrlParam(Feng.ctxPath + "/talentAllowanceInfoExport/exportBasicInfo", queryData);
+    var url = Feng.setUrlParam(Feng.ctxPath + "/admin/talentAllowance/exportBasicInfo", queryData);
     window.hiddenIframe.location.href = url;
 }
 

public/static/modular/talentAllowance/talentAllowanceInfo_public_check.js

@@ -17,7 +17,7 @@ TalentAllowanceInfoDlg.close = function() {
  */
 TalentAllowanceInfoDlg.initContract = function(){
     $("#projectTable").bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceContractDetail",
+        url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceContractDetail",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -49,7 +49,7 @@ TalentAllowanceInfoDlg.initContract = function(){
             var enterpriseId = row.enterpriseId;
             var cur_table = $detail.html('<table id="'+enterpriseId+'"></table>').find('table');
             $(cur_table).bootstrapTable({
-                url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceProject",
+                url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceProject",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
                 search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -75,7 +75,7 @@ TalentAllowanceInfoDlg.initContract = function(){
 
 TalentAllowanceInfoDlg.initArrange = function(){
     $("#arrangeTable").bootstrapTable({
-        url: Feng.ctxPath + "/talentAllowanceInfo/findAllowanceArrange",
+        url: Feng.ctxPath + "/admin/talentAllowance/findAllowanceArrange",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -117,7 +117,7 @@ TalentAllowanceInfoDlg.initArrange = function(){
 
 //显示修改工作单位合同情况模态框
 TalentAllowanceInfoDlg.showEditContractModel = function(id){
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/validateIsCheck", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/validateIsCheck", function(data){
         if(data.code==200){
             $("#contractForm")[0].reset();
             $("#contractId").val(id);
@@ -148,7 +148,7 @@ TalentAllowanceInfoDlg.editContract = function(){
         Feng.info("请选择合同截止时间");
         return ;
     }
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editContract", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editContract", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#projectTable").bootstrapTable("refresh", {});
@@ -278,7 +278,7 @@ TalentAllowanceInfoDlg.contractCheckSubmit = function(){
     var enterpriseId = $("#contractEnterpriseId").val();
     var description = $("#msg").val();
     var months = $("#state").val();
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -304,7 +304,7 @@ TalentAllowanceInfoDlg.editProject = function(){
             months = months + $(this).val() + ",";
         }
     })
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -343,7 +343,7 @@ TalentAllowanceInfoDlg.editJJAttendance = function(){
     }
     $("#attendanceMonths").val(months);
     $("#jjAttendanceForm")[0].submit();
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -383,7 +383,7 @@ TalentAllowanceInfoDlg.editAttendanceProject = function(){
         Feng.error(error);
         return ;
     }
-    var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/editProject", function(data){
+    var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/editProject", function(data){
         if(data.code==200){
             Feng.success(data.msg);
             $("#"+enterpriseId).bootstrapTable("refresh", {});
@@ -472,13 +472,13 @@ TalentAllowanceInfoDlg.showCheckModal = function(){
             '                            <label for="checkState" class="control-label">津补贴类型</label>\n' +
             '                            <select type="text" class="form-control" id="resAllowanceType">\n' +
             '                                <option value="">请选择</option>\n' +
-            '                                <option value="1">人才津贴</option>\n' +
+            '                                <option value="1">工作津贴</option>\n' +
             '                                <option value="2">一次性交通补贴</option>\n' +
             '                                <option value="3">不予兑现</option>\n' +
             '                            </select>\n' +
             '                        </div>\n' +
             '                        <div class="form-group notPassDiv personDiv" id="setMonths" style="display: none">\n' +
-            '                            <label for="checkState" class="control-label">享受月份(仅人才津贴填写)</label>\n' +
+            '                            <label for="checkState" class="control-label">享受月份(仅工作津贴填写)</label>\n' +
             '                        </div>\n' +
             '                        <div class="form-group notPassDiv personDiv" style="display: none">\n' +
             '                            <label for="checkState" class="control-label">判定说明</label>\n' +
@@ -491,12 +491,12 @@ TalentAllowanceInfoDlg.showCheckModal = function(){
         btn: [ '<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;提交审核', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
         btnAlign: 'c',
         success :function (layero, index) {
-            var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/suppleCheckCalculate", function(data){
+            var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/suppleCheckCalculate", function(data){
                 if(data.code==200){
                     var info = data.obj.info;
                     var list = data.obj.detailList;
                     if(info.recommendAllowanceType == 1){
-                        $("#recommendallowanceType").val("人才津贴");
+                        $("#recommendallowanceType").val("工作津贴");
                     }
                     if(info.recommendAllowanceType == 2){
                         $("#recommendallowanceType").val("一次性交通补贴");
@@ -570,7 +570,7 @@ TalentAllowanceInfoDlg.showCheckModal = function(){
                             return;
                         }
                         if (resAllowanceType == 1 && details.length == 0) {
-                            Feng.info("请选择人才津贴可享受的月份");
+                            Feng.info("请选择工作津贴可享受的月份");
                             return;
                         }
                         if (Feng.isEmptyStr(resAllowanceMsg)) {
@@ -579,7 +579,7 @@ TalentAllowanceInfoDlg.showCheckModal = function(){
                         }
                     }
                 }
-                var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/afterCheck", function (data) {
+                var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/afterCheck", function (data) {
                     if (data.code == 200) {
                         Feng.success(data.msg);
                         window.parent.TalentAllowanceInfo.table.refresh();
@@ -849,7 +849,7 @@ TalentAllowanceInfoDlg.showLog = function(id){
         maxmin: true,
         success :function (layero, index) {
             $('#'+id).bootstrapTable({
-                url: Feng.ctxPath + "/api/talentChecklog/getJbtCheckLog",
+                url: Feng.ctxPath + "/common/api/getJbtCheckLog",
                 method: 'POST',
                 contentType: "application/x-www-form-urlencoded; charset=UTF-8",
                 search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -916,7 +916,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
     queryData['project'] = CONFIG.project_jbt;
     queryData['type'] = $("#type").val();
     $("#fileTable").bootstrapTable({
-        url: Feng.ctxPath + "/api/talentInfo/findUnCommonFileType",
+        url: Feng.ctxPath + "/common/api/findCommonFileType",
         method: 'POST',
         contentType: "application/x-www-form-urlencoded; charset=UTF-8",
         search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
@@ -971,7 +971,7 @@ TalentAllowanceInfoDlg.initFileTable = function (){
             $("#fileTable").bootstrapTable('expandAllRows');
         },
         onExpandRow: function (index, row, $detail) {
-            var ajax = new $ax(Feng.ctxPath + "/api/talentInfo/listTalentFile", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/common/api/listTalentFile", function (data) {
                 if(data==null||data.length==0){
                     return;
                 }
@@ -1025,7 +1025,7 @@ $(function(){
     $("select").each(function () {
         $(this).val($(this).attr("value"));
     });
-    // TalentAllowanceInfoDlg.initFileTable();
+    TalentAllowanceInfoDlg.initFileTable();
     TalentAllowanceInfoDlg.initContract();
     //批量加载时间控件
     $(".date").each(function(){

public/static/modular/talentAllowance/talentAllowancePrepare.js

@@ -36,7 +36,7 @@ TalentAllowanceInfo.cashColumns = function(){
         {title: '津补贴类型', field: 'allowanceType', visible: true, align: 'center', valign: 'middle',width:"10%",
             formatter(value,row,index){
                 if(value==null || value=="")return "未判定";
-                if(value==1)return "人才津贴";
+                if(value==1)return "工作津贴";
                 if(value==2)return "一次性交通补贴";
                 if(value==3)return "不予兑现";
             }
@@ -233,7 +233,7 @@ TalentAllowanceInfo.public = function(){
         }
     }
     var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/publicBatch", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/publicBatch", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 TalentAllowanceInfo.table.refresh();
@@ -306,7 +306,7 @@ TalentAllowanceInfo.cashPass =function(){
     }
     ids = ids.substring(0,ids.length-1);
     var operation = function(){
-        var ajax = new $ax(Feng.ctxPath + "/talentAllowanceInfo/cash", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/cash", function (data) {
             if(data.code==200){
                 Feng.success(data.msg);
                 TalentAllowanceInfo.table.refresh();
@@ -406,7 +406,7 @@ TalentAllowanceInfo.afterCheck = function(){
             title: '津补贴公示再审核',
             fix: false, //不固定
             maxmin: true,
-            content: Feng.ctxPath + '/talentAllowanceInfo/toSupplePage/' + TalentAllowanceInfo.seItem.id ,
+            content: Feng.ctxPath + '/admin/talentAllowance/toSupplePage/id/' + TalentAllowanceInfo.seItem.id ,
             btn: ['<i class="fa fa-save layui-bg-green"></i>&nbsp;&nbsp;计算津补贴', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
             btnAlign: 'c',
             yes: function(index, layero) {