人才层次变更部门审核

app/admin/controller/TalentTypeChange.php

@@ -73,12 +73,10 @@ class TalentTypeChange extends AdminController {
         $this->setTalentTypeChange($where, $params);
         $this->setTypeChangeCheckStateCondition($where, $params, $process);
         //$whereRaw = "length(talentId) <> 19";
-        if (in_array($this->user["type"], [1, 2, 5, 6])) {
-            $where[] = ["type", "=", $this->user["type"]];
-        }
         $where[] = ["delete", "=", 0];
         switch ($process) {
             case -1:
+                $where[] = ["type", "=", $this->user["type"]];
                 $company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
                 $where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
                 if ($this->user["code"] != $company["code"]) {
@@ -86,27 +84,53 @@ class TalentTypeChange extends AdminController {
                 }
                 break;
             case 1:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "not in", [3, 5]];
                 break;
             case 2:
-                //Company company = (Company) super . getSession() . getAttribute("company");
-                //page = this . talentDepcheckstateService . selectForTalentTypeChange(obj, page, company, Integer . parseInt(ProjectConst . LEVELCHANGE));
+                $where[] = ["ttc.type", "=", $this->user["type"]];
+                $companyId = $this->user["companyId"];
+                $where[] = ["td.companyId", "=", $companyId];
+                $where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
+                switch ($params["checkState"]) {
+                    case 1:
+                    case 2:
+                    case 3:
+                        $where[] = ["td.state", "=", $params["checkState"]];
+                        break;
+                    case 5:
+                        $where[] = ["ttc.highProcess", ">=", 2];
+                        $where[] = ["td.state", "=", 1];
+                        break;
+                }
+                $count = ttcModel::alias("ttc")->leftJoin("un_talent_depcheckstate td", "td.mainId=ttc.id")->where($where)->count();
+                $list = ttcModel::alias("ttc")->field("ttc.*,td.companyId,td.state as depState")->leftJoin("un_talent_depcheckstate td", "td.mainId=ttc.id")->where($where)->limit($offset, $limit)->order("ttc.createTime {$order}")->select()->toArray();
                 break;
             case 3:
-                //$where[] = ["firstDepPassTime", "EXP", Db::raw("is not null")];
+                $where[] = ["type", "=", $this->user["type"]];
+                $whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
                 break;
             case 4:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "in", [-1, 35]];
                 break;
             case 5:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "=", 35];
                 $where[] = ["isPublic", "=", 6];
                 break;
         }
 
         $levelMap = DictApi::selectByParentCode("talent_arrange");
-        $count = ttcModel::where($where)->count();
-        $list = ttcModel::where($where)->limit($offset, $limit)->order("createTime {$order}")->select()->toArray();
+        if ($process != 2) {
+            if ($whereRaw) {
+                $count = ttcModel::where($where)->whereRaw($whereRaw)->count();
+                $list = ttcModel::where($where)->whereRaw($whereRaw)->limit($offset, $limit)->order("createTime {$order}")->select()->toArray();
+            } else {
+                $count = ttcModel::where($where)->count();
+                $list = ttcModel::where($where)->limit($offset, $limit)->order("createTime {$order}")->select()->toArray();
+            }
+        }
         foreach ($list as $key => $item) {
             if ($item["beforeCheckCompany"]) {
                 $list[$key]["beforeCheckCompanyName"] = getCacheById("Company", $item["beforeCheckCompany"]);
@@ -173,6 +197,44 @@ class TalentTypeChange extends AdminController {
         return view("", ["info" => $info]);
     }
 
+    public function toDepCheck($id, $companyId) {
+        $info = ttcApi::getOne($id);
+        $arrangeMap = DictApi::selectByParentCode("talent_arrange");
+        $importMap = DictApi::selectByParentCode("import_way");
+        $info["oldTalentArrangeName"] = $arrangeMap[$info["oldTalentArrange"]];
+        $info["oldIntroductionModeName"] = $importMap[$info["oldIntroductionMode"]];
+        $info["newTalentArrangeName"] = $arrangeMap[$info["newTalentArrange"]];
+        $info["newIntroductionModeName"] = $importMap[$info["newIntroductionMode"]];
+        $info["process"] = 2;
+        if ($info["type"] == CommonConst::ENTERPRISE_NORMAL) {
+            $sourceMap = DictApi::selectByParentCode("source");
+            $info["oldSourceName"] = $sourceMap[$info["oldSource"]];
+            $info["newSourceName"] = $sourceMap[$info["newSource"]];
+        }
+        $talentCatMap = DictApi::selectByParentCode("talent_condition_cats");
+        if (strlen($info["oldIdentifyCondition"]) == 19) {
+            $oldCondition = Db::table("un_identify_condition")->find($info["oldIdentifyCondition"]);
+            $info["oldIdentifyConditionCH"] = $oldCondition["name"];
+        } else {
+            $oldCondition = TalentConditionApi::getOne($info["oldIdentifyCondition"]);
+            if ($oldCondition["talentLevelCat"]) {
+                $info["oldIdentifyConditionCategoryName"] = $talentCatMap[$oldCondition["talentLevelCat"]];
+            }
+            $info["oldIdentifyConditionCH"] = $oldCondition["name"];
+        }
+        if (strlen($info["newIdentifyCondition"]) == 19) {
+            $newCondition = Db::table("un_identify_condition")->find($info["newIdentifyCondition"]);
+            $info["newIdentifyConditionCH"] = $newCondition["name"];
+        } else {
+            $newCondition = TalentConditionApi::getOne($info["newIdentifyCondition"]);
+            if ($newCondition["talentLevelCat"]) {
+                $info["newIdentifyConditionCategoryName"] = $talentCatMap[$newCondition["talentLevelCat"]];
+            }
+            $info["newIdentifyConditionCH"] = $newCondition["name"];
+        }
+        return view("to_common_check", ["info" => $info, "companyId" => $companyId]);
+    }
+
     public function findFieldsAndFiles() {
         $response = new \stdClass();
         $response->code = 500;
@@ -459,10 +521,54 @@ class TalentTypeChange extends AdminController {
                     if ($checkState == 3) {
                         $talent_condition = TalentConditionApi::getOne($old["newIdentifyCondition"]);
                         $companyIds = array_filter(explode(",", $talent_condition["companyIds"]));
+                        $tdList = Db::table("un_talent_depcheckstate")->where("mainId", $id)->select()->toArray();
+                        $ids = [];
+                        $oldCompanyIds = [];
+                        foreach ($tdList as $td) {
+                            $ids[] = $td["id"];
+                            $oldCompanyIds[] = $td["companyId"];
+                        }
                         if ($companyIds) {
+                            $addList = [];
+                            $deleteDepList = [];
+                            foreach ($companyIds as $_companyId) {
+                                if (!in_array($_companyId, $oldCompanyIds)) {
+                                    $dep["id"] = getStringId();
+                                    $dep["type"] = ProjectState::LEVELCHANGE;
+                                    $dep["mainId"] = $id;
+                                    $dep["companyId"] = $_companyId;
+                                    $dep["state"] = 1;
+                                    $dep["createUser"] = $this->user["name"];
+                                    $dep["createTime"] = date("Y-m-d H:i:s");
+                                    $addList[] = $dep;
+                                }
+                            }
+                            foreach ($oldCompanyIds as $_ocompanyId) {
+                                if (!in_array($_ocompanyId, $companyIds)) {
+                                    $deleteDepList[] = $_ocompanyId;
+                                }
+                            }
+                            if ($addList) {
+                                Db::table("un_talent_depcheckstate")->insertAll($addList);
+                            }
+                            if ($deleteDepList) {
+                                $where = [];
+                                $where[] = ["mainId", "=", $id];
+                                $where[] = ["companyId", "in", $deleteDepList];
+                                Db::table("un_talent_depcheckstate")->where($where)->delete();
+                            }
+                            $where = [];
+                            $where[] = ["mainId", "=", $id];
+                            $updTd["state"] = 1;
+                            Db::table("un_talent_depcheckstate")->where($where)->update($updTd);
                             $data["checkCompanyIds"] = implode(",", $companyIds);
                             $data["checkState"] = MainState::NEED_DEP_CHECK;
                         } else {
+                            if ($ids) {
+                                $where = [];
+                                $where[] = ["id", "in", $ids];
+                                Db::table("un_talent_depcheckstate")->where($where)->delete();
+                            }
                             $data["checkCompanyIds"] = null;
                             $data["checkState"] = MainState::NEED_THIRD;
                         }
@@ -477,38 +583,49 @@ class TalentTypeChange extends AdminController {
                     Db::table("un_talent_type_change")->update($data);
                     break;
                 case 2:
-                    /* EntityWrapper<TalentDepcheckstate> tdWrapper = new EntityWrapper<>();
-                      tdWrapper.eq("mainId", ti.getId()).eq("companyId", ti.getCompanyId());
-                      TalentDepcheckstate tds = this.talentDepcheckstateService.selectOne(tdWrapper);
-                      tds.setState(checkState);
-                      if (checkState == 3) {
-                      tds.setSubmitTime(DateUtil.getTime());
-                      }
-                      this.talentDepcheckstateService.updateById(tds);
-                      //判断所有部门是否全部通过
-                      EntityWrapper<TalentDepcheckstate> needWrapper = new EntityWrapper<>();
-                      needWrapper.eq("mainId", ti.getId()).eq("state", 1);
-                      int needCount = this.talentDepcheckstateService.selectCount(needWrapper);
-                      if (needCount == 0) {
-                      EntityWrapper<TalentDepcheckstate> rejectWrapper = new EntityWrapper<>();
-                      rejectWrapper.eq("mainId", ti.getId()).eq("state", 2);
-                      int rejectCount = this.talentDepcheckstateService.selectCount(rejectWrapper);
-                      if (rejectCount > 0) {
-                      talentTypeChange.setCheckState(StateConst.RCRD_DEP_REJECT);
-                      } else {
-                      if (FengStringUtil.isEmpOrNull(old.getFirstDepPassTime())) {
-                      talentTypeChange.setFirstDepPassTime(DateUtil.getTime());
-                      }
-                      talentTypeChange.setCheckState(StateConst.RCRD_NEED_THIRD);
-                      }
-                      this.talentTypeChangeService.updateById(talentTypeChange);
-                      }
-                      TalentChecklog newLog2 = new TalentChecklog(Integer.parseInt(ProjectConst.LEVELCHANGE), ti.getId(), null, StateConst.ACTIVE_YES, BasicStateEnum.RCRD_BASEIC_SUBMIT.getCode(),
-                      ti.getProcess(), MainStateEnum.valueOf(old.getCheckState()) + "->" + MainStateEnum.valueOf(talentTypeChange.getCheckState()), log.getDescription() + "(" + company.getName() + ")", DateUtil.getTime(),
-                      ShiroKit.getUser().getAccount() + "(" + company.getName() + ")");
-                      newLog2.setCompanyId(company.getId());
-                      this.talentChecklogService.delete(new EntityWrapper<TalentChecklog>().eq("mainId", ti.getId()).eq("active", StateConst.ACTIVE_NO).eq("companyId", ti.getCompanyId()));
-                      this.talentChecklogService.insert(newLog2); */
+                    $where = [];
+                    $where[] = ["mainId", "=", $id];
+                    $where[] = ["companyId", "=", $companyId];
+                    $td = Db::table("un_talent_depcheckstate")->where($where)->find();
+                    $updTd = [];
+                    $updTd["id"] = $td["id"];
+                    $updTd["state"] = $checkState;
+                    if ($checkState == 3) {
+                        $updTd["submitTime"] = date("Y-m-d H:i:s");
+                    }
+                    Db::table("un_talent_depcheckstate")->update($updTd);
+                    //判断所有部门是否全部通过
+                    unset($where);
+                    $where[] = ["mainId", "=", $id];
+                    $tdList = Db::table("un_talent_depcheckstate")->where($where)->select()->toArray();
+                    $needCount = 0;
+                    $rejectCount = 0;
+                    foreach ($tdList as $td) {
+                        if ($td["state"] == 1) {
+                            $needCount++;
+                        }
+                        if ($td["state"] == 2) {
+                            $rejectCount++;
+                        }
+                    }
+                    if ($needCount == 0) {
+                        if ($rejectCount > 0) {
+                            $data["checkState"] = MainState::DEP_REJECT;
+                        } else {
+                            if (\StrUtil::isEmpOrNull($old["firstDepPassTime"])) {
+                                $data["firstDepPassTime"] = date("Y-m-d H:i:s");
+                            }
+                            $data["checkState"] = MainState::NEED_THIRD;
+                        }
+                        Db::table("un_talent_type_change")->update($data);
+                    }
+                    $log["id"] = $lastLog["id"];
+                    $log["active"] = 1;
+                    $log["state"] = 8;
+                    $log["stateChange"] = MainState::getStateDesc($old["checkState"]) . "->" . MainState::getStateDesc($data["checkState"]);
+                    $log["updateUser"] = $user ? sprintf("%s(%s)", $user["account"], $user["companyName"] ?: $user["rolename"]) : "系统";
+                    $log["updateTime"] = date("Y-m-d H:i:s");
+                    Db::table("new_talent_checklog")->update($log);
                     break;
                 case 3:
                     if ($checkState == -1) {
@@ -1441,7 +1558,6 @@ class TalentTypeChange extends AdminController {
         $response = new \stdClass();
         $response->code = 500;
         $where = [];
-        $where[] = ["type", "=", $this->user["type"]];
         //$whereRaw = "length(talentId) <> 19";
         $request = $this->request;
         $talentName = \StrUtil::getRequestDecodeParam($request, "talentName");
@@ -1493,24 +1609,56 @@ class TalentTypeChange extends AdminController {
         $this->setTypeChangeCheckStateCondition($where, $filters, $process);
         switch ($process) {
             case -1:
+                $where[] = ["type", "=", $this->user["type"]];
+                $company = \app\common\api\CompanyApi::getOne($this->user["companyId"]);
+                $where[] = ["beforeCheckCompany", "EXP", Db::raw("is not null")];
+                if ($this->user["code"] != $company["code"]) {
+                    $where[] = ["beforeCheckCompany", "=", $company["id"]];
+                }
                 break;
             case 1:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "not in", [3, 5]];
                 break;
             case 2:
+                $where[] = ["ttc.type", "=", $this->user["type"]];
+                $companyId = $this->user["companyId"];
+                $where[] = ["td.companyId", "=", $companyId];
+                $where[] = ["td.type", "=", ProjectState::LEVELCHANGE];
+                switch ($checkState) {
+                    case 1:
+                    case 2:
+                    case 3:
+                        $where[] = ["td.state", "=", $checkState];
+                        break;
+                    case 5:
+                        $where[] = ["ttc.highProcess", ">=", 2];
+                        $where[] = ["td.state", "=", 1];
+                        break;
+                }
+                $list = ttcModel::alias("ttc")->field("ttc.*,td.companyId,td.state as depState")->leftJoin("un_talent_depcheckstate td", "td.mainId=ttc.id")->where($where)->select()->toArray();
                 break;
             case 3:
-                $where[] = ["checkState", "in", [-1, 35]];
+                $where[] = ["type", "=", $this->user["type"]];
+                $whereRaw = "firstDepPassTime is not null or (checkCompanyIds is null and highProcess >=1)";
                 break;
             case 4:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "in", [-1, 35]];
                 break;
             case 5:
+                $where[] = ["type", "=", $this->user["type"]];
                 $where[] = ["checkState", "=", 35];
                 $where[] = ["isPublic", "=", 6];
                 break;
         }
-        $list = ttcModel::where($where)->select()->toArray();
+        if ($process != 2) {
+            if ($whereRaw) {
+                $list = ttcModel::where($where)->whereRaw($whereRaw)->select()->toArray();
+            } else {
+                $list = ttcModel::where($where)->select()->toArray();
+            }
+        }
         $list = $this->translateToChinese($list, $process);
         $columns = [
             "姓名", "证件号码", "工作单位", "所属街道", "原申报年度", "原申报来源", "原入选来源地级市", "原入选来源县市区", "原人才层次", "原认定条件", "原认定条件证书取得时间", "原认定条件过期时间", "原认定条件名称",

app/admin/view/talent_type_change/dept_verify.html

@@ -1,4 +1,5 @@
-@layout("/common/_container.html"){
+{extend name="layout/content"}
+{block name="content"}
 <style type="text/css">
     .layui-layer-btn .layui-layer-btn1 {
         border-color: #009688;
@@ -17,24 +18,69 @@
                     <div class="col-sm-12">
                         <div class="row">
                             <div class="col-sm-3">
-                                <#NameCon id="talentName" name="姓名" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">姓名
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="talentName" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="idCard" name="证件号码" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">证件号码
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="idCard" placeholder="" />
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="enterpriseName" name="单位名称" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            单位名称
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="enterpriseName">
+                                        <option></option>
+                                        {volist name="enterprises" id="item"}
+                                        <option value="{$item.id}">{$item.name}</option>
+                                        {/volist}
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="oldYear" name="原申报年度" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">原申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="oldYear" placeholder="">
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="oldTalentArrange" name="原人才层次" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            原人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="oldTalentArrange" onchange="TalentTypeChange.getIdentifyCondition('old')">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="oldIdentifyCondition" name="原认定条件" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            原认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="oldIdentifyCondition">
+                                        <option value="">--请选择--</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
                                 <div class="input-group input-group-sm">
@@ -46,62 +92,107 @@
                                 </div>
                             </div>
                             <div class="col-sm-3">
-                                <#NameCon id="newYear" name="新申报年度" />
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新申报年度
+                                        </button>
+                                    </div>
+                                    <input type="text" class="form-control" id="newYear" placeholder="">
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="newTalentArrange" name="新人才层次" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            新人才层次
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="newTalentArrange" onchange="TalentTypeChange.getIdentifyCondition('new')">
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="newIdentifyCondition" name="新认定条件" >
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                            新认定条件
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="newIdentifyCondition">
+                                        <option value="">--请选择--</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3" style="display: none">
+                                <div class="input-group">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新公布入选月份
+                                        </button>
+                                    </div>
+                                    <input type="text" time="time" formate="date" class="form-control" id="newIdentifyMonth" name="newIdentifyMonth"/>
+                                </div>
                             </div>
-            <div class="col-sm-3" style="display: none">
-                <div class="input-group">
-                    <div class="input-group-btn">
-                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">新公布入选月份
-                        </button>
-                    </div>
-                    <input type="text" time="time" formate="date" class="form-control" id="newIdentifyMonth" name="newIdentifyMonth"/>
-                </div>
-            </div>
                             <div class="col-sm-3">
-                                <#SelectCon id="checkState" name="审核状态" >
-                                    <option value="" >请选择</option>
-                                    <option value="1">待审核</option>
-                                    <option value="2">已驳回</option>
-                                    <option value="3">已通过</option>
-                                    <option value="5">重新提交</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">审核状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="checkState">
+                                        <option value="">请选择</option>
+                                        <option value="1">待审核</option>
+                                        <option value="2">已驳回</option>
+                                        <option value="3">已通过</option>
+                                        <option value="5">重新提交</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3" style="display: none">
-                                <#SelectCon id="isPublic" name="状态" >
-                                    <option value="">请选择</option>
-                                    <option value="1">待核查征信</option>
-                                    <option value="2">待公示</option>
-                                    <option value="3">公示中</option>
-                                    <option value="4">待公布</option>
-                                    <option value="5">待发证</option>
-                                    <option value="6">已发证</option>
-                                </#SelectCon>
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-btn">
+                                        <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">状态
+                                        </button>
+                                    </div>
+                                    <select class="form-control" id="isPublic">
+                                        <option value="">请选择</option>
+                                        <option value="1">待核查征信</option>
+                                        <option value="2">待公示</option>
+                                        <option value="3">公示中</option>
+                                        <option value="4">待公布</option>
+                                        <option value="5">待发证</option>
+                                        <option value="6">已发证</option>
+                                    </select>
+                                </div>
                             </div>
                             <div class="col-sm-3">
-                                <#button name="搜索" icon="fa-search" clickFun="TalentTypeChange.search()"/>
-                                <#button name="重置" icon="fa-trash" clickFun="TalentTypeChange.reset()"/>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-info  glyphicon glyphicon-search" onclick="TalentTypeChange.search()">搜索</button>
+                                <button type="button" style="cursor:pointer;"  class="btn btn-sm btn-warning glyphicon glyphicon-repeat" onclick="TalentTypeChange.reset()">重置</button>
                             </div>
                         </div>
                         <div class="hidden-xs" id="TalentTypeChangeTableToolbar" role="group">
-                            @if(shiro.hasPermission("/talentTypeChange/depCheck")){
-                            <#button name="审核" icon="fa-check" clickFun="TalentTypeChange.openTalentTypeChangeCheck()"/>
-                            @}
-                            @if(shiro.hasPermission("/talentTypeChange/depExport")){
-                            <#button name="导出" icon="fa-file-excel-o" clickFun="TalentTypeChange.export(2)" space="true"/>
-                            @}
-                            @if(shiro.hasPermission("/talentTypeChange/depDownload")){
-                            <#button name="下载" icon="fa-download" clickFun="TalentTypeChange.download()"/>
-                            @}
+                            {if condition="chkCommission('/admin/talentTypeChange/depCheck','/talentTypeChange/depCheck')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.openTalentTypeChangeCheck()" id="">
+                                <i class="fa fa-check"></i>&nbsp;审核
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentTypeChange/depExport','/talentTypeChange/depExport')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.export(2)" id="">
+                                <i class="fa fa-file-excel-o"></i>&nbsp;导出
+                            </button>
+                            {/if}
+                            {if condition="chkCommission('/admin/talentTypeChange/depDownload','/talentTypeChange/depDownload')"}
+                            <button type="button" class="btn btn-sm btn-primary " onclick="TalentTypeChange.download()" id="">
+                                <i class="fa fa-download"></i>&nbsp;下载
+                            </button>
+                            {/if}
                         </div>
-                        <#table id="TalentTypeChangeTable"/>
+                        <table id="TalentTypeChangeTable" 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>
@@ -112,7 +203,7 @@
 <!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js"></script>-->
 <!--<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js"></script>-->
 <script type="text/javascript">
-    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js?v='+(new Date()).getTime()+'"><\/script>');
-    document.write('<script src="${ctxPath}/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v='+(new Date()).getTime()+'"><\/script>');
+    document.write('<script src="/static/modular/talentLibrary/talentTypeChange/talentTypeChange_dep.js?v=' + (new Date()).getTime() + '"><\/script>');
+    document.write('<script src="/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common.js?v=' + (new Date()).getTime() + '"><\/script>');
 </script>
-@}
+{/block}

public/static/modular/talentLibrary/talentTypeChange/talentTypeChange_common_check.js

@@ -159,8 +159,8 @@ TalentTypeChangeInfoDlg.showCommonCheckModal = function () {
                                 '                            <option value="2">审核驳回</option>';
                         $("#checkStateModal").empty().append(html);
                     }
-                    $("#checkStateModal").val(data.obj.checkState);
-                    $("#checkMsg").val(data.obj.checkMsg);
+                    $("#checkStateModal").val(data.checkState);
+                    $("#checkMsg").val(data.checkMsg);
                 },
                 yes: function (index, layero) {
                     TalentTypeChangeInfoDlg.commonCheck(index);