津补贴：企业端申报时选择人才后会检查申报年度的人才层次及工作单位是否存在（原来只有保存时会提示）

app/enterprise/controller/TalentAllowance.php

@@ -192,6 +192,27 @@ class TalentAllowance extends EnterpriseController {
         }
     }
 
+    public function getInfoByIdAndYear($id, $year) {
+        $ti = \app\common\api\VerifyApi::getTalentInfoById($id);
+        $data = [
+            "talentId" => $id,
+            "year" => $year,
+            "idCard" => $ti["card_number"],
+            "id" => getStringId()
+        ];
+        /*         * 1.获取上一年度的人才层次 */
+        $arrangeList = $this->getLastYearTalentType($data, $ti);
+        if (!$arrangeList) {
+            return new Response(Response::ERROR, "该人员上一年度暂无有效的人才层次");
+        }
+        /*         * 2.获取上一年度所在单位* */
+        $contractDetailList = $this->getConcatList($ti, $data, $year); //保存上一年度的工作单位
+        if (!$contractDetailList) {
+            return new Response(Response::ERROR, "该人员申报年度不存在有效的工作单位");
+        }
+        return new Response(Response::SUCCESS, "", $ti);
+    }
+
     /**
      * 删除优秀人才津补贴
      */

public/static/modular/gate/talentAllowance/common/talentAllowance_info.js

@@ -89,32 +89,58 @@ TalentAllowanceInfoDlg.onAllowanceTypeChange = function (allowanceType) {
  */
 TalentAllowanceInfoDlg.init = function () {
     var talentId = $("#name").val();
+    var year = $("#year").val();
     if (Feng.isNotEmptyStr(talentId)) {
-        var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
-            $("#active").val(data.active);
-            $("#talentId").val(talentId);
-            $("#talentTypeName").val(data.talentTypeName);
-            $("#enterpriseName").val(data.enterpriseName);
-            $("#sex").val(data.sex == 1 ? "男" : "女");
-            $("#idCard").val(data.card_number);
-            //$("#introductionModeName").val(data.introductionModeName);
-            $("#firstInJJTime").val(data.fst_work_time);
-            $("#entryTime").val(data.cur_entry_time);
-            $("#post").val(data.position);
-            $("#phone").val(data.phone);
-            $("#bank").val(data.bank);
-            $("#bankNumber").val(data.bank_number);
-            $("#bankNetwork").val(data.bank_branch_name).attr("title", data.bank_branch_name);
-            $("#bankAccount").val(data.bank_account);
-            $("#talentArrangeName").val(data.talentArrangeName);
-            $("#identifyConditionText").val(data.talentConditionName).attr("title", data.talentConditionName);
-            $("#identifyConditionName").val(data.identifyConditionName).attr("title", data.identifyConditionName);
-            $("#identifyGetTime").val(data.identifyGetTime);
-            $("#provinceCode").val(data.provinceName + data.cityName + data.countyName);
+        //var ajax = new $ax(Feng.ctxPath + "/enterprise/talent/getInfoById/id/" + talentId, function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/enterprise/talentAllowance/getInfoByIdAndYear/id/" + talentId + "/year/" + year, function (data) {
+            if (data.code == 200) {
+                var info = data.obj;
+                $("#active").val(info.active);
+                $("#talentId").val(talentId);
+                $("#talentTypeName").val(info.talentTypeName);
+                $("#enterpriseName").val(info.enterpriseName);
+                $("#sex").val(info.sex == 1 ? "男" : "女");
+                $("#idCard").val(info.card_number);
+                //$("#introductionModeName").val(info.introductionModeName);
+                $("#firstInJJTime").val(info.fst_work_time);
+                $("#entryTime").val(info.cur_entry_time);
+                $("#post").val(info.position);
+                $("#phone").val(info.phone);
+                $("#bank").val(info.bank);
+                $("#bankNumber").val(info.bank_number);
+                $("#bankNetwork").val(info.bank_branch_name).attr("title", info.bank_branch_name);
+                $("#bankAccount").val(info.bank_account);
+                $("#talentArrangeName").val(info.talentArrangeName);
+                $("#identifyConditionText").val(info.talentConditionName).attr("title", info.talentConditionName);
+                $("#identifyConditionName").val(info.identifyConditionName).attr("title", info.identifyConditionName);
+                $("#identifyGetTime").val(info.identifyGetTime);
+                $("#provinceCode").val(info.provinceName + info.cityName + (info.countyName ? info.countyName : ""));
+            } else {
+                $("#active").val("");
+                $("#talentId").val("");
+                $("#talentTypeName").val("");
+                $("#enterpriseName").val("");
+                $("#sex").val("");
+                $("#idCard").val("");
+                //$("#introductionModeName").val(info.introductionModeName);
+                $("#firstInJJTime").val("");
+                $("#entryTime").val("");
+                $("#post").val("");
+                $("#phone").val("");
+                $("#bank").val("");
+                $("#bankNumber").val("");
+                $("#bankNetwork").val("").attr("title", "");
+                $("#bankAccount").val("");
+                $("#talentArrangeName").val("");
+                $("#identifyConditionText").val("").attr("title", "");
+                $("#identifyConditionName").val("").attr("title", "");
+                $("#identifyGetTime").val("");
+                $("#provinceCode").val("");
+                Feng.error(data.msg);
+            }
         }, function (data) {
             Feng.error("查询失败!" + data.responseJSON.message + "!");
         });
-        ajax.set("year", $("#year").val())
         ajax.start();
     }
 }
@@ -621,10 +647,10 @@ TalentAllowanceInfoDlg.initCommonFileTable = function () {
             return {css: {"word-break": "break-word", "white-space": "inherit"}}
         },
         columns: [
-            {title: '附件原名', field: 'originalName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip',  width: '70%', formatter: function (value, row, index) {
+            {title: '附件原名', field: 'originalName', visible: true, align: 'center', valign: 'middle', 'class': 'uitd_showTip', width: '70%', formatter: function (value, row, index) {
                     return value;
                 }},
-            {title: '预览', field: 'url', visible: true, align: 'center', valign: 'middle',width: "20%",
+            {title: '预览', field: 'url', visible: true, align: 'center', valign: 'middle', width: "20%",
                 formatter: function (value, row, index) {
                     var sn = value.lastIndexOf(".");
                     var suffix = value.substring(sn + 1, value.length);