购房补贴++

app/admin/controller/House.php

@@ -6,18 +6,13 @@ use app\admin\common\AdminController;
 use think\facade\Db;
 use app\common\api\Response;
 use app\common\api\DictApi;
-use app\common\api\TalentAllowanceApi;
 use app\common\api\TalentLogApi;
-use app\common\model\TalentAllowance as TaModel;
 use app\common\model\TalentChecklog;
-use app\common\model\TalentAllowanceArrange;
 use app\common\state\ProjectState;
-use app\common\state\AllowanceStateEnum;
-use app\common\state\AllowanceProjectEnum;
-use app\common\state\AllowanceTypeEnum;
 use app\common\state\CommonConst;
 use app\common\state\HouseStateEnum;
 use app\common\model\HousePurchase as houseModel;
+use app\common\api\HouseApi;
 
 /**
  * Description of House
@@ -96,132 +91,10 @@ class House extends AdminController {
             $count = houseModel::where($where)->count();
             $list = houseModel::where($where)->limit($offset, $limit)->order($order)->select()->toArray();
         } else {
-            /*SELECT
-            t1.companyId,
-            t1.state,
-            t3.`name` AS companyName,
-            t5.description AS checkMsg,
-            t2.id,
-            t2.talentId,
-            t2.enterpriseId,
-            t2.type,
-            t2.declareType,
-            t2.declareObject,
-            t2.`year`,
-            t2.`name`,
-            t2.cardType,
-            t2.idCard,
-            t2.provinceCode,
-            t2.provinceName,
-            t2.cityCode,
-            t2.cityName,
-            t2.countyCode,
-            t2.countyName,
-            t2.street,
-            t2.talentType,
-            t2.talentArrange,
-            t2.identifyCondition,
-            t2.idenfityConditionName,
-            t2.identifyGetTime,
-            t2.phone,
-            t2.marryStatus,
-            t2.spouseName,
-            t2.spouseCardType,
-            t2.spouseIdcard,
-            t2.childName,
-            t2.childCardType,
-            t2.childIdCard,
-            t2.number,
-            t2.houseAddress,
-            t2.houseArea,
-            t2.recordTime,
-            t2.houseMoney,
-            t2.realEstateNo,
-            t2.recordNo,
-            t2.isEnjoyOther,
-            t2.bank,
-            t2.bankNumber,
-            t2.bankNetwork,
-            t2.bankAccount,
-            t2.sbPayDetail,
-            t2.taxPayDetail,
-            t2.letterDetail,
-            t2.attendDetail,
-            t2.mzjCheckDetail,
-            t2.checkIsTradeRecord,
-            t2.checkRecordTime,
-            t2.zjjCheckDetail,
-            t2.isHasBdcCard,
-            t2.bdcRegistTime,
-            t2.isOwner,
-            t2.transferMethod,
-            t2.transferTime,
-            t2.zrzzjCheckDetail,
-            t2.shouldEnjoyMoney,
-            t2.realEnjoyMoney,
-            t2.talentArrangeMonths,
-            t2.monthCount,
-            t2.firstSubmitTime,
-            t2.newSubmitTime,
-            t2.firstPassTime,
-            t2.depPassTime,
-            t2.reviewPassTime,
-            t2.isConflict,
-            t2.checkState,
-            t2.checkMsg,
-            t2.publicState,
-            t2.cashType,
-            t2.cashIdCards,
-            t2.`fields`,
-            t2.files,
-            t2.highProcess
-        FROM
-            un_talent_depcheckstate t1
-        LEFT JOIN un_housepurchase t2 ON t2.id = t1.mainId
-        LEFT JOIN sys_company t3 ON t3.id = t1.companyId
-        LEFT JOIN (
-            SELECT
-                t4.mainId,
-                t4.createTime,
-                t4.companyId,
-                t4.description
-            FROM
-                (
-                    SELECT
-                        *
-                    FROM
-                        un_talent_checklog
-                    WHERE
-                        type = #{type}
-                    AND step = 2
-                    AND state != 8
-                    ORDER BY
-                        createTime DESC
-                    LIMIT 100000
-                ) t4
-            GROUP BY
-                t4.mainId,
-                t4.companyId
-            ORDER BY
-                t4.createTime DESC
-        ) t5 ON t1.mainId = t5.mainId
-        AND t1.companyId = t5.companyId
-        WHERE t1.type=#{type}
-        and  t2.type = #{obj.type}
-        <include refid="housePurchase_condition"></include>
-        ORDER BY t1.createTime DESC
-        LIMIT #{current},#{limit}*/
-            /*
-             * SELECT
-        count(0)
-        FROM
-        un_talent_depcheckstate t1
-        LEFT JOIN un_housepurchase t2 ON t2.id = t1.mainId
-        LEFT JOIN sys_company t3 ON t3.id = t1.companyId
-        WHERE t1.type=#{type}
-        and  t2.type = #{obj.type}
-        <include refid="housePurchase_condition"></include>
-             */
+            $company = getCacheById("Company", $this->user["companyId"]);
+            $result = HouseApi::selectForHousePurchase($param, $company, ProjectState::HOUSE, $offset, $limit);
+            $count = $result["total"];
+            $list = $result["rows"];
         }
         $list = $this->translateChinese($list, $process);
         return json(["rows" => $list, "total" => $count]);
@@ -234,24 +107,54 @@ class House extends AdminController {
     public function toCheckPage() {
         $id = $this->request["id"];
         $process = $this->request["process"];
-        $obj = TalentAllowanceApi::getInfoById($id);
-        $this->translateToChinese($obj);
-        if ($this->user["type"] == CommonConst::ENTERPRISE_GJ) {
-            $need_choose_post_type = getJsonConfig("../sys_config.json", "talent_allowance_need_choose_post_type");
-            $need_choose_institution = getJsonConfig("../sys_config.json", "talent_allowance_need_choose_institution");
-            if ($need_choose_post_type[$obj["enterpriseId"]]) {
-                $postTypes = DictApi::findChildDictByCode("PostType");
-                foreach ($postTypes as $key => $pt) {
-                    if (!in_array($pt["code"], $need_choose_post_type[$obj["enterpriseId"]])) {
-                        unset($postTypes[$key]);
-                    }
-                }
-            }
-            if (in_array($obj["enterpriseId"], $need_choose_institution)) {
-                $institutions = DictApi::findChildDictByCode("Institution");
-            }
-        }
-        return view("info", ["row" => $obj, "process" => $process, "postTypes" => $postTypes, "institutions" => $institutions]);
+        $companyId = $this->request["companyId"];
+        $hand = $this->request["hand"];
+        $housepurchase = HouseApi::getInfoById($id);
+        $company = getCacheById("Company", $this->user["companyId"]);
+        $enterprise = \app\common\api\EnterpriseApi::getOne($housepurchase["enterpriseId"]);
+        $housepurchase["enterpriseName"] = $enterprise["name"];
+        $housepurchase["process"] = $process;
+        $housepurchase["companyId"] = $companyId;
+        $housepurchase["talentArrangeName"] = DictApi::findByParentCodeAndCode("talent_arrange", $housepurchase["talentArrange"])["name"];
+        $housepurchase["marryStatusName"] = DictApi::findByParentCodeAndCode("marry_status", $housepurchase["marryStatus"])["name"];
+        $housepurchase["cardTypeName"] = DictApi::findByParentCodeAndCode("card_type", $housepurchase["cardType"])["name"];
+
+        if (\StrUtil::isNotEmpAndNull($housepurchase["spouseCardType"])) {
+            $housepurchase["spouseCardTypeName"] = DictApi::findByParentCodeAndCode("card_type", $housepurchase["spouseCardType"])["name"];
+        }
+        if (\StrUtil::isNotEmpAndNull($housepurchase["childCardType"])) {
+            $housepurchase["childCardTypeName"] = DictApi::findByParentCodeAndCode("card_type", $housepurchase["childCardType"])["name"];
+        }
+        $housepurchase["streetName"] = DictApi::findByParentCodeAndCode("street", $housepurchase["street"])["name"];
+        if ($housepurchase["type"] == 1) {
+            $housepurchase["talentTypeName"] = DictApi::findByParentCodeAndCode("enterprise_tag", $housepurchase["talentType"])["name"];
+        }
+        $housepurchase["identifyConditionCH"] = \app\common\api\TalentConditionApi::getOne($housepurchase["identifyCondition"])["name"];
+        /*         * 历史申报享受其他政策数据* */
+        $historyOtherList = HouseApi::getHistoryEnjoyOtherList($id, $housepurchase["idCard"], $housepurchase["spouseIdcard"]);
+        /*         * 当前申报录入的享受其他政策数据 */
+        $nowOtherList = HouseApi::getEnjoyOtherList($id);
+        /*         * 其他房产信息 */
+        $zzjOtherHouseList = HouseApi::getOtherHouseList($id, 1);
+        $zrzyOtherHouseList = HouseApi::getOtherHouseList($id, 2);
+        /*         * 未成年子女信息 */
+        $childrenList = HouseApi::getChildren($id);
+        /*         * 配偶信息 */
+        $spouseList = HouseApi::getSpouse($id);
+        $dicts = DictApi::findChildDictByCode("card_type");
+        $vars = [
+            "dicts" => $dicts,
+            "row" => $housepurchase,
+            "company" => $company,
+            "historyOtherList" => $historyOtherList,
+            "nowOtherList" => $nowOtherList,
+            "zzjOtherHouseList" => $zzjOtherHouseList,
+            "zrzyOtherHouseList" => $zrzyOtherHouseList,
+            "childrenList" => $childrenList,
+            "spouseList" => $spouseList
+        ];
+        $template = $hand == 1 ? "info" : "select";
+        return view($template, $vars);
     }
 
     /**
@@ -1283,92 +1186,99 @@ class House extends AdminController {
      */
     public function validateIsCheck() {
         $id = $this->request["id"];
-        $type = $this->request["type"];
         $process = $this->request["process"];
+        $compnayId = $this->request["companyId"];
 
-        $info = null;
-        switch ($type) {
-            case 1:                 //编辑合同
-                $detail = \app\common\model\TalentAllowancecontractDetail::find($id);
-                $info = TalentAllowanceApi::getInfoById($detail["mainId"]);
-                break;
-            case 2:                 //编辑项目
-                $project = \app\common\model\TalentAllowanceProject::find($id);
-                $info = TalentAllowanceApi::getInfoById($project["mainId"]);
-                break;
-            case 3:
-                $info = TalentAllowanceApi::getInfoById($id);
-                break;
-        }
-        if (!$info) {
-            return new Response(Response::ERROR, "校验不通过，无法操作");
-        }
-        $where = [];
-        $where[] = ["mainId", "=", $info["id"]];
-        $where[] = ["step", "=", $process];
-        $where[] = ["active", "=", 2];
-
-        $log = null;
+        $old = HouseApi::getInfoById($id);
+        $checkState = $old["checkState"];
+        $res = null;
         switch ($process) {
             case 1:
-                if ($info["checkState"] != AllowanceStateEnum::NEED_CHECK && $info["checkState"] != AllowanceStateEnum::REJECT_TO_FIRST) {
-                    return new Response(Response::ERROR, "不在审核范围内");
+                if ($checkState != HouseStateEnum::NEED_CHECK && $checkState != HouseStateEnum::REJECT_TO_FIRST && $checkState != HouseStateEnum::DEP_REJECT) {
+                    return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                } else {
+                    $log = TalentLogApi::getLastLogByStep($id, ProjectState::HOUSE, $process, 2);
+                    if ($log) {
+                        $old["checkState"] = $log["state"];
+                        $old["checkMsg"] = $log["description"];
+                    } else {
+                        $old["checkState"] = null;
+                        $old["checkMsg"] = "";
+                    }
                 }
-                //$where[] = ["companyId","=",$this->user["companyId"]];
-                $log = TalentChecklog::where($where)->order("createTime desc")->find();
                 break;
             case 2:
-                if ($info["checkState"] != AllowanceStateEnum::NEED_VISIT_CHECK && $info["checkState"] != AllowanceStateEnum::REVIEW_REJECT) {
-                    return new Response(Response::ERROR, "不在审核范围内");
+                if ($checkState != HouseStateEnum::NEED_DEP_CHECK && $checkState != HouseStateEnum::REJECT_TO_DEP) {
+                    return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                } else {
+                    $where = [];
+                    $where[] = ["mainId", "=", $id];
+                    $where[] = ["companyId", "=", $compnayId];
+                    $where[] = ["type", "=", ProjectState::HOUSE];
+                    $depcheckstate = Db::table("un_talent_depcheckstate")->where($where)->find();
+                    if ($depcheckstate["state"] != 1 && $depcheckstate["state"] != 4 && $depcheckstate["state"] != 9) {
+                        return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                    } else {
+                        $log = TalentLogApi::getLastLogByStep($id, ProjectState::HOUSE, $process, 2, $compnayId);
+                        if ($log) {
+                            $old["checkState"] = $log["state"];
+                            $old["checkMsg"] = $log["description"];
+                        } else {
+                            $old["checkState"] = null;
+                            $old["checkMsg"] = "";
+                        }
+                        $res["company"] = getCacheById("Company", $compnayId);
+                    }
                 }
                 break;
             case 3:
-                if ($info["checkState"] != AllowanceStateEnum::NEED_REVIEW && $info["checkState"] != AllowanceStateEnum::PUBLIC_REJECT) {
-                    return new Response(Response::ERROR, "不在审核范围内");
+                if ($checkState != HouseStateEnum::NEED_REVIEW_CHECK && $checkState != HouseStateEnum::REJECT_TO_REVIEW) {
+                    return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                } else {
+                    $log = TalentLogApi::getLastLogByStep($id, ProjectState::HOUSE, $process, 2);
+                    if ($log) {
+                        $old["checkState"] = $log["state"];
+                        $old["checkMsg"] = $log["description"];
+                    } else {
+                        $old["checkState"] = null;
+                        $old["checkMsg"] = "";
+                    }
+                }
+                break;
+            case 4:
+                if ($checkState != HouseStateEnum::REVIEW_PASS && $checkState != HouseStateEnum::NOTPASS) {
+                    return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                } else if ($old["publicState"] != 2) {
+                    return new Response(Response::ERROR, "该申报不在审核范围内，无法审核");
+                } else {
+                    $log = TalentLogApi::getLastLogByStep($id, ProjectState::HOUSE, $process, 2);
+                    if ($log) {
+                        $old["checkState"] = $log["state"];
+                        $old["checkMsg"] = $log["description"];
+                    } else {
+                        $old["checkState"] = null;
+                        $old["checkMsg"] = "";
+                    }
+                    $res = $this->calculate($old, 1);
+                    if ($res->code == 500) {
+                        return $res;
+                    }
+                    $res["housepurchase"] = $res->obj;
                 }
-                $log = TalentChecklog::where($where)->order("createTime desc")->find();
                 break;
         }
-        if ($log != null) {
-            $info["checkState"] = $log["state"];
-            $info["checkMsg"] = $log["description"];
-        } else {
-            $info["checkState"] = null;
-            $info["checkMsg"] = "";
-        }
-        $res = [];
-        $res["info"] = $info;
-        if ($type == 3) {
-            $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
-            $where = [];
-            $where[] = ["mainId", "=", $id];
-            $where[] = ["isLock", "=", 1];
-            $projectList = \app\common\model\TalentAllowanceProject::where($where)->select()->toArray();
-            $detailList = \app\common\model\TalentAllowancecontractDetail::where("mainId", $id)->select()->toArray();
-            $detailMap = array_reduce($detailList, function ($result, $item) {
-                $key = $item["id"];
-                $result[$key] = $item;
-                return $result;
-            }, []);
-            foreach ($detailList as &$detail) {
-                $detail["enterpriseName"] = sprintf("%s(%s至%s)", $enterpriseMap[$detail["enterpriseId"]], $detail["startTime"], $detail["endTime"]);
-            }unset($detail);
-            foreach ($projectList as &$project) {
-                $detail = $detailMap[$project["baseId"]];
-                $project["projectName"] = sprintf("%s(%s(%s至%s))", AllowanceProjectEnum::getProjectName($project["project"]), $enterpriseMap[$project["enterpriseId"]], $detail["startTime"], $detail["endTime"]);
-            }
-            $where = [];
-            $where[] = ["type", "=", $info["type"]];
-            $where[] = ["project", "=", \app\common\state\ProjectState::JBT];
-            $where[] = ["active", "=", 1];
-            $where[] = ["isConditionFile", "=", $info["allowanceType"]];
-            $where[] = ["delete", "=", 0];
-            $filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
-            $res["files"] = $filetypes;
-            $res["projects"] = $projectList;
-            $res["concats"] = $detailList;
-        }
-        return new Response(Response::SUCCESS, "不在审核范围内", $res);
+        $where = [];
+        $where[] = ["type", "=", $old["type"]];
+        $where[] = ["project", "=", ProjectState::HOUSE];
+        $where[] = ["active", "=", 1];
+        $where[] = ["delete", "=", 0];
+        $filetypeList = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
+        /*         * 查询之前是否享受过 */
+        $count = HouseApi::getEnjoyTimesByIdCard($old["idCard"]);
+        $res["number"] = $count;
+        $res["obj"] = $old;
+        $res["fileTypeList"] = $filetypeList;
+        return new Response(Response::SUCCESS, "", $res);
     }
 
     /**
@@ -1379,40 +1289,23 @@ class House extends AdminController {
         if (\StrUtil::isEmpOrNull($id)) {
             return new Response(Response::ERROR, "请选择需要修改的对象");
         }
-        $info = TalentAllowanceApi::getInfoById($id);
+        $info = HouseApi::getInfoById($id);
         if (!$info) {
             return new Response(Response::ERROR, "系统错误，请联系管理员");
         }
-        if ($info["checkState"] != AllowanceStateEnum::FIRST_REJECT) {
+        if ($info["checkState"] != HouseStateEnum::FIRST_REJECT) {
             return new Response(Response::ERROR, "只能修改初审驳回的数据");
         }
         $res = [];
-        $enterpriseMap = \app\common\model\Enterprise::where("type", $this->user["type"])->column("name", "id");
-        $where = [];
-        $where[] = ["mainId", "=", $id];
-        $where[] = ["isLock", "=", 1];
-        $projectList = \app\common\model\TalentAllowanceProject::where($where)->select()->toArray();
-        $detailList = \app\common\model\TalentAllowancecontractDetail::where("mainId", $id)->select()->toArray();
-
-        foreach ($detailList as &$detail) {
-            $detail["enterpriseName"] = $enterpriseMap[$detail["enterpriseId"]];
-        }unset($detail);
-        foreach ($projectList as &$project) {
-            $detail = $detailMap[$project["baseId"]];
-            $project["projectName"] = sprintf("%s(%s)", AllowanceProjectEnum::getProjectName($project["project"]), $enterpriseMap[$project["enterpriseId"]]);
-        }unset($project);
 
         $where = [];
         $where[] = ["type", "=", $info["type"]];
-        $where[] = ["project", "=", \app\common\state\ProjectState::JBT];
+        $where[] = ["project", "=", ProjectState::HOUSE];
         $where[] = ["active", "=", 1];
-        $where[] = ["isConditionFile", "=", $info["allowanceType"]];
         $where[] = ["delete", "=", 0];
         $filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
         $res["files"] = $filetypes;
-        $res["projects"] = $projectList;
-        $res["concats"] = $detailList;
-        $res["info"] = $info;
+        $res["obj"] = $info;
         return new Response(Response::SUCCESS, "", $res);
     }
 
@@ -1424,7 +1317,7 @@ class House extends AdminController {
         if (!$data["id"]) {
             return new Response(Response::ERROR, "系统错误，请联系管理员");
         }
-        TaModel::update($data);
+        houseModel::update($data);
         return new Response(Response::SUCCESS, "修改成功");
     }
 
@@ -1697,4 +1590,119 @@ class House extends AdminController {
         }
     }
 
+    /**
+     * @param old
+     * @param type          1-复核阶段，不生成享受人的剩余享受金额记录，2-公示再审核阶段，生成享受记录
+     * @description 计算购房补贴金额
+     * */
+    private function calculate($old, $type) {
+        $count = $old["type"] == 1 ? 5 : 3;            //最大申报数
+        /*         * 1、查询申报人和配偶的房产信息 */
+        $houseInfo = HouseApi::getHouseInfo($old["idCard"]);
+        $spouseHouseInfo = HouseApi::getHouseInfo($old["spouseIdCard"]);
+        if (!$houseInfo) {
+            $houseInfo = [
+                "idCard"=>$old["idCard"],
+                =>null,
+                "houseAddress"=>$old["houseAddress"],
+                "houseArea"=>$old["houseArea"],
+                "houseMoney"=>$old["houseMoney"],
+                "recordTime"=>$old["recordTime"],
+                "realEstateNo"=>$old["realEstateNo"],
+                "recordNo"=>$old["recordNo"],
+                =>$old["houseMoney"],
+                =>0,
+                =>0
+            ];
+            old . getRecordNo(), old . getHouseMoney(), 0, BigDecimal . ZERO
+            houseInfo = new HousepurchaseHouseInfo(old . getIdCard(), null, old . getHouseAddress(), old . getHouseArea(), old . getHouseMoney(), old . getRecordTime(), old . getRealEstateNo(), old . getRecordNo(), old . getHouseMoney(), 0, BigDecimal . ZERO);
+        }
+        //判断是否超过五次申报
+        if ($houseInfo["count"] >= $count) {
+            return new Response(Response::ERROR, "申报人已享受五次购房补贴，无法再次享受");
+        }
+        if (BigDecimal . ZERO . compareTo(houseInfo . getBalanceMoney()) >= 0) {
+            return new ResponseObj(ResponseObj . FAILD, "申报房产可享受余额不足，无法享受");
+        }
+        /*         * 2.查询购房补贴费用标准,根据人才层次计算可享受金额 */
+        AmountStandard amountStandard = amountStandardService.selectOne(new EntityWrapper<AmountStandard>().eq("type", ShiroKit.getUser().getType()).eq("allowanceType", 3).eq("talentArrange", old.getTalentArrange()));
+        if (amountStandard == null)
+            return new ResponseObj(ResponseObj . FAILD, "系统暂未设置该人才层次的购房补贴享受金额，请设置后再提交");
+        if (old . getType() == 1) {
+            housepurchase . setTalentArrangeMoney(new BigDecimal(0.2) . multiply(amountStandard . getMoney()) . setScale(2, BigDecimal . ROUND_HALF_UP));
+        } else {
+            Dict dic = this . dictService . findByParentCodeAndCode(DictConst . UN_HOUSEPURCHASE_PERCENTAGE_IC, String . valueOf(houseInfo . getCount() + 1));
+            housepurchase . setTalentArrangeMoney(new BigDecimal(dic . getName()) . multiply(amountStandard . getMoney()) . setScale(2, BigDecimal . ROUND_HALF_UP));
+        }
+        /*         * 3.计算当年度录入享受其他政策的金额 */
+        List<HousepurchaseEnjoyOther> otherList = this.housepurchaseEnjoyOtherService.selectList(new EntityWrapper<HousepurchaseEnjoyOther>().eq("pId", old.getId()));
+        if (otherList == null || otherList . size() == 0) {
+            housepurchase . setNowOtherMoney(BigDecimal . ZERO);
+        } else {
+            for (HousepurchaseEnjoyOther other : otherList) {
+                housepurchase . setNowOtherMoney(housepurchase . getNowOtherMoney() == null ? other . getMoney() : housepurchase . getNowOtherMoney() . add(other . getMoney()));
+            }
+        }
+        housepurchase . setLastOtherMoney(spouseHouseInfo != null ? houseInfo . getLastYearArrears() . add(spouseHouseInfo . getLastYearArrears()) . setScale(2, BigDecimal . ROUND_HALF_UP) : houseInfo . getLastYearArrears());
+        BigDecimal totalOtherMoney = housepurchase . getNowOtherMoney() . add(housepurchase . getLastOtherMoney()) . setScale(2, BigDecimal . ROUND_HALF_UP);
+        /*         * 计算当前人才层次可享受金额 */
+        BigDecimal banaleMoney = amountStandard . getMoney() . subtract(houseInfo . getHouseMoney() . subtract(houseInfo . getBalanceMoney())) . setScale(2, BigDecimal . ROUND_HALF_UP);
+        /*         * 判断余额 */
+        banaleMoney = banaleMoney . compareTo(houseInfo . getBalanceMoney()) >= 0 ? houseInfo . getBalanceMoney() : banaleMoney;
+        if (BigDecimal . ZERO . compareTo(banaleMoney) >= 0) {
+            descideDesc . append("可享受余额为：" + banaleMoney + "元;");
+            /*             * 判断享受其他政策是否大于0 */
+            if (BigDecimal . ZERO . compareTo(totalOtherMoney) < 0) {
+                housepurchase . setIsRecover(1);
+                descideDesc . append("需要追讨金额为：" + totalOtherMoney + "元;");
+            }
+            housepurchase . setShouldEnjoyMoney(BigDecimal . ZERO);
+            housepurchase . setRealEnjoyMoney(BigDecimal . ZERO);
+            housepurchase . setNowSubOtherMoney(BigDecimal . ZERO);
+            housepurchase . setNowNotSubOtherMoney(totalOtherMoney);
+        } else {
+            /*             * 比较余额和人才层次金额的20% */
+            int tmpInt = banaleMoney . compareTo(housepurchase . getTalentArrangeMoney());
+            housepurchase . setShouldEnjoyMoney(tmpInt >= 0 ? housepurchase . getTalentArrangeMoney() : banaleMoney);
+            /*             * 计算可享受金额 */
+            BigDecimal realEnjoyMoney = housepurchase . getShouldEnjoyMoney() . subtract(totalOtherMoney);
+            if (BigDecimal . ZERO . compareTo(realEnjoyMoney) == 0) {
+                housepurchase . setRealEnjoyMoney(realEnjoyMoney);
+                housepurchase . setNowSubOtherMoney(totalOtherMoney);
+                housepurchase . setNowNotSubOtherMoney(realEnjoyMoney);
+                /*                 * 扣除个人剩余金额  ，扣除房产享受金额 ，删除申报人为扣除其他政策记录（因为本次已扣完） */
+            } else if (BigDecimal . ZERO . compareTo(realEnjoyMoney) < 0) {
+                housepurchase . setRealEnjoyMoney(realEnjoyMoney);
+                housepurchase . setNowSubOtherMoney(totalOtherMoney);
+                housepurchase . setNowNotSubOtherMoney(BigDecimal . ZERO);
+                /*                 * 扣除个人剩余金额  ，扣除房产享受金额 ，删除申报人为扣除其他政策记录（因为本次已扣完） */
+            } else if (BigDecimal . ZERO . compareTo(realEnjoyMoney) > 0) {
+                housepurchase . setIsRecover(1);
+                descideDesc . append("需要追讨金额为：" + realEnjoyMoney . abs() + "元;");
+                housepurchase . setRealEnjoyMoney(BigDecimal . ZERO);
+                housepurchase . setNowSubOtherMoney(housepurchase . getShouldEnjoyMoney());
+                housepurchase . setNowNotSubOtherMoney(realEnjoyMoney . abs());
+                /*                 * 扣除个人剩余金额  ，扣除房产享受金额 ，删除申报人为扣除其他政策记录并生成新的未扣除记录 */
+            }
+            if (type == 2) {
+                houseInfo . setCount(houseInfo . getCount() + 1);
+                houseInfo . setBalanceMoney(houseInfo . getBalanceMoney() . subtract(housepurchase . getShouldEnjoyMoney()) . setScale(2, BigDecimal . ROUND_HALF_UP));
+                houseInfo . setLastYearArrears(housepurchase . getNowSubOtherMoney());
+                if (FengStringUtil . isNotEmpAndNull(housepurchase . getSpouseIdcard())) {
+                    if (spouseHouseInfo == null) {
+                        spouseHouseInfo = new HousepurchaseHouseInfo(old . getSpouseIdcard(), null, old . getHouseAddress(), old . getHouseArea(), old . getHouseMoney(), old . getRecordTime(), old . getRealEstateNo(), old . getRecordNo(), houseInfo . getBalanceMoney(), houseInfo . getCount(), houseInfo . getLastYearArrears());
+                    } else {
+                        spouseHouseInfo . setCount(spouseHouseInfo . getCount() + 1);
+                        spouseHouseInfo . setLastYearArrears(houseInfo . getLastYearArrears());
+                        spouseHouseInfo . setBalanceMoney(spouseHouseInfo . getBalanceMoney() . subtract(housepurchase . getShouldEnjoyMoney()));
+                    }
+                    this . housepurchaseHouseInfoService . insertOrUpdate(houseInfo);
+                }
+                this . housepurchaseHouseInfoService . insertOrUpdate(houseInfo);
+            }
+        }
+        housepurchase . setDecideDetail(descideDesc . toString());
+        return new Response(Response::SUCCESS, "", $housepurchase);
+    }
+
 }

app/common/api/HouseApi.php

@@ -7,6 +7,10 @@ use think\facade\Db;
 use app\common\model\HousePurchase as houseModel;
 use app\common\model\HousePurchaseChildren as houseChildModel;
 use app\common\model\HousePurchaseHouseInfo as houseInfoModel;
+use app\common\model\HousePurchaseEnjoyOther as enjoyOtherModel;
+use app\common\model\HousePurchaseOtherHouse as otherHouseModel;
+use app\common\model\HousePurchaseSpouse as spouseModel;
+use app\common\state\HouseStateEnum;
 
 /**
  * Description of HouseApi
@@ -19,6 +23,16 @@ class HouseApi {
         return houseModel::findOrEmpty($id)->toArray();
     }
 
+    public static function getEnjoyTimesByIdCard($idCard) {
+        $where = [];
+        $where[] = ["declareType", "=", 1];
+        $where[] = ["publicState", "=", 4];
+        $where[] = ["cashType", "=", 1];
+        $where[] = ["cashIdCards", "like", "%" . $idCard . "%"];
+        $count = houseModel::where($where)->order("year desc")->count();
+        return $count;
+    }
+
     public static function getHouseInfo($idCard) {
         if (\StrUtil::isEmpOrNull($idCard)) {
             return null;
@@ -28,6 +42,12 @@ class HouseApi {
         return houseInfoModel::where($where)->find();
     }
 
+    public static function getSpouse($id) {
+        $where = [];
+        $where[] = ["pId", "=", $id];
+        return spouseModel::where($where)->select()->toArray();
+    }
+
     public static function getChildren($id) {
         $where = [];
         $where[] = ["pId", "=", $id];
@@ -38,6 +58,114 @@ class HouseApi {
         return houseChildModel::where($where)->find($id);
     }
 
+    public static function getHistoryEnjoyOtherList($id, $idCard, $spouseIdcard = null) {
+        $where = [];
+        $idCards = [];
+        $idCards[] = $idCard;
+        if (\StrUtil::isNotEmpAndNull($spouseIdcard)) {
+            $idCards[] = $spouseIdcard;
+        }
+        $where[] = ["cashType", "=", 1];
+        $where[] = ["checkState", "=", HouseStateEnum::REVIEW_PASS];
+        $where[] = ["publicState", "=", 3];
+        $where[] = ["id", "<>", $id];
+        $whereRaw = sprintf("idCard in ('%s') or spouseIdcard in ('%s')", implode("','", $idCards), implode("','", $idCards));
+        $ids = houseModel::field("id")->where($where)->whereRaw($whereRaw)->column("id");
+        $historyOtherList = null;
+        if ($ids) {
+            $where = [];
+            $where[] = ["pId", "in", $ids];
+            $historyOtherList = enjoyOtherModel::where($where)->select()->toArray();
+        }
+        return $historyOtherList;
+    }
+
+    public static function getEnjoyOtherList($id) {
+        $where = [];
+        $where[] = ["pId", "=", $id];
+        return enjoyOtherModel::where($where)->select()->toArray();
+    }
+
+    public static function getOtherHouseList($id, $type = 1) {
+        $where = [];
+        $where[] = ["pId", "=", $id];
+        $where[] = ["type", "=", $type];
+        return otherHouseModel::where($where)->select()->toArray();
+    }
+
+    /**
+     * 部门审核列表
+     * @param type $query
+     * @param type $company
+     * @param type $type
+     * @param type $offset
+     * @param type $limit
+     */
+    public static function selectForHousePurchase($query, $company, $type, $offset, $limit) {
+        $where = [];
+        if ($company["name"] != "super" && $company["code"] != "rsj") {
+            $where[] = ["t1.companyId", "=", $company["id"]];
+        }
+        if (($company["name"] == "super" || $company["code"] == "rsj") && \StrUtil::isNotEmpAndNull($query["companyName"])) {
+            $where[] = ["t3.name", "like", "%" . $query["companyName"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["year"])) {
+            $where[] = ["t2.year", "=", $query["year"]];
+        }
+        if (\StrUtil::isEmpOrNull($query["name"])) {
+            $where[] = ["t2.name", "like", "%" . $query["name"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["idCard"])) {
+            $where[] = ["t2.idCard", "like", "%" . $query["idCard"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["spouseName"])) {
+            $where[] = ["t2.spouseName", "like", "%" . $query["spouseName"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["spouseIdcard"])) {
+            $where[] = ["t2.spouseIdcard", "like", "%" . $query["spouseIdcard"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["childName"])) {
+            $where[] = ["t2.childName", "like", "%" . $query["childName"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["childIdCard"])) {
+            $where[] = ["t2.childIdCard", "like", "%" . $query["childIdCard"] . "%"];
+        }
+        if (\StrUtil::isEmpOrNull($query["talentArrange"])) {
+            $where[] = ["t2.talentArrange", "=", $query["talentArrange"]];
+        }
+        if (\StrUtil::isEmpOrNull($query["marryStatus"])) {
+            $where[] = ["t2.marryStatus", "=", $query["marryStatus"]];
+        }
+        if (\StrUtil::isEmpOrNull($query["state"])) {
+            $where[] = ["t1.state", "=", $query["state"]];
+        }
+        if (\StrUtil::isEmpOrNull($query["isConflict"])) {
+            $where[] = ["t2.isConflict", "=", $query["isConflict"]];
+        }
+        if (\StrUtil::isEmpOrNull($query["isRecover"])) {
+            $where[] = ["t2.isRecover", "=", $query["isRecover"]];
+        }
+        $where[] = ["t1.type", "=", $type];
+        $where[] = ["t2.type", "=", $query["type"]];
+        $count = Db::table("un_talent_depcheckstate")->alias("t1")
+                ->leftJoin("un_housepurchase t2", "t2.id=t1.mainId")
+                ->leftJoin("sys_company t3", "t3.id=t1.companyId")
+                ->where($where)
+                ->count();
+
+        $list = Db::table("un_talent_depcheckstate")->alias("t1")
+                        ->field("t2.*,t1.companyId,t1.state,t3.`name` AS companyName,t5.description AS checkMsg,")
+                        ->leftJoin("un_housepurchase t2", "t2.id=t1.mainId")
+                        ->leftJoin("sys_company t3", "t3.id=t1.companyId")
+                        ->leftJoin("(SELECT t4.mainId,t4.createTime,t4.companyId,t4.description FROM (SELECT * FROM un_talent_checklog WHERE type = #{type} AND step = 2 AND state != 8 ORDER BY createTime DESC LIMIT 100000) t4 GROUP BY t4.mainId,t4.companyId ORDER BY t4.createTime DESC) t5", "t1.mainId = t5.mainId AND t1.companyId = t5.companyId")
+                        ->where($where)
+                        ->limit($offset, $limit)
+                        ->order("t1.createTime DESC")
+                        ->select()->toArray();
+
+        return ["total" => $count, "rows" => $list];
+    }
+
     public static function deleteById($id) {
         $data["id"] = $id;
         $data["delete"] = 1;

app/common/api/TalentLogApi.php

@@ -121,12 +121,15 @@ class TalentLogApi {
         return $list;
     }
 
-    public static function getLastLogByStep($id, $type, $step, $active = 2) {
+    public static function getLastLogByStep($id, $type, $step, $active = 2, $companyId = null) {
         $where = [];
         $where[] = ["mainId", "=", $id];
         $where[] = ["type", "=", $type];
         $where[] = ["active", "=", $active];
         $where[] = ["step", "=", $step];
+        if ($companyId) {
+            $where[] = ["companyId", "=", $companyId];
+        }
         $last = TalentLog::where($where)->order("createTime desc")->find();
         return $last;
     }

app/common/model/HousePurchaseEnjoyOther.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\model;
+
+/**
+ * Description of HousePurchaseEnjoyOther
+ *
+ * @author sgq
+ */
+class HousePurchaseEnjoyOther extends model {
+
+    protected $table = "un_housepurchase_enjoy_other";
+
+}

app/common/model/HousePurchaseOtherHouse.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\model;
+
+/**
+ * Description of HousePurchaseOtherHouse
+ *
+ * @author sgq
+ */
+class HousePurchaseOtherHouse extends model {
+
+    protected $table = "un_housepurchase_other_house";
+
+}

app/common/model/HousePurchaseSpouse.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\model;
+
+use think\model;
+
+/**
+ * Description of HousePurchaseSpouse
+ *
+ * @author sgq
+ */
+class HousePurchaseSpouse extends model {
+
+    protected $table = "un_housepurchase_spouse";
+
+}

public/static/modular/house/housepurchase/housepurchase_info.js

@@ -17,7 +17,7 @@ HousepurchaseInfoDlg.close = function () {
  */
 HousepurchaseInfoDlg.showFirstCheckModal = function () {
     var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
         if (data.code == 200) {
             layer.open({
                 type: 1,
@@ -47,13 +47,15 @@ HousepurchaseInfoDlg.showFirstCheckModal = function () {
                         $("#field_info input").each(function () {
                             var arr = obj.fields.split(",");
                             for (var key in arr) {
-                                if ($(this).val() == arr[key]) this.checked = true;
+                                if ($(this).val() == arr[key])
+                                    this.checked = true;
                             }
                         });
                     }
                     if (Feng.isNotEmptyStr(obj.files)) {
                         $("#field_file input").each(function () {
-                            if (obj.files.indexOf($(this).val()) != -1) this.checked = true;
+                            if (obj.files.indexOf($(this).val()) != -1)
+                                this.checked = true;
                         });
                     }
                 },
@@ -83,9 +85,10 @@ HousepurchaseInfoDlg.showFirstCheckModal = function () {
                         Feng.info("请选择可修改的字段或附件！");
                         return;
                     }
-                    if (locked) return;
+                    if (locked)
+                        return;
                     locked = true;
-                    var ajax = new $ax(Feng.ctxPath + "/housepurchase/check", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/house/check", function (data) {
                         if (data.code == 200) {
                             layer.close(index);
                             Feng.success(data.msg);
@@ -119,7 +122,7 @@ HousepurchaseInfoDlg.showFirstCheckModal = function () {
  */
 HousepurchaseInfoDlg.showDepCheckModal = function () {
     var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
         if (data.code == 200) {
             var company = data.obj.company;
             var obj = data.obj.obj;
@@ -132,20 +135,23 @@ HousepurchaseInfoDlg.showDepCheckModal = function () {
                 shade: 0,
                 maxmin: true,
                 content:
-                    "<form id=\"depForm\" class=\"form-horizontal\">\n" +
-                    '<div class="form-group" style="margin: 10px;">\n' +
-                    '<label for="checkMsg" class="control-label" >核查结果备注</label>\n' +
-                    '<textarea class="form-control" id="hcMsg" placeholder="" rows="6"></textarea>\n' +
-                    "</div>\n" +
-                    "</form>",
+                        "<form id=\"depForm\" class=\"form-horizontal\">\n" +
+                        '<div class="form-group" style="margin: 10px;">\n' +
+                        '<label for="checkMsg" class="control-label" >核查结果备注</label>\n' +
+                        '<textarea class="form-control" id="hcMsg" placeholder="" rows="6"></textarea>\n' +
+                        "</div>\n" +
+                        "</form>",
                 btn: ['<i class="fa fa-save"></i>&nbsp;&nbsp;提交', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
                 btnAlign: 'c',
                 zIndex: layer.zIndex,
                 success: function (layero, index) {
                     layer.setTop(layero);
-                    if (company.code = CONFIG.COM_ZJJ) $("#hcMsg").val(obj.zjjCheckDetail);
-                    if (company.code = CONFIG.COM_ZRZYJ) $("#hcMsg").val(obj.zrzzjCheckDetail);
-                    if (company.code = CONFIG.COM_MZJ) $("#hcMsg").val(obj.mzjCheckDetail);
+                    if (company.code = CONFIG.COM_ZJJ)
+                        $("#hcMsg").val(obj.zjjCheckDetail);
+                    if (company.code = CONFIG.COM_ZRZYJ)
+                        $("#hcMsg").val(obj.zrzzjCheckDetail);
+                    if (company.code = CONFIG.COM_MZJ)
+                        $("#hcMsg").val(obj.mzjCheckDetail);
                 },
                 yes: function (index, layero) {
                     var msg = $("#hcMsg").val();
@@ -153,7 +159,7 @@ HousepurchaseInfoDlg.showDepCheckModal = function () {
                         Feng.info("请填写核查结果!");
                         return;
                     }
-                    var ajax = new $ax(Feng.ctxPath + "/housepurchase/depCheck", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/house/depCheck", function (data) {
                         if (data.code == 200) {
                             layer.close(index);
                             Feng.success(data.msg);
@@ -182,7 +188,7 @@ HousepurchaseInfoDlg.showDepCheckModal = function () {
  */
 HousepurchaseInfoDlg.showThirdCheckModal = function () {
     var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
         if (data.code == 200) {
             layer.open({
                 type: 1,
@@ -198,7 +204,7 @@ HousepurchaseInfoDlg.showThirdCheckModal = function () {
                 zIndex: layer.zIndex,
                 success: function (layero, index) {
                     layer.setTop(layero);
-                    $('#toDep').chosen({width: '100%',placeholder_text_multiple: '请选择兑现对象'});
+                    $('#toDep').chosen({width: '100%', placeholder_text_multiple: '请选择兑现对象'});
                     $("#checkStateFirstModal").val(data.obj.obj.checkState);
                     $("#checkMsgFirst").val(data.obj.obj.checkMsg);
                     $("#toProcess").val(data.obj.obj.toProcess);
@@ -244,7 +250,7 @@ HousepurchaseInfoDlg.showThirdCheckModal = function () {
                     }
                     companyCodes = companyCodes.substring(0, companyCodes.length - 1);
                     cashObjs = cashObjs.substring(0, cashObjs.length - 1);
-                    var ajax = new $ax(Feng.ctxPath + "/housepurchase/check", function (data) {
+                    var ajax = new $ax(Feng.ctxPath + "/admin/house/check", function (data) {
                         if (data.code == 200) {
                             layer.close(index);
                             Feng.success(data.msg);
@@ -290,7 +296,7 @@ HousepurchaseInfoDlg.saveDepDataAtAfter = function () {
  */
 HousepurchaseInfoDlg.showAfterCheckModal = function () {
     var process = $("#process").val();
-    var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
         if (data.code == 200) {
             layer.open({
                 type: 1,
@@ -340,7 +346,7 @@ HousepurchaseInfoDlg.showAfterCheckModal = function () {
                     var cashObjs = "";
                     cashObjs = cashObjs.substring(0, cashObjs.length - 1);
                     var operation = function () {
-                        var ajax = new $ax(Feng.ctxPath + "/housepurchase/afterCheck", function (data) {
+                        var ajax = new $ax(Feng.ctxPath + "/admin/house/afterCheck", function (data) {
                             if (data.code == 200) {
                                 Feng.success(data.msg);
                                 layer.close(index);
@@ -380,7 +386,7 @@ HousepurchaseInfoDlg.showAfterCheckModal = function () {
  */
 HousepurchaseInfoDlg.submitCheck = function () {
     var operation = function () {
-        var ajax = new $ax(Feng.ctxPath + "/housepurchase/submitCheck", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/admin/house/submitCheck", function (data) {
             if (data.code == 200) {
                 Feng.success(data.msg);
                 window.parent.Housepurchase.table.refresh();
@@ -400,51 +406,51 @@ HousepurchaseInfoDlg.submitCheck = function () {
 HousepurchaseInfoDlg.createFirstCheckHtml = function () {
     var declareType = $("#declareType").val();
     var field =
-        // '<li style="width:10%"><input type="checkbox" value="phone"/><span>手机号码</span></li>\n' +
-        '<li style="width:10%"><input type="checkbox" value="marryStatus"/><span>婚姻状态</span></li>\n' +
-        '<li style="width:10%"><input type="checkbox" value="spouseName"/><span>配偶姓名</span></li>\n' +
-        '<li style="width:20.5%"><input type="checkbox" value="spouseCardType"/><span>配偶证件类型</span></li>\n' +
-        '<li style="width:20.5%"><input type="checkbox" value="spouseIdcard"/><span>配偶证件号码</span></li>\n'+
-        '<li style="width:20.5%"><input type="checkbox" value="spouseIsLibrary"/><span>配偶是否在库人才</span></li>\n';
+            // '<li style="width:10%"><input type="checkbox" value="phone"/><span>手机号码</span></li>\n' +
+            '<li style="width:10%"><input type="checkbox" value="marryStatus"/><span>婚姻状态</span></li>\n' +
+            '<li style="width:10%"><input type="checkbox" value="spouseName"/><span>配偶姓名</span></li>\n' +
+            '<li style="width:20.5%"><input type="checkbox" value="spouseCardType"/><span>配偶证件类型</span></li>\n' +
+            '<li style="width:20.5%"><input type="checkbox" value="spouseIdcard"/><span>配偶证件号码</span></li>\n' +
+            '<li style="width:20.5%"><input type="checkbox" value="spouseIsLibrary"/><span>配偶是否在库人才</span></li>\n';
     if (declareType == 1) {
         field = field +
-            '<li style="width:20.5%"><input type="checkbox" value="realEstateNo"/><span>不动产权证编号</span></li>\n' +
-            '<li style="width:20.5%"><input type="checkbox" value="recordNo"/><span>备案合同编号</span></li>\n' +
-            '<li style="width:20.5%"><input type="checkbox" value="houseAddress"/><span>房屋坐落地址</span></li>\n' +
-            '<li style="width:20.5%"><input type="checkbox" value="houseArea"/><span>房屋建筑面积</span></li>\n' +
-            '<li style="width:63%"><input type="checkbox" value="recordTime"/><span>商品房购房合同备案时间/不动产权证书办理时间</span></li>\n' +
-            '<li style="width:20.5%"><input type="checkbox" value="houseMoney"/><span>房屋成交金额</span></li>\n' +
-            '<li style="width:20.5%"><input type="checkbox" value="isEnjoyOther"/><span>是否享受我市其他政策</span></li>\n';
+                '<li style="width:20.5%"><input type="checkbox" value="realEstateNo"/><span>不动产权证编号</span></li>\n' +
+                '<li style="width:20.5%"><input type="checkbox" value="recordNo"/><span>备案合同编号</span></li>\n' +
+                '<li style="width:20.5%"><input type="checkbox" value="houseAddress"/><span>房屋坐落地址</span></li>\n' +
+                '<li style="width:20.5%"><input type="checkbox" value="houseArea"/><span>房屋建筑面积</span></li>\n' +
+                '<li style="width:63%"><input type="checkbox" value="recordTime"/><span>商品房购房合同备案时间/不动产权证书办理时间</span></li>\n' +
+                '<li style="width:20.5%"><input type="checkbox" value="houseMoney"/><span>房屋成交金额</span></li>\n' +
+                '<li style="width:20.5%"><input type="checkbox" value="isEnjoyOther"/><span>是否享受我市其他政策</span></li>\n';
     }
     return '<form id="checkForm">\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkState" class="control-label">审核状态</label>\n' +
-        '                        <select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.toggleField()">\n' +
-        '                            <option value="">请选择</option>\n' +
-        '                            <option value="3">审核通过</option>\n' +
-        '                            <option value="2">审核驳回</option>\n' +
-        '                        </select>\n' +
-        '                    </div>\n' +
-        '                    <div class="form-group" style="margin: 10px;">\n' +
-        '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
-        '                        <textarea class="form-control" id="checkMsgFirst" placeholder="" rows="6"></textarea>\n' +
-        '                        <div id="field" style="padding-top: 5px;display: none">\n' +
-        '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
-        '                            <div id="field_info">\n' +
-        '                                <ul>\n' +
-        field +
-        '                                </ul>\n' +
-        '                            </div>\n' +
-        '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
-        '                            <div id="field_file">\n' +
-        '                            </div>\n' +
-        '                            <div class="form-group" style="text-align: center">\n' +
-        '                                <button type="button" class="btn btn-primary" onclick="Feng.checkAll(\'field\')">全选</button>\n' +
-        '                                <button type="button" class="btn btn-success" onclick="Feng.unCheckAll(\'field\')">反选</button>\n' +
-        '                            </div>\n' +
-        '                        </div>\n' +
-        '                    </div>\n' +
-        '                </form>';
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <label for="checkState" class="control-label">审核状态</label>\n' +
+            '                        <select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.toggleField()">\n' +
+            '                            <option value="">请选择</option>\n' +
+            '                            <option value="3">审核通过</option>\n' +
+            '                            <option value="2">审核驳回</option>\n' +
+            '                        </select>\n' +
+            '                    </div>\n' +
+            '                    <div class="form-group" style="margin: 10px;">\n' +
+            '                        <label for="checkMsg" class="control-label" >审核意见</label>\n' +
+            '                        <textarea class="form-control" id="checkMsgFirst" placeholder="" rows="6"></textarea>\n' +
+            '                        <div id="field" style="padding-top: 5px;display: none">\n' +
+            '                            <label for="checkMsg" class="control-label">可修改字段</label>\n' +
+            '                            <div id="field_info">\n' +
+            '                                <ul>\n' +
+            field +
+            '                                </ul>\n' +
+            '                            </div>\n' +
+            '                            <label for="checkMsg" class="control-label">可修改附件</label>\n' +
+            '                            <div id="field_file">\n' +
+            '                            </div>\n' +
+            '                            <div class="form-group" style="text-align: center">\n' +
+            '                                <button type="button" class="btn btn-primary" onclick="Feng.checkAll(\'field\')">全选</button>\n' +
+            '                                <button type="button" class="btn btn-success" onclick="Feng.unCheckAll(\'field\')">反选</button>\n' +
+            '                            </div>\n' +
+            '                        </div>\n' +
+            '                    </div>\n' +
+            '                </form>';
 }
 
 /**
@@ -460,35 +466,35 @@ HousepurchaseInfoDlg.createAfterCheckHtml = function () {
         options = options + "<option value='" + spouseIdcard + "'>" + spouseName + "</option>";
     }
     return '<form id="checkForm">\n' +
-        '<div class="form-group" style="margin: 10px;">\n' +
-        '<label for="checkState" class="control-label">审核状态</label>\n' +
-        '<select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.afterToggleField(this)">\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="3">审核通过</option>\n' +
-        '<option value="-1">审核不通过</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="margin: 10px;">\n' +
-        '<label for="checkMsg" class="control-label" >审核意见</label>\n' +
-        '<textarea class="form-control" id="checkMsgFirst" placeholder="" rows="4"></textarea>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="margin: 10px;" >\n' +
-        '<label for="processLable" class=" control-label">兑现状态</label>\n' +
-        '<select class="form-control" id="cashType" onchange="HousepurchaseInfoDlg.afterCashTypeChange()">\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="1">兑现</option>\n' +
-        '<option value="2">不予兑现</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="display: none;margin: 10px;" id="descideDesc">\n' +
-        '<label for="processLable" class=" control-label">计算说明</label>\n' +
-        '<textarea class="form-control" id="decideMoneyDetail" rows="4"></textarea>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="display: none;margin: 10px;" id="moneyDiv">\n' +
-        '<label for="processLable" class=" control-label">应该享受金额(不扣除其他政策金额前)</label>\n' +
-        '<input class="form-control" id="shouldEnjoyMoney">\n' +
-        '</div>\n' +
-        '</form>';
+            '<div class="form-group" style="margin: 10px;">\n' +
+            '<label for="checkState" class="control-label">审核状态</label>\n' +
+            '<select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.afterToggleField(this)">\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="3">审核通过</option>\n' +
+            '<option value="-1">审核不通过</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="margin: 10px;">\n' +
+            '<label for="checkMsg" class="control-label" >审核意见</label>\n' +
+            '<textarea class="form-control" id="checkMsgFirst" placeholder="" rows="4"></textarea>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="margin: 10px;" >\n' +
+            '<label for="processLable" class=" control-label">兑现状态</label>\n' +
+            '<select class="form-control" id="cashType" onchange="HousepurchaseInfoDlg.afterCashTypeChange()">\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="1">兑现</option>\n' +
+            '<option value="2">不予兑现</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="display: none;margin: 10px;" id="descideDesc">\n' +
+            '<label for="processLable" class=" control-label">计算说明</label>\n' +
+            '<textarea class="form-control" id="decideMoneyDetail" rows="4"></textarea>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="display: none;margin: 10px;" id="moneyDiv">\n' +
+            '<label for="processLable" class=" control-label">应该享受金额(不扣除其他政策金额前)</label>\n' +
+            '<input class="form-control" id="shouldEnjoyMoney">\n' +
+            '</div>\n' +
+            '</form>';
 }
 
 HousepurchaseInfoDlg.afterToggleField = function (context) {
@@ -529,45 +535,45 @@ HousepurchaseInfoDlg.createThirdCheckHtml = function () {
         options = options + "<option value='" + spouseIdcard + "'>" + spouseName + "</option>";
     }
     return '<form id="checkForm">\n' +
-        '<div class="form-group" style="margin: 10px;">\n' +
-        '<label for="checkState" class="control-label">审核状态</label>\n' +
-        '<select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.thirdToggleField()">\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="3">审核通过</option>\n' +
-        '<option value="2">审核驳回</option>\n' +
-        '<option value="-1">审核不通过</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="margin: 10px;">\n' +
-        '<label for="checkMsg" class="control-label" >审核意见</label>\n' +
-        '<textarea class="form-control" id="checkMsgFirst" placeholder="" rows="6"></textarea>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="display: none;margin: 10px;" id="cashTypeDiv">\n' +
-        '<label for="processLable" class=" control-label">兑现状态</label>\n' +
-        '<select class="form-control" id="cashType" onchange="HousepurchaseInfoDlg.cashTypeChange()">\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="1">兑现</option>\n' +
-        '<option value="2">不予兑现</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="display: none;margin: 10px;" id="toProcessDiv" >\n' +
-        '<label for="processLable" class=" control-label">驳回至</label>\n' +
-        '<select class="form-control" id="toProcess" >\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="1">初级审核</option>\n' +
-        '<option value="2">部门审核</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '<div class="form-group" style="display: none;margin: 10px;" id="toDepDiv" >\n' +
-        '<label for="processLable" class=" control-label">驳回单位</label>\n' +
-        '<select class="form-control" id="toDep" multiple>\n' +
-        '<option value="">请选择</option>\n' +
-        '<option value="' + CONFIG.COM_MZJ + '">民政局</option>\n' +
-        '<option value="' + CONFIG.COM_ZRZYJ + '">自然资源局</option>\n' +
-        '<option value="' + CONFIG.COM_ZJJ + '">住建局</option>\n' +
-        '</select>\n' +
-        '</div>\n' +
-        '</form>';
+            '<div class="form-group" style="margin: 10px;">\n' +
+            '<label for="checkState" class="control-label">审核状态</label>\n' +
+            '<select class="form-control" id="checkStateFirstModal" onchange="HousepurchaseInfoDlg.thirdToggleField()">\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="3">审核通过</option>\n' +
+            '<option value="2">审核驳回</option>\n' +
+            '<option value="-1">审核不通过</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="margin: 10px;">\n' +
+            '<label for="checkMsg" class="control-label" >审核意见</label>\n' +
+            '<textarea class="form-control" id="checkMsgFirst" placeholder="" rows="6"></textarea>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="display: none;margin: 10px;" id="cashTypeDiv">\n' +
+            '<label for="processLable" class=" control-label">兑现状态</label>\n' +
+            '<select class="form-control" id="cashType" onchange="HousepurchaseInfoDlg.cashTypeChange()">\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="1">兑现</option>\n' +
+            '<option value="2">不予兑现</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="display: none;margin: 10px;" id="toProcessDiv" >\n' +
+            '<label for="processLable" class=" control-label">驳回至</label>\n' +
+            '<select class="form-control" id="toProcess" >\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="1">初级审核</option>\n' +
+            '<option value="2">部门审核</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '<div class="form-group" style="display: none;margin: 10px;" id="toDepDiv" >\n' +
+            '<label for="processLable" class=" control-label">驳回单位</label>\n' +
+            '<select class="form-control" id="toDep" multiple>\n' +
+            '<option value="">请选择</option>\n' +
+            '<option value="' + CONFIG.COM_MZJ + '">民政局</option>\n' +
+            '<option value="' + CONFIG.COM_ZRZYJ + '">自然资源局</option>\n' +
+            '<option value="' + CONFIG.COM_ZJJ + '">住建局</option>\n' +
+            '</select>\n' +
+            '</div>\n' +
+            '</form>';
 }
 
 
@@ -629,9 +635,9 @@ HousepurchaseInfoDlg.deleteEnjoyOther = function (context) {
         $(context).parent().parent().remove();
     } else {
         var operation = function () {
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
                 if (data.code == 200) {
-                    var ajax1 = new $ax(Feng.ctxPath + "/housepurchase/deleteOtherOrHouse", function (data) {
+                    var ajax1 = new $ax(Feng.ctxPath + "/admin/house/deleteOtherOrHouse", function (data) {
                         if (data.code == 200) {
                             Feng.success(data.msg);
                             $(context).parent().parent().remove();
@@ -668,9 +674,9 @@ HousepurchaseInfoDlg.deleteOtherHouse = function (context) {
         $(context).parent().parent().remove();
     } else {
         var operation = function () {
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
                 if (data.code == 200) {
-                    var ajax1 = new $ax(Feng.ctxPath + "/housepurchase/deleteOtherOrHouse", function (data) {
+                    var ajax1 = new $ax(Feng.ctxPath + "/admin/house/deleteOtherOrHouse", function (data) {
                         if (data.code == 200) {
                             Feng.success(data.msg);
                             $(context).parent().parent().remove();
@@ -706,9 +712,9 @@ HousepurchaseInfoDlg.deleteSpouse = function (context) {
         $(context).parent().parent().remove();
     } else {
         var operation = function () {
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/validateIsCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/validateIsCheck", function (data) {
                 if (data.code == 200) {
-                    var ajax1 = new $ax(Feng.ctxPath + "/housepurchase/deleteSpouse", function (data) {
+                    var ajax1 = new $ax(Feng.ctxPath + "/admin/house/deleteSpouse", function (data) {
                         if (data.code == 200) {
                             Feng.success(data.msg);
                             $(context).parent().parent().remove();
@@ -774,7 +780,7 @@ HousepurchaseInfoDlg.saveDepCheckData = function () {
                 "otherList": enjoyOtherObject,
                 "houseList": otherHouseObject
             };
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/zjjCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/zjjCheck", function (data) {
                 if (data.code == 200) {
                     HousepurchaseInfoDlg.initZzj(data.obj.otherList, data.obj.houseList);
                     Feng.success(data.msg);
@@ -834,7 +840,7 @@ HousepurchaseInfoDlg.saveDepCheckData = function () {
                 "zrzzjCheckDetail": zrzzjCheckDetail,
                 "houseList": otherHouseObject
             };
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/zrzyjCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/zrzyjCheck", function (data) {
                 if (data.code == 200) {
                     HousepurchaseInfoDlg.initZrzyj(data.obj.houseList);
                     Feng.success(data.msg);
@@ -860,7 +866,7 @@ HousepurchaseInfoDlg.saveDepCheckData = function () {
                 var idCard = $(this).find("input[name='idCard']").val();
                 // var description = $(this).find("input[name='description']").val();
                 if (Feng.isNotEmptyStr(id) || Feng.isNotEmptyStr(pId) || Feng.isNotEmptyStr(type) || Feng.isNotEmptyStr(name) ||
-                    Feng.isNotEmptyStr(registerTime) || Feng.isNotEmptyStr(idCard)) {
+                        Feng.isNotEmptyStr(registerTime) || Feng.isNotEmptyStr(idCard)) {
                     if (Feng.isEmptyStr(type)) {
                         error = error + "婚姻状况" + (index + 1) + "登记类型为空;\n";
                     }
@@ -894,7 +900,7 @@ HousepurchaseInfoDlg.saveDepCheckData = function () {
                 "mzjCheckDetail": mzjCheckDetail,
                 "spouseList": spouseObj
             };
-            var ajax = new $ax(Feng.ctxPath + "/housepurchase/mzjCheck", function (data) {
+            var ajax = new $ax(Feng.ctxPath + "/admin/house/mzjCheck", function (data) {
                 if (data.code == 200) {
                     HousepurchaseInfoDlg.initMzj(data.obj.spouseList);
                     Feng.success(data.msg);
@@ -927,7 +933,7 @@ HousepurchaseInfoDlg.getZjjData = function (enjoyOtherObject, otherHouseObject)
         var enjoyTime = $(this).find("input[name='enjoyTime']").val();
         var description = $(this).find("input[name='description']").val();
         if (Feng.isNotEmptyStr(id) || Feng.isNotEmptyStr(pId) || Feng.isNotEmptyStr(name) || Feng.isNotEmptyStr(houseAddress) || Feng.isNotEmptyStr(idCard) ||
-            Feng.isNotEmptyStr(recordNo) || Feng.isNotEmptyStr(enjoyPolicyName) || Feng.isNotEmptyStr(money) || Feng.isNotEmptyStr(enjoyTime)) {
+                Feng.isNotEmptyStr(recordNo) || Feng.isNotEmptyStr(enjoyPolicyName) || Feng.isNotEmptyStr(money) || Feng.isNotEmptyStr(enjoyTime)) {
             if (Feng.isEmptyStr(name)) {
                 error = error + "享受其他政策" + (index + 1) + ")享受人姓名为空;\n";
             }
@@ -984,7 +990,7 @@ HousepurchaseInfoDlg.getZjjData = function (enjoyOtherObject, otherHouseObject)
         var tradeMethod = $(this).find("input[name='tradeMethod']").val();
         var description = $(this).find("input[name='description']").val();
         if (Feng.isNotEmptyStr(id) || Feng.isNotEmptyStr(pId) || Feng.isNotEmptyStr(type) || Feng.isNotEmptyStr(name) || Feng.isNotEmptyStr(number) || Feng.isNotEmptyStr(idCard) ||
-            Feng.isNotEmptyStr(houseAddress) || Feng.isNotEmptyStr(area) || Feng.isNotEmptyStr(recordTime) || Feng.isNotEmptyStr(tradeMethod)) {
+                Feng.isNotEmptyStr(houseAddress) || Feng.isNotEmptyStr(area) || Feng.isNotEmptyStr(recordTime) || Feng.isNotEmptyStr(tradeMethod)) {
             if (Feng.isEmptyStr(name)) {
                 error = error + "其他房产信息" + (index + 1) + "购房人姓名为空;\n";
             }
@@ -1044,7 +1050,7 @@ HousepurchaseInfoDlg.getZrzyjData = function (otherHouseObject) {
         var recordTime = $(this).find("input[name='recordTime']").val();
         var description = $(this).find("input[name='description']").val();
         if (Feng.isNotEmptyStr(id) || Feng.isNotEmptyStr(pId) || Feng.isNotEmptyStr(type) || Feng.isNotEmptyStr(name) || Feng.isNotEmptyStr(idCard) ||
-            Feng.isNotEmptyStr(houseAddress) || Feng.isNotEmptyStr(area) || Feng.isNotEmptyStr(recordTime) || Feng.isNotEmptyStr(number)) {
+                Feng.isNotEmptyStr(houseAddress) || Feng.isNotEmptyStr(area) || Feng.isNotEmptyStr(recordTime) || Feng.isNotEmptyStr(number)) {
             if (Feng.isEmptyStr(name)) {
                 error = error + "房产信息" + (index + 1) + "产权人姓名为空;\n";
             }
@@ -1155,10 +1161,10 @@ HousepurchaseInfoDlg.afterCheckEdit = function () {
         "transferTime": transferTime,
         "zrzzjCheckDetail": zrzzjCheckDetail,
         "zjjHouseList": zjjOtherHouseObject,
-        "zrzyjHouseList":zrzyjOtherHouseObject,
+        "zrzyjHouseList": zrzyjOtherHouseObject,
         "otherList": enjoyOtherObject
     };
-    var ajax = new $ax(Feng.ctxPath + "/housepurchase/afterCheckEdit", function (data) {
+    var ajax = new $ax(Feng.ctxPath + "/admin/house/afterCheckEdit", function (data) {
         if (data.code == 200) {
             HousepurchaseInfoDlg.initZzj(data.obj.otherList, data.obj.zjjOtherHouseObject);
             HousepurchaseInfoDlg.initZrzyj(data.obj.zrzyjOtherHouseObject);
@@ -1180,53 +1186,53 @@ HousepurchaseInfoDlg.initZzj = function (otherList, houseList) {
         var html = "";
         for (var key in otherList) {
             html = html +
-                '<div class="panel panel-default" >\n' +
-                '        <div class="panel-heading">\n' +
-                '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
-                '            <span class="houseTitle" >' + otherList[key].enjoyPolicyName + '</span>\n' +
-                '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteEnjoyOther(this)">\n' +
-                '                <span aria-hidden="true">&times;</span>\n' +
-                '            </button>\n' +
-                '        </div>\n' +
-                '        <div class="panel-body">\n' +
-                '            <div class="col-sm-12">\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <input type="hidden"  name="id" value="' + otherList[key].id + '"/>\n' +
-                '                    <input type="hidden"  name="pId" value="' + otherList[key].pId + '"/>\n' +
-                '                    <label class="control-label spacing">享受人姓名</label>\n' +
-                '                    <input type="text" class="form-control" name="name" value="' + otherList[key].name + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">享受人证件号码</label>\n' +
-                '                    <input type="text" class="form-control" name="idCard" value="' + otherList[key].idCard + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
-                '                    <input type="text" class="form-control" name="houseAddress" value="' + otherList[key].houseAddress + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">合同编号</label>\n' +
-                '                    <input type="text" class="form-control" name="recordNo" value="' + otherList[key].recordNo + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">享受政策名称(例：XX年度第X批XX购房补助)</label>\n' +
-                '                    <input type="text" class="form-control" name="enjoyPolicyName" placeholder="例：XX年度第X批XX购房补助" value="' + otherList[key].enjoyPolicyName + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">补贴发放金额(元)</label>\n' +
-                '                    <input type="text" class="form-control" name="money" value="' + otherList[key].money + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">发放时间</label>\n' +
-                '                    <input type="text" class="form-control date" name="enjoyTime" value="' + otherList[key].enjoyTime + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">备注</label>\n' +
-                '                    <input type="text" class="form-control" name="description" value="' + otherList[key].description + '"/>\n' +
-                '                </div>\n' +
-                '            </div>\n' +
-                '        </div>\n' +
-                '    </div>';
+                    '<div class="panel panel-default" >\n' +
+                    '        <div class="panel-heading">\n' +
+                    '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
+                    '            <span class="houseTitle" >' + otherList[key].enjoyPolicyName + '</span>\n' +
+                    '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteEnjoyOther(this)">\n' +
+                    '                <span aria-hidden="true">&times;</span>\n' +
+                    '            </button>\n' +
+                    '        </div>\n' +
+                    '        <div class="panel-body">\n' +
+                    '            <div class="col-sm-12">\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <input type="hidden"  name="id" value="' + otherList[key].id + '"/>\n' +
+                    '                    <input type="hidden"  name="pId" value="' + otherList[key].pId + '"/>\n' +
+                    '                    <label class="control-label spacing">享受人姓名</label>\n' +
+                    '                    <input type="text" class="form-control" name="name" value="' + otherList[key].name + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">享受人证件号码</label>\n' +
+                    '                    <input type="text" class="form-control" name="idCard" value="' + otherList[key].idCard + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
+                    '                    <input type="text" class="form-control" name="houseAddress" value="' + otherList[key].houseAddress + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">合同编号</label>\n' +
+                    '                    <input type="text" class="form-control" name="recordNo" value="' + otherList[key].recordNo + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">享受政策名称(例：XX年度第X批XX购房补助)</label>\n' +
+                    '                    <input type="text" class="form-control" name="enjoyPolicyName" placeholder="例：XX年度第X批XX购房补助" value="' + otherList[key].enjoyPolicyName + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">补贴发放金额(元)</label>\n' +
+                    '                    <input type="text" class="form-control" name="money" value="' + otherList[key].money + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">发放时间</label>\n' +
+                    '                    <input type="text" class="form-control date" name="enjoyTime" value="' + otherList[key].enjoyTime + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">备注</label>\n' +
+                    '                    <input type="text" class="form-control" name="description" value="' + otherList[key].description + '"/>\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '        </div>\n' +
+                    '    </div>';
         }
         $("#zzjOtherBody .panel-default").not(".history").remove();
         $("#zzjOtherBody").append(html);
@@ -1235,54 +1241,54 @@ HousepurchaseInfoDlg.initZzj = function (otherList, houseList) {
         var html = "";
         for (var key in houseList) {
             html = html +
-                '<div class="panel panel-default">\n' +
-                '        <div class="panel-heading">\n' +
-                '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
-                '            <span class="houseTitle" >' + houseList[key].houseAddress + '</span>\n' +
-                '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteOtherHouse(this)">\n' +
-                '                <span aria-hidden="true">&times;</span>\n' +
-                '            </button>\n' +
-                '        </div>\n' +
-                '        <div class="panel-body">\n' +
-                '            <div class="col-sm-12">\n' +
-                '                <input type="hidden" name="id" value="' + houseList[key].id + '"/>\n' +
-                '                <input type="hidden" name="pId" value="' + houseList[key].pId + '"/>\n' +
-                '                <input type="hidden" name="type" value="' + houseList[key].type + '"/>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">购房人姓名</label>\n' +
-                '                    <input type="text" class="form-control" name="name" value="' + houseList[key].name + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">购房人证件号码</label>\n' +
-                '                    <input type="text" class="form-control" name="idCard" value="' + houseList[key].idCard + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
-                '                    <input type="text" class="form-control" name="houseAddress" value="' + houseList[key].houseAddress + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">合同编号</label>\n' +
-                '                    <input type="text" class="form-control" name="number" value="' + houseList[key].number + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">面积(m2)</label>\n' +
-                '                    <input type="text" class="form-control" name="area" value="' + houseList[key].area + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">交易备案时间</label>\n' +
-                '                    <input type="text" class="form-control date" name="recordTime" value="' + houseList[key].recordTime + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">交易方式(购买、出售、签约注销、备案注销等)</label>\n' +
-                '                    <input type="text" class="form-control" name="tradeMethod" value="' + houseList[key].tradeMethod + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">备注</label>\n' +
-                '                    <input type="text" class="form-control" name="description" value="' + houseList[key].description + '"/>\n' +
-                '                </div>\n' +
-                '            </div>\n' +
-                '        </div>\n' +
-                '    </div>';
+                    '<div class="panel panel-default">\n' +
+                    '        <div class="panel-heading">\n' +
+                    '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
+                    '            <span class="houseTitle" >' + houseList[key].houseAddress + '</span>\n' +
+                    '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteOtherHouse(this)">\n' +
+                    '                <span aria-hidden="true">&times;</span>\n' +
+                    '            </button>\n' +
+                    '        </div>\n' +
+                    '        <div class="panel-body">\n' +
+                    '            <div class="col-sm-12">\n' +
+                    '                <input type="hidden" name="id" value="' + houseList[key].id + '"/>\n' +
+                    '                <input type="hidden" name="pId" value="' + houseList[key].pId + '"/>\n' +
+                    '                <input type="hidden" name="type" value="' + houseList[key].type + '"/>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">购房人姓名</label>\n' +
+                    '                    <input type="text" class="form-control" name="name" value="' + houseList[key].name + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">购房人证件号码</label>\n' +
+                    '                    <input type="text" class="form-control" name="idCard" value="' + houseList[key].idCard + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
+                    '                    <input type="text" class="form-control" name="houseAddress" value="' + houseList[key].houseAddress + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">合同编号</label>\n' +
+                    '                    <input type="text" class="form-control" name="number" value="' + houseList[key].number + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">面积(m2)</label>\n' +
+                    '                    <input type="text" class="form-control" name="area" value="' + houseList[key].area + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">交易备案时间</label>\n' +
+                    '                    <input type="text" class="form-control date" name="recordTime" value="' + houseList[key].recordTime + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">交易方式(购买、出售、签约注销、备案注销等)</label>\n' +
+                    '                    <input type="text" class="form-control" name="tradeMethod" value="' + houseList[key].tradeMethod + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">备注</label>\n' +
+                    '                    <input type="text" class="form-control" name="description" value="' + houseList[key].description + '"/>\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '        </div>\n' +
+                    '    </div>';
         }
         $("#zzjOtherHouse").empty().append(html);
     }
@@ -1293,50 +1299,50 @@ HousepurchaseInfoDlg.initZrzyj = function (houseList) {
         var html = "";
         for (var key in houseList) {
             html = html +
-                '<div class="panel panel-default">\n' +
-                '        <div class="panel-heading">\n' +
-                '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
-                '            <span class="houseTitle">' + houseList[key].houseAddress + '</span>\n' +
-                '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteOtherHouse(this)">\n' +
-                '                <span aria-hidden="true">&times;</span>\n' +
-                '            </button>\n' +
-                '        </div>\n' +
-                '        <div class="panel-body">\n' +
-                '            <div class="col-sm-12">\n' +
-                '                <input type="hidden" name="id" value="' + houseList[key].id + '"/>\n' +
-                '                <input type="hidden" name="pId" value="' + houseList[key].pId + '"/>\n' +
-                '                <input type="hidden" name="type" value="' + houseList[key].type + '"/>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">产权人姓名</label>\n' +
-                '                    <input type="text" class="form-control" name="name" value="' + houseList[key].name + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">产权人证件号码</label>\n' +
-                '                    <input type="text" class="form-control" name="idCard" value="' + houseList[key].idCard + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
-                '                    <input type="text" class="form-control" name="houseAddress" value="' + houseList[key].houseAddress + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">不动产权号</label>\n' +
-                '                    <input type="text" class="form-control" name="number" value="' + houseList[key].number + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">面积(m2)</label>\n' +
-                '                    <input type="text" class="form-control" name="area" value="' + houseList[key].area + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">房屋登记时间</label>\n' +
-                '                    <input type="text" class="form-control date" name="recordTime" value="' + houseList[key].recordTime + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">备注</label>\n' +
-                '                    <input type="text" class="form-control" name="description" value="' + houseList[key].description + '"/>\n' +
-                '                </div>\n' +
-                '            </div>\n' +
-                '        </div>\n' +
-                '    </div>'
+                    '<div class="panel panel-default">\n' +
+                    '        <div class="panel-heading">\n' +
+                    '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
+                    '            <span class="houseTitle">' + houseList[key].houseAddress + '</span>\n' +
+                    '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteOtherHouse(this)">\n' +
+                    '                <span aria-hidden="true">&times;</span>\n' +
+                    '            </button>\n' +
+                    '        </div>\n' +
+                    '        <div class="panel-body">\n' +
+                    '            <div class="col-sm-12">\n' +
+                    '                <input type="hidden" name="id" value="' + houseList[key].id + '"/>\n' +
+                    '                <input type="hidden" name="pId" value="' + houseList[key].pId + '"/>\n' +
+                    '                <input type="hidden" name="type" value="' + houseList[key].type + '"/>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">产权人姓名</label>\n' +
+                    '                    <input type="text" class="form-control" name="name" value="' + houseList[key].name + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">产权人证件号码</label>\n' +
+                    '                    <input type="text" class="form-control" name="idCard" value="' + houseList[key].idCard + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">房屋坐落地址</label>\n' +
+                    '                    <input type="text" class="form-control" name="houseAddress" value="' + houseList[key].houseAddress + '" onchange="$(this).parent().parent().parent().parent().find(\'.houseTitle\').text($(this).val())"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">不动产权号</label>\n' +
+                    '                    <input type="text" class="form-control" name="number" value="' + houseList[key].number + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">面积(m2)</label>\n' +
+                    '                    <input type="text" class="form-control" name="area" value="' + houseList[key].area + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">房屋登记时间</label>\n' +
+                    '                    <input type="text" class="form-control date" name="recordTime" value="' + houseList[key].recordTime + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">备注</label>\n' +
+                    '                    <input type="text" class="form-control" name="description" value="' + houseList[key].description + '"/>\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '        </div>\n' +
+                    '    </div>'
         }
         $("#zrzyOtherHouse").empty().append(html);
     }
@@ -1347,43 +1353,43 @@ HousepurchaseInfoDlg.initMzj = function (spouseList) {
         var html = "";
         for (var key in spouseList) {
             html = html +
-                '<div class="panel panel-default">\n' +
-                '        <div class="panel-heading">\n' +
-                '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
-                '            <span class="houseTitle">' + spouseList[key].registerTime + '</span>\n' +
-                '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteSpouse(this)">\n' +
-                '                <span aria-hidden="true">&times;</span>\n' +
-                '            </button>\n' +
-                '        </div>\n' +
-                '        <div class="panel-body">\n' +
-                '            <div class="col-sm-12">\n' +
-                '                <input type="hidden" name="id" />\n' +
-                '                <input type="hidden" name="pId" />\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">登记类型</label>\n' +
-                '                    <select type="text" class="form-control" name="type" value="' + spouseList[key].type + '">\n' +
-                '                        <option value="">请选择</option>\n' +
-                '                        <option value="1">初婚</option>\n' +
-                '                        <option value="2">复婚</option>\n' +
-                '                        <option value="3">再婚</option>\n' +
-                '                        <option value="4">离婚</option>\n' +
-                '                    </select>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">登记时间</label>\n' +
-                '                    <input type="text" class="form-control date" name="registerTime" value="' + spouseList[key].registerTime + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">配偶姓名</label>\n' +
-                '                    <input type="text" class="form-control" name="name" value="' + spouseList[key].name + '"/>\n' +
-                '                </div>\n' +
-                '                <div class="rowGroup col-sm-3">\n' +
-                '                    <label class="control-label spacing">配偶证件号码</label>\n' +
-                '                    <input type="text" class="form-control" name="idCard" value="' + spouseList[key].idCard + '"/>\n' +
-                '                </div>\n' +
-                '            </div>\n' +
-                '        </div>\n' +
-                '    </div>'
+                    '<div class="panel panel-default">\n' +
+                    '        <div class="panel-heading">\n' +
+                    '            <span class="caret" onclick="$(this).parent().next().toggle()"></span>\n' +
+                    '            <span class="houseTitle">' + spouseList[key].registerTime + '</span>\n' +
+                    '            <button type="button" class="close" aria-label="Close" style="float: right" onclick="HousepurchaseInfoDlg.deleteSpouse(this)">\n' +
+                    '                <span aria-hidden="true">&times;</span>\n' +
+                    '            </button>\n' +
+                    '        </div>\n' +
+                    '        <div class="panel-body">\n' +
+                    '            <div class="col-sm-12">\n' +
+                    '                <input type="hidden" name="id" />\n' +
+                    '                <input type="hidden" name="pId" />\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">登记类型</label>\n' +
+                    '                    <select type="text" class="form-control" name="type" value="' + spouseList[key].type + '">\n' +
+                    '                        <option value="">请选择</option>\n' +
+                    '                        <option value="1">初婚</option>\n' +
+                    '                        <option value="2">复婚</option>\n' +
+                    '                        <option value="3">再婚</option>\n' +
+                    '                        <option value="4">离婚</option>\n' +
+                    '                    </select>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">登记时间</label>\n' +
+                    '                    <input type="text" class="form-control date" name="registerTime" value="' + spouseList[key].registerTime + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">配偶姓名</label>\n' +
+                    '                    <input type="text" class="form-control" name="name" value="' + spouseList[key].name + '"/>\n' +
+                    '                </div>\n' +
+                    '                <div class="rowGroup col-sm-3">\n' +
+                    '                    <label class="control-label spacing">配偶证件号码</label>\n' +
+                    '                    <input type="text" class="form-control" name="idCard" value="' + spouseList[key].idCard + '"/>\n' +
+                    '                </div>\n' +
+                    '            </div>\n' +
+                    '        </div>\n' +
+                    '    </div>'
         }
         $("#mzjMarryData").empty().append(html);
         $("select").each(function () {
@@ -1414,23 +1420,23 @@ $(function () {
         "active": 1
     })
     HousepurchaseInfoDlg.initDate();
-    Feng.showMiniFileModal(CONFIG.project_house,$("#type").val(),$("#id").val());
-    initNoBtnFileTable(CONFIG.project_house,'fileTable');
+    Feng.showMiniFileModal(CONFIG.project_house, $("#type").val(), $("#id").val());
+    initNoBtnFileTable(CONFIG.project_house, 'fileTable');
     var declareType = $("#declareType").val();
     if (declareType == 1) {
         $('#historyTable').bootstrapTable({
-            url: Feng.ctxPath + "/housepurchase/getHistoryRecord?id=" + $("#id").val(),
+            url: Feng.ctxPath + "/admin/house/getHistoryRecord?id=" + $("#id").val(),
             method: 'POST',
             contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-            search: false,					// 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
-            showRefresh: false,				// 是否显示刷新按钮
-            clickToSelect: true,			// 是否启用点击选中行
-            singleSelect: true,				// 设置True 将禁止多选
-            striped: true,  				// 是否显示行间隔色
-            pagination: false,   			// 设置为 true 会在表格底部显示分页条
+            search: false, // 是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+            showRefresh: false, // 是否显示刷新按钮
+            clickToSelect: true, // 是否启用点击选中行
+            singleSelect: true, // 设置True 将禁止多选
+            striped: true, // 是否显示行间隔色
+            pagination: false, // 设置为 true 会在表格底部显示分页条
             paginationHAlign: "left",
             paginationDetailHAlign: "right",
-            sidePagination: "server",   	// 设置在哪里进行分页，可选值为 'client' 或者 'server'
+            sidePagination: "server", // 设置在哪里进行分页，可选值为 'client' 或者 'server'
             showColumns: false,
             rowStyle: function (row, index) {
                 return {
@@ -1441,117 +1447,117 @@ $(function () {
                 }
             },
             columns:
-                [
-                    {
-                        title: '年度',
-                        field: 'year',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "80px",
-                        'class': 'uitd_showTip',
-                    },
-                    {
-                        title: '姓名',
-                        field: 'name',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '证件号码',
-                        field: 'idCard',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "150px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '婚姻状态',
-                        field: 'marryStatusName',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '配偶姓名',
-                        field: 'spouseName',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '配偶证件号码',
-                        field: 'spouseIdcard',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '房屋地址',
-                        field: 'houseAddress',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '房屋建筑面积',
-                        field: 'houseArea',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '房源成交金额',
-                        field: 'houseMoney',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        width: "100px",
-                        'class': 'uitd_showTip'
-                    },
-                    {
-                        title: '计算结果',
-                        field: 'realEnjoyMoney',
-                        visible: true,
-                        align: 'center',
-                        valign: 'middle',
-                        'class': 'uitd_showTip',
-                        width: "100px",
-                        formatter: function (value, row, index) {
-                            if (row.cashType == 1 && row.declareType == 1) {
-                                var html = "1.可享受总金额(首套房产金额)：" + (parseFloat(row.totalMoney) / 10000).toFixed(2) +
-                                    "万元</br>2.个人余额(未扣除本次)：" + (parseFloat(row.balanceMoney) / 10000).toFixed(2) +
-                                    "万元</br>3.房产余额(未扣除本次)：" + (parseFloat(row.houseBalanceMoney) / 10000).toFixed(2) +
-                                    "万元</br>4.上一年度未扣除其他政策金额：" + (parseFloat(row.lastOtherMoney) / 10000).toFixed(2) +
-                                    "万元</br>5.本年度新增享受其他政策金额：" + (parseFloat(row.nowOtherMoney) / 10000).toFixed(2) +
-                                    "万元</br>6.本年度人才层次可享受金额：" + (parseFloat(row.talentArrangeMoney) / 10000).toFixed(2) +
-                                    "万元</br>7.本年度应享受金额(2,3,6比较得到)：" + (parseFloat(row.shouldEnjoyMoney) / 10000).toFixed(2) +
-                                    "万元</br>8.本年度扣除享受其他政策金额：" + (parseFloat(row.nowSubOtherMoney) / 10000).toFixed(2) +
-                                    "万元</br>9.本年度未扣除享受其他政策金额：" + (parseFloat(row.nowNotSubOtherMoney) / 10000).toFixed(2) +
-                                    "万元</br>10.本年度最终可到账金额：" + (parseFloat(row.realEnjoyMoney) / 10000).toFixed(2) + "万元";
-                                return "<span class='label label-success' onclick=\"layer.alert('" + html + "', {title:'计算结果', skin: 'layui-layer-molv',closeBtn: 0})\" >" +
-                                    "<i class=\"fa fa-book\"></i>查看" +
-                                    "</span>";
-                            } else {
-                                return "无";
+                    [
+                        {
+                            title: '年度',
+                            field: 'year',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "80px",
+                            'class': 'uitd_showTip',
+                        },
+                        {
+                            title: '姓名',
+                            field: 'name',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '证件号码',
+                            field: 'idCard',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "150px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '婚姻状态',
+                            field: 'marryStatusName',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '配偶姓名',
+                            field: 'spouseName',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '配偶证件号码',
+                            field: 'spouseIdcard',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '房屋地址',
+                            field: 'houseAddress',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '房屋建筑面积',
+                            field: 'houseArea',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '房源成交金额',
+                            field: 'houseMoney',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            width: "100px",
+                            'class': 'uitd_showTip'
+                        },
+                        {
+                            title: '计算结果',
+                            field: 'realEnjoyMoney',
+                            visible: true,
+                            align: 'center',
+                            valign: 'middle',
+                            'class': 'uitd_showTip',
+                            width: "100px",
+                            formatter: function (value, row, index) {
+                                if (row.cashType == 1 && row.declareType == 1) {
+                                    var html = "1.可享受总金额(首套房产金额)：" + (parseFloat(row.totalMoney) / 10000).toFixed(2) +
+                                            "万元</br>2.个人余额(未扣除本次)：" + (parseFloat(row.balanceMoney) / 10000).toFixed(2) +
+                                            "万元</br>3.房产余额(未扣除本次)：" + (parseFloat(row.houseBalanceMoney) / 10000).toFixed(2) +
+                                            "万元</br>4.上一年度未扣除其他政策金额：" + (parseFloat(row.lastOtherMoney) / 10000).toFixed(2) +
+                                            "万元</br>5.本年度新增享受其他政策金额：" + (parseFloat(row.nowOtherMoney) / 10000).toFixed(2) +
+                                            "万元</br>6.本年度人才层次可享受金额：" + (parseFloat(row.talentArrangeMoney) / 10000).toFixed(2) +
+                                            "万元</br>7.本年度应享受金额(2,3,6比较得到)：" + (parseFloat(row.shouldEnjoyMoney) / 10000).toFixed(2) +
+                                            "万元</br>8.本年度扣除享受其他政策金额：" + (parseFloat(row.nowSubOtherMoney) / 10000).toFixed(2) +
+                                            "万元</br>9.本年度未扣除享受其他政策金额：" + (parseFloat(row.nowNotSubOtherMoney) / 10000).toFixed(2) +
+                                            "万元</br>10.本年度最终可到账金额：" + (parseFloat(row.realEnjoyMoney) / 10000).toFixed(2) + "万元";
+                                    return "<span class='label label-success' onclick=\"layer.alert('" + html + "', {title:'计算结果', skin: 'layui-layer-molv',closeBtn: 0})\" >" +
+                                            "<i class=\"fa fa-book\"></i>查看" +
+                                            "</span>";
+                                } else {
+                                    return "无";
+                                }
                             }
                         }
-                    }
-                ]
+                    ]
             ,
             onPostBody: function () {
                 $('#' + id + "td.uitd_showTip").bind("mouseover", function () {