类字段调整、常住导出可以按类型

dangan-admin/src/main/resources/application.yml

@@ -7,7 +7,9 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  #profile: /usr/local/dangan/uploadPath
   profile: D:/dangan/uploadPath
+
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -91,7 +93,7 @@ spring:
 # token配置
 token:
   #是否允许账户多终端同时登录（true允许 false不允许）
-  soloLogin: false
+  soloLogin: true
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
@@ -133,3 +135,5 @@ xss:
 ocr:
   #第三方访问地址
   url: http://123.57.142.195:443/upload_api
+  #url: http://localhost:22443/upload_api
+  #20.206.150.166

dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java

@@ -1,5 +1,6 @@
 package com.da.dangan.controller;
 
+
 import com.da.common.annotation.Log;
 import com.da.common.core.controller.BaseController;
 import com.da.common.core.domain.AjaxResult;
@@ -10,14 +11,21 @@ import com.da.common.enums.BusinessType;
 import com.da.common.utils.poi.ExcelUtil;
 import com.da.dangan.domain.DaCzrkdj;
 import com.da.dangan.domain.DaPicturesRecard;
+import com.da.dangan.domain.vo.Czrkdj1;
+import com.da.dangan.domain.vo.Czrkdj2;
+import com.da.dangan.domain.vo.Czrkdj3;
+import com.da.dangan.domain.vo.Czrkdjczk;
 import com.da.dangan.service.IDaCzrkdjService;
 import com.da.dangan.service.IDaPicturesRecardService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 常住人口登记Controller
@@ -43,7 +51,7 @@ public class DaCzrkdjController extends BaseController {
         LoginUser loginUser = getLoginUser();
         if (SysUser.isAdmin(getUserId()) ||
                 loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin"))) {
-        }else{
+        } else {
             daCzrkdj.setUserId(getUserId());
         }
         startPage();
@@ -58,10 +66,59 @@ public class DaCzrkdjController extends BaseController {
     @Log(title = "常住人口登记", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, DaCzrkdj daCzrkdj) {
+        List<Czrkdj1>  czrkdj1=new ArrayList<>();
+        List<Czrkdj2>  czrkdj2=new ArrayList<>();
+        List<Czrkdj3>  czrkdj3=new ArrayList<>();
+        List<Czrkdjczk>  czrkdjczk=new ArrayList<>();
         List<DaCzrkdj> list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj);
+        if (daCzrkdj.getYwType() != null && daCzrkdj.getYwType().trim() != "") {
+            switch (daCzrkdj.getYwType()) {
+                case "option1":
+                    czrkdj1= list.stream()
+                        .map(originalobject ->{
+                            Czrkdj1 newObject =new Czrkdj1();
+                            BeanUtils.copyProperties(originalobject, newObject);
+                            return newObject;
+                        }).collect(Collectors.toList());
+                    ExcelUtil<Czrkdj1> util1 = new ExcelUtil<Czrkdj1>(Czrkdj1.class);
+                    util1.exportExcel(response, czrkdj1, "常住人口登记1");
+                    break;
+                case "option3":
+                    czrkdj2= list.stream()
+                            .map(originalobject ->{
+                                Czrkdj2 newObject =new Czrkdj2();
+                                BeanUtils.copyProperties(originalobject, newObject);
+                                return newObject;
+                            }).collect(Collectors.toList());
+                    ExcelUtil<Czrkdj2> util2 = new ExcelUtil<Czrkdj2>(Czrkdj2.class);
+                    util2.exportExcel(response, czrkdj2, "常住人口登记2");
+                    break;
+                case "option9":
+                    czrkdj3= list.stream()
+                            .map(originalobject ->{
+                                Czrkdj3 newObject =new Czrkdj3();
+                                BeanUtils.copyProperties(originalobject, newObject);
+                                return newObject;
+                            }).collect(Collectors.toList());
+                    ExcelUtil<Czrkdj3> util3 = new ExcelUtil<Czrkdj3>(Czrkdj3.class);
+                    util3.exportExcel(response, czrkdj3, "常住人口登记3");
+                    break;
+                case "option2":
+                    czrkdjczk= list.stream()
+                            .map(originalobject ->{
+                                Czrkdjczk newObject =new Czrkdjczk();
+                                BeanUtils.copyProperties(originalobject, newObject);
+                                return newObject;
+                            }).collect(Collectors.toList());
+                    ExcelUtil<Czrkdjczk> util4 = new ExcelUtil<Czrkdjczk>(Czrkdjczk.class);
+                    util4.exportExcel(response, czrkdjczk, "常住卡");
+                    break;
+            }
+        }else{
             ExcelUtil<DaCzrkdj> util = new ExcelUtil<DaCzrkdj>(DaCzrkdj.class);
             util.exportExcel(response, list, "常住人口登记数据");
         }
+    }
 
     /**
      * 获取常住人口登记详细信息

dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaBirthDj;
 import java.util.List;
 
 public class CszmDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaBirthDj> info;
 

dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaCzrkdj;
 import java.util.List;
 
 public class CzrkDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaCzrkdj> info;
 

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj1.java

@@ -0,0 +1,513 @@
+package com.da.dangan.domain.vo;
+
+import com.da.common.annotation.Excel;
+import com.da.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 导出对象常住人口1 da_czrkdj
+ *
+ * @author hs
+ * @date 2024-06-14
+ */
+public class Czrkdj1 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 业务类型(字典)
+     */
+    //@Excel(name = "业务类型",dictType = "yw_type")
+    private String ywType;
+
+    /**
+     * 目录id
+     */
+   // @Excel(name = "目录id")
+    private Long muId;
+
+    /** 档案目录路径 */
+    @Excel(name = "档案目录路径")
+    private String muPath;
+
+    /**
+     * 与户主关系
+     */
+    @Excel(name = "与户主关系")
+    private String relation;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @Excel(name = "别名")
+    private String otherName;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String sex;
+
+    /** 出生日期 */
+    @Excel(name = "出生日期")
+    private String birthday;
+
+    /**
+     * 出生地址
+     */
+    @Excel(name = "出生地址")
+    private String address;
+
+    /**
+     * 原籍
+     */
+    @Excel(name = "原籍")
+    private String yj;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /**
+     * 宗教信仰
+     */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /**
+     * 文化程度
+     */
+    @Excel(name = "文化程度")
+    private String whcd;
+
+    /**
+     * 婚姻状况
+     */
+    @Excel(name = "婚姻状况")
+    private String hyzk;
+
+    /**
+     * 职业及服务处所
+     */
+    @Excel(name = "职业及服务处所")
+    private String zyjfwcs;
+
+    /**
+     * 本县(市)其他住址
+     */
+    @Excel(name = "本县(市)其他住址")
+    private String bxsqtzz;
+
+    /**
+     * 公民证代号号码签发
+     * 公民证代号号码签发机关及日期
+     */
+    @Excel(name = "公民证代号号码签发机关及日期")
+    private String gmzdhhmqfjgjrq;
+
+    /**
+     * 何时由何地迁来本县市何时登记户口
+     */
+    @Excel(name = "何时由何地迁来本县市何时登记户口")
+    private String hsyhdqlbxshsdjhk;
+
+    /**
+     * 何时由本县、市何处迁来何时登记户口
+     */
+    @Excel(name = "何时由本县、市何处迁来何时登记户口")
+    private String hsybxshcqlhsdjhk;
+
+    /**
+     * 注销户口日期
+     */
+    @Excel(name = "注销户口日期")
+    private String zxhkrq;
+
+    /**
+     * 注销户口原因
+     */
+    @Excel(name = "注销户口原因")
+    private String zxhkyy;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_1
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_1")
+    private String hkdjsxbgjznrsjjblrz1;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_2
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_2")
+    private String hkdjsxbgjznrsjjblrz2;
+
+    /**
+     * 识别图片id
+     */
+   // @Excel(name = "识别图片id")
+    private String picIds;
+
+    /**
+     * 识别图片
+     */
+    @Excel(name = "识别图片")
+    private String pictures;
+
+    /**
+     * 相关图片id
+     */
+    //@Excel(name = "相关图片id")
+    private String allPicIds;
+
+    /**
+     * 相关图片
+     */
+   // @Excel(name = "相关图片")
+    private String allPics;
+
+    /**
+     * 是否纠错(字典0否1是)
+     */
+    @Excel(name = "是否纠错",dictType = "error_correct")
+    private String errorCorrect;
+
+    /**
+     * 审核状态(字典)
+     */
+    @Excel(name = "审核状态",dictType = "audit_status")
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /**
+     * 审核结果
+     */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /**
+     * 审核原由
+     */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    public String getMuPath() {
+        return muPath;
+    }
+
+    public void setMuPath(String muPath) {
+        this.muPath = muPath;
+    }
+    public Long getId() {
+        return id;
+    }
+
+    public void setYwType(String ywType) {
+        this.ywType = ywType;
+    }
+
+    public String getYwType() {
+        return ywType;
+    }
+
+    public void setMuId(Long muId) {
+        this.muId = muId;
+    }
+
+    public Long getMuId() {
+        return muId;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setOtherName(String otherName) {
+        this.otherName = otherName;
+    }
+
+    public String getOtherName() {
+        return otherName;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setYj(String yj) {
+        this.yj = yj;
+    }
+
+    public String getYj() {
+        return yj;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setZjxy(String zjxy) {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() {
+        return zjxy;
+    }
+
+    public void setWhcd(String whcd) {
+        this.whcd = whcd;
+    }
+
+    public String getWhcd() {
+        return whcd;
+    }
+
+    public void setHyzk(String hyzk) {
+        this.hyzk = hyzk;
+    }
+
+    public String getHyzk() {
+        return hyzk;
+    }
+
+    public void setZyjfwcs(String zyjfwcs) {
+        this.zyjfwcs = zyjfwcs;
+    }
+
+    public String getZyjfwcs() {
+        return zyjfwcs;
+    }
+
+    public void setBxsqtzz(String bxsqtzz) {
+        this.bxsqtzz = bxsqtzz;
+    }
+
+    public String getBxsqtzz() {
+        return bxsqtzz;
+    }
+
+    public void setGmzdhhmqfjgjrq(String gmzdhhmqfjgjrq) {
+        this.gmzdhhmqfjgjrq = gmzdhhmqfjgjrq;
+    }
+
+    public String getGmzdhhmqfjgjrq() {
+        return gmzdhhmqfjgjrq;
+    }
+
+    public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) {
+        this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk;
+    }
+
+    public String getHsyhdqlbxshsdjhk() {
+        return hsyhdqlbxshsdjhk;
+    }
+
+    public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) {
+        this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk;
+    }
+
+    public String getHsybxshcqlhsdjhk() {
+        return hsybxshcqlhsdjhk;
+    }
+
+    public void setZxhkrq(String zxhkrq) {
+        this.zxhkrq = zxhkrq;
+    }
+
+    public String getZxhkrq() {
+        return zxhkrq;
+    }
+
+    public void setZxhkyy(String zxhkyy) {
+        this.zxhkyy = zxhkyy;
+    }
+
+    public String getZxhkyy() {
+        return zxhkyy;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz1(String hkdjsxbgjznrsjjblrz1) {
+        this.hkdjsxbgjznrsjjblrz1 = hkdjsxbgjznrsjjblrz1;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz1() {
+        return hkdjsxbgjznrsjjblrz1;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz2(String hkdjsxbgjznrsjjblrz2) {
+        this.hkdjsxbgjznrsjjblrz2 = hkdjsxbgjznrsjjblrz2;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz2() {
+        return hkdjsxbgjznrsjjblrz2;
+    }
+
+    public void setPicIds(String picIds) {
+        this.picIds = picIds;
+    }
+
+    public String getPicIds() {
+        return picIds;
+    }
+
+    public void setPictures(String pictures) {
+        this.pictures = pictures;
+    }
+
+    public String getPictures() {
+        return pictures;
+    }
+
+    public void setAllPicIds(String allPicIds) {
+        this.allPicIds = allPicIds;
+    }
+
+    public String getAllPicIds() {
+        return allPicIds;
+    }
+
+    public void setAllPics(String allPics) {
+        this.allPics = allPics;
+    }
+
+    public String getAllPics() {
+        return allPics;
+    }
+
+    public void setErrorCorrect(String errorCorrect) {
+        this.errorCorrect = errorCorrect;
+    }
+
+    public String getErrorCorrect() {
+        return errorCorrect;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditResult(String auditResult) {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult() {
+        return auditResult;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("ywType", getYwType())
+                .append("muId", getMuId())
+                .append("muPath", getMuPath())
+                .append("relation", getRelation())
+                .append("name", getName())
+                .append("otherName", getOtherName())
+                .append("sex", getSex())
+                .append("birthday", getBirthday())
+                .append("address", getAddress())
+                .append("yj", getYj())
+                .append("nation", getNation())
+                .append("zjxy", getZjxy())
+                .append("whcd", getWhcd())
+                .append("hyzk", getHyzk())
+                .append("zyjfwcs", getZyjfwcs())
+                .append("bxsqtzz", getBxsqtzz())
+                .append("gmzdhhmqfjgjrq", getGmzdhhmqfjgjrq())
+                .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk())
+                .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk())
+                .append("zxhkrq", getZxhkrq())
+                .append("zxhkyy", getZxhkyy())
+                .append("hkdjsxbgjznrsjjblrz1", getHkdjsxbgjznrsjjblrz1())
+                .append("hkdjsxbgjznrsjjblrz2", getHkdjsxbgjznrsjjblrz2())
+                .append("picIds", getPicIds())
+                .append("pictures", getPictures())
+                .append("allPicIds", getAllPicIds())
+                .append("allPics", getAllPics())
+                .append("errorCorrect", getErrorCorrect())
+                .append("auditStatus", getAuditStatus())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj2.java

@@ -0,0 +1,635 @@
+package com.da.dangan.domain.vo;
+
+import com.da.common.annotation.Excel;
+import com.da.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 常住人口登记对象 da_czrkdj
+ *
+ * @author hs
+ * @date 2024-06-14
+ */
+public class Czrkdj2 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 业务类型(字典)
+     */
+    //@Excel(name = "业务类型",dictType = "yw_type")
+    private String ywType;
+
+    /**
+     * 目录id
+     */
+   // @Excel(name = "目录id")
+    private Long muId;
+
+    /** 档案目录路径 */
+    @Excel(name = "档案目录路径")
+    private String muPath;
+
+    /**
+     * 户别
+     */
+    @Excel(name = "户别")
+    private String hb;
+
+    /**
+     * 户主姓名
+     */
+    @Excel(name = "户主姓名")
+    private String hzName;
+
+
+    /**
+     * 与户主关系
+     */
+    @Excel(name = "与户主关系")
+    private String relation;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @Excel(name = "别名")
+    private String otherName;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String sex;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /** 出生日期 */
+    @Excel(name = "出生日期")
+    private String birthday;
+
+    /**
+     * 宗教信仰
+     */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /**
+     * 现住址
+     */
+    @Excel(name = "住址")
+    private String xzz;
+
+    /**
+     * 本县(市)其他住址
+     */
+    @Excel(name = "其他住址")
+    private String bxsqtzz;
+
+    /**
+     * 出生地址
+     */
+    @Excel(name = "出生地")
+    private String address;
+
+    /**
+     * 文化程度
+     */
+    @Excel(name = "文化程度")
+    private String whcd;
+
+    /**
+     * 婚姻状况
+     */
+    @Excel(name = "婚姻状况")
+    private String hyzk;
+
+    /**
+     * 兵役状况
+     */
+    @Excel(name = "兵役状况")
+    private String byzk;
+
+    /**
+     * 身高
+     */
+    @Excel(name = "身高")
+    private String height;
+
+    /**
+     * 血型
+     */
+    @Excel(name = "血型")
+    private String blood;
+
+    /**
+     * 职业及服务处所
+     */
+    @Excel(name = "服务处所")
+    private String zyjfwcs;
+
+    /**
+     * 职业
+     */
+    @Excel(name = "职业")
+    private String zy;
+
+    /**
+     * 申领居民身份证原因
+     */
+    @Excel(name = "申领居民身份证原因")
+    private String slReason;
+
+    /**
+     * 申领居民身份证签名
+     */
+    @Excel(name = "申领居民身份证签名")
+    private String sljmsfzqm;
+
+    /**
+     * 签发意见
+     */
+    @Excel(name = "签发意见")
+    private String qfyj;
+
+    /**
+     * 居民身份证签发日期及有效期限
+     */
+    @Excel(name = "居民身份证签发日期及有效期限")
+    private String yxrq;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /**
+     * 何时由何地迁来本县市何时登记户口
+     */
+    @Excel(name = "何时由何地迁来本县市何时登记户口")
+    private String hsyhdqlbxshsdjhk;
+
+    /**
+     * 何时由本县、市何处迁来何时登记户口
+     */
+    @Excel(name = "何时由本县、市何处迁来何时登记户口")
+    private String hsybxshcqlhsdjhk;
+
+    /**
+     * 注销户口原因
+     */
+    @Excel(name = "何因注销户口-是否缴销身份证")
+    private String zxhkyy;
+
+    /**
+     * 识别图片id
+     */
+    //@Excel(name = "识别图片id")
+    private String picIds;
+
+    /**
+     * 识别图片
+     */
+    @Excel(name = "识别图片")
+    private String pictures;
+
+    /**
+     * 相关图片id
+     */
+   // @Excel(name = "相关图片id")
+    private String allPicIds;
+
+    /**
+     * 相关图片
+     */
+   // @Excel(name = "相关图片")
+    private String allPics;
+
+    /**
+     * 是否纠错(字典0否1是)
+     */
+    @Excel(name = "是否纠错",dictType = "error_correct")
+    private String errorCorrect;
+
+    /**
+     * 审核状态(字典)
+     */
+    @Excel(name = "审核状态",dictType = "audit_status")
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /**
+     * 审核结果
+     */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /**
+     * 审核原由
+     */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getMuPath() {
+        return muPath;
+    }
+
+    public void setMuPath(String muPath) {
+        this.muPath = muPath;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setYwType(String ywType) {
+        this.ywType = ywType;
+    }
+
+    public String getYwType() {
+        return ywType;
+    }
+
+    public void setMuId(Long muId) {
+        this.muId = muId;
+    }
+
+    public Long getMuId() {
+        return muId;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setOtherName(String otherName) {
+        this.otherName = otherName;
+    }
+
+    public String getOtherName() {
+        return otherName;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setZjxy(String zjxy) {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() {
+        return zjxy;
+    }
+
+    public void setWhcd(String whcd) {
+        this.whcd = whcd;
+    }
+
+    public String getWhcd() {
+        return whcd;
+    }
+
+    public void setHyzk(String hyzk) {
+        this.hyzk = hyzk;
+    }
+
+    public String getHyzk() {
+        return hyzk;
+    }
+
+    public void setZyjfwcs(String zyjfwcs) {
+        this.zyjfwcs = zyjfwcs;
+    }
+
+    public String getZyjfwcs() {
+        return zyjfwcs;
+    }
+
+    public void setBxsqtzz(String bxsqtzz) {
+        this.bxsqtzz = bxsqtzz;
+    }
+
+    public String getBxsqtzz() {
+        return bxsqtzz;
+    }
+
+    public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) {
+        this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk;
+    }
+
+    public String getHsyhdqlbxshsdjhk() {
+        return hsyhdqlbxshsdjhk;
+    }
+
+    public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) {
+        this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk;
+    }
+
+    public String getHsybxshcqlhsdjhk() {
+        return hsybxshcqlhsdjhk;
+    }
+
+    public void setZxhkyy(String zxhkyy) {
+        this.zxhkyy = zxhkyy;
+    }
+
+    public String getZxhkyy() {
+        return zxhkyy;
+    }
+
+    public void setXzz(String xzz) {
+        this.xzz = xzz;
+    }
+
+    public String getXzz() {
+        return xzz;
+    }
+
+    public void setHzName(String hzName) {
+        this.hzName = hzName;
+    }
+
+    public String getHzName() {
+        return hzName;
+    }
+
+    public void setHb(String hb) {
+        this.hb = hb;
+    }
+
+    public String getHb() {
+        return hb;
+    }
+
+    public void setByzk(String byzk) {
+        this.byzk = byzk;
+    }
+
+    public String getByzk() {
+        return byzk;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setBlood(String blood) {
+        this.blood = blood;
+    }
+
+    public String getBlood() {
+        return blood;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setSlReason(String slReason) {
+        this.slReason = slReason;
+    }
+
+    public String getSlReason() {
+        return slReason;
+    }
+
+    public void setSljmsfzqm(String sljmsfzqm) {
+        this.sljmsfzqm = sljmsfzqm;
+    }
+
+    public String getSljmsfzqm() {
+        return sljmsfzqm;
+    }
+
+    public void setQfyj(String qfyj) {
+        this.qfyj = qfyj;
+    }
+
+    public String getQfyj() {
+        return qfyj;
+    }
+
+    public void setYxrq(String yxrq) {
+        this.yxrq = yxrq;
+    }
+
+    public String getYxrq() {
+        return yxrq;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setPicIds(String picIds) {
+        this.picIds = picIds;
+    }
+
+    public String getPicIds() {
+        return picIds;
+    }
+
+    public void setPictures(String pictures) {
+        this.pictures = pictures;
+    }
+
+    public String getPictures() {
+        return pictures;
+    }
+
+    public void setAllPicIds(String allPicIds) {
+        this.allPicIds = allPicIds;
+    }
+
+    public String getAllPicIds() {
+        return allPicIds;
+    }
+
+    public void setAllPics(String allPics) {
+        this.allPics = allPics;
+    }
+
+    public String getAllPics() {
+        return allPics;
+    }
+
+    public void setErrorCorrect(String errorCorrect) {
+        this.errorCorrect = errorCorrect;
+    }
+
+    public String getErrorCorrect() {
+        return errorCorrect;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditResult(String auditResult) {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult() {
+        return auditResult;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("ywType", getYwType())
+                .append("muId", getMuId())
+                .append("muPath", getMuPath())
+                .append("relation", getRelation())
+                .append("name", getName())
+                .append("otherName", getOtherName())
+                .append("sex", getSex())
+                .append("birthday", getBirthday())
+                .append("address", getAddress())
+                .append("nation", getNation())
+                .append("zjxy", getZjxy())
+                .append("whcd", getWhcd())
+                .append("hyzk", getHyzk())
+                .append("zyjfwcs", getZyjfwcs())
+                .append("bxsqtzz", getBxsqtzz())
+                .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk())
+                .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk())
+                .append("zxhkyy", getZxhkyy())
+                .append("xzz", getXzz())
+                .append("hzName", getHzName())
+                .append("hb", getHb())
+                .append("byzk", getByzk())
+                .append("height", getHeight())
+                .append("blood", getBlood())
+                .append("zy", getZy())
+                .append("slReason", getSlReason())
+                .append("sljmsfzqm", getSljmsfzqm())
+                .append("qfyj", getQfyj())
+                .append("yxrq", getYxrq())
+                .append("cardId", getCardId())
+                .append("picIds", getPicIds())
+                .append("pictures", getPictures())
+                .append("allPicIds", getAllPicIds())
+                .append("allPics", getAllPics())
+                .append("errorCorrect", getErrorCorrect())
+                .append("auditStatus", getAuditStatus())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj3.java

@@ -0,0 +1,652 @@
+package com.da.dangan.domain.vo;
+
+import com.da.common.annotation.Excel;
+import com.da.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 常住人口登记对象 da_czrkdj
+ *
+ * @author hs
+ * @date 2024-06-14
+ */
+public class Czrkdj3 extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 业务类型(字典)
+     */
+   // @Excel(name = "业务类型",dictType = "yw_type")
+    private String ywType;
+
+    /**
+     * 目录id
+     */
+   // @Excel(name = "目录id")
+    private Long muId;
+
+    /** 档案目录路径 */
+    @Excel(name = "档案目录路径")
+    private String muPath;
+    /**
+     * 户别
+     */
+    @Excel(name = "户别")
+    private String hb;
+
+    /**
+     * 户主姓名
+     */
+    @Excel(name = "户主姓名")
+    private String hzName;
+
+    /**
+     * 与户主关系
+     */
+    @Excel(name = "与户主关系")
+    private String relation;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String sex;
+
+    /**
+     * 曾用名
+     */
+    @Excel(name = "曾用名")
+    private String usedName;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /** 出生日期 */
+    @Excel(name = "出生日期")
+    private String birthday;
+
+    /** 监护人1 */
+    @Excel(name = "监护人1")
+    private String jhr1;
+
+    /** 监护关系1 */
+    @Excel(name = "监护关系1")
+    private String jhgx1;
+
+    /** 监护人2 */
+    @Excel(name = "监护人2")
+    private String jhr2;
+
+    /** 监护关系2 */
+    @Excel(name = "监护关系2")
+    private String jhgx2;
+
+    /**
+     * 出生地址
+     */
+    @Excel(name = "出生地")
+    private String address;
+
+    /**
+     * 公民出生证签发日期
+     */
+    @Excel(name = "公民出生证签发日期")
+    private String gmcszqfrq;
+
+
+    /**
+     * 现住址
+     */
+    @Excel(name = "住址")
+    private String xzz;
+
+    /**
+     * 本县(市)其他住址
+     */
+    @Excel(name = "本县(市)其他住址")
+    private String bxsqtzz;
+
+    /**
+     * 籍贯
+     */
+    @Excel(name = "籍贯")
+    private String jiguan;
+
+    /**
+     * 宗教信仰
+     */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /**
+     * 居民身份证签发日期
+     */
+    @Excel(name = "居民身份证签发日期")
+    private String jmsfzqfrq;
+
+    /**
+     * 文化程度
+     */
+    @Excel(name = "文化程度")
+    private String whcd;
+
+    /**
+     * 婚姻状况
+     */
+    @Excel(name = "婚姻状况")
+    private String hyzk;
+
+    /**
+     * 兵役状况
+     */
+    @Excel(name = "兵役状况")
+    private String byzk;
+
+    /**
+     * 身高
+     */
+    @Excel(name = "身高")
+    private String height;
+
+    /**
+     * 血型
+     */
+    @Excel(name = "血型")
+    private String blood;
+
+    /**
+     * 职业
+     */
+    @Excel(name = "职业")
+    private String zy;
+
+    /**
+     * 职业及服务处所
+     */
+    @Excel(name = "服务处所")
+    private String zyjfwcs;
+
+    /**
+     * 何时由何地迁来本县市何时登记户口
+     */
+    @Excel(name = "何时由何地迁来本县市何时登记户口")
+    private String hsyhdqlbxshsdjhk;
+
+    /**
+     * 何时由本县、市何处迁来何时登记户口
+     */
+    @Excel(name = "何时由本县、市何处迁来何时登记户口")
+    private String hsybxshcqlhsdjhk;
+
+    /**
+     * 何时何因由何地迁来本址
+     */
+    @Excel(name = "何时何因由何地迁来本址")
+    private String hshyyhdqlbz;
+
+    /**
+     * 识别图片id
+     */
+    //@Excel(name = "识别图片id")
+    private String picIds;
+
+    /**
+     * 识别图片
+     */
+    @Excel(name = "识别图片")
+    private String pictures;
+
+    /**
+     * 相关图片id
+     */
+    //@Excel(name = "相关图片id")
+    private String allPicIds;
+
+    /**
+     * 相关图片
+     */
+    //@Excel(name = "相关图片")
+    private String allPics;
+
+    /**
+     * 是否纠错(字典0否1是)
+     */
+    @Excel(name = "是否纠错",dictType = "error_correct")
+    private String errorCorrect;
+
+    /**
+     * 审核状态(字典)
+     */
+    @Excel(name = "审核状态",dictType = "audit_status")
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /**
+     * 审核结果
+     */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /**
+     * 审核原由
+     */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+
+    public String getMuPath() {
+        return muPath;
+    }
+
+    public void setMuPath(String muPath) {
+        this.muPath = muPath;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setYwType(String ywType) {
+        this.ywType = ywType;
+    }
+
+    public String getYwType() {
+        return ywType;
+    }
+
+    public void setMuId(Long muId) {
+        this.muId = muId;
+    }
+
+    public Long getMuId() {
+        return muId;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsedName() {
+        return usedName;
+    }
+
+    public void setUsedName(String usedName) {
+        this.usedName = usedName;
+    }
+
+    public String getJhr1() {
+        return jhr1;
+    }
+
+    public void setJhr1(String jhr1) {
+        this.jhr1 = jhr1;
+    }
+
+    public String getJhgx1() {
+        return jhgx1;
+    }
+
+    public void setJhgx1(String jhgx1) {
+        this.jhgx1 = jhgx1;
+    }
+
+    public String getJhr2() {
+        return jhr2;
+    }
+
+    public void setJhr2(String jhr2) {
+        this.jhr2 = jhr2;
+    }
+
+    public String getJhgx2() {
+        return jhgx2;
+    }
+
+    public void setJhgx2(String jhgx2) {
+        this.jhgx2 = jhgx2;
+    }
+
+    public String getGmcszqfrq() {
+        return gmcszqfrq;
+    }
+
+    public void setGmcszqfrq(String gmcszqfrq) {
+        this.gmcszqfrq = gmcszqfrq;
+    }
+
+    public String getJmsfzqfrq() {
+        return jmsfzqfrq;
+    }
+
+    public void setJmsfzqfrq(String jmsfzqfrq) {
+        this.jmsfzqfrq = jmsfzqfrq;
+    }
+
+    public String getHshyyhdqlbz() {
+        return hshyyhdqlbz;
+    }
+
+    public void setHshyyhdqlbz(String hshyyhdqlbz) {
+        this.hshyyhdqlbz = hshyyhdqlbz;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setZjxy(String zjxy) {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() {
+        return zjxy;
+    }
+
+    public void setWhcd(String whcd) {
+        this.whcd = whcd;
+    }
+
+    public String getWhcd() {
+        return whcd;
+    }
+
+    public void setHyzk(String hyzk) {
+        this.hyzk = hyzk;
+    }
+
+    public String getHyzk() {
+        return hyzk;
+    }
+
+    public void setZyjfwcs(String zyjfwcs) {
+        this.zyjfwcs = zyjfwcs;
+    }
+
+    public String getZyjfwcs() {
+        return zyjfwcs;
+    }
+
+    public void setBxsqtzz(String bxsqtzz) {
+        this.bxsqtzz = bxsqtzz;
+    }
+
+    public String getBxsqtzz() {
+        return bxsqtzz;
+    }
+
+    public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) {
+        this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk;
+    }
+
+    public String getHsyhdqlbxshsdjhk() {
+        return hsyhdqlbxshsdjhk;
+    }
+
+    public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) {
+        this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk;
+    }
+
+    public String getHsybxshcqlhsdjhk() {
+        return hsybxshcqlhsdjhk;
+    }
+
+    public void setJiguan(String jiguan) {
+        this.jiguan = jiguan;
+    }
+
+    public String getJiguan() {
+        return jiguan;
+    }
+
+    public void setXzz(String xzz) {
+        this.xzz = xzz;
+    }
+
+    public String getXzz() {
+        return xzz;
+    }
+
+    public void setHzName(String hzName) {
+        this.hzName = hzName;
+    }
+
+    public String getHzName() {
+        return hzName;
+    }
+
+    public void setHb(String hb) {
+        this.hb = hb;
+    }
+
+    public String getHb() {
+        return hb;
+    }
+
+    public void setByzk(String byzk) {
+        this.byzk = byzk;
+    }
+
+    public String getByzk() {
+        return byzk;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setBlood(String blood) {
+        this.blood = blood;
+    }
+
+    public String getBlood() {
+        return blood;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setPicIds(String picIds) {
+        this.picIds = picIds;
+    }
+
+    public String getPicIds() {
+        return picIds;
+    }
+
+    public void setPictures(String pictures) {
+        this.pictures = pictures;
+    }
+
+    public String getPictures() {
+        return pictures;
+    }
+
+    public void setAllPicIds(String allPicIds) {
+        this.allPicIds = allPicIds;
+    }
+
+    public String getAllPicIds() {
+        return allPicIds;
+    }
+
+    public void setAllPics(String allPics) {
+        this.allPics = allPics;
+    }
+
+    public String getAllPics() {
+        return allPics;
+    }
+
+    public void setErrorCorrect(String errorCorrect) {
+        this.errorCorrect = errorCorrect;
+    }
+
+    public String getErrorCorrect() {
+        return errorCorrect;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditResult(String auditResult) {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult() {
+        return auditResult;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("ywType", getYwType())
+                .append("muId", getMuId())
+                .append("muPath", getMuPath())
+                .append("relation", getRelation())
+                .append("name", getName())
+                .append("sex", getSex())
+                .append("birthday", getBirthday())
+                .append("address", getAddress())
+                .append("nation", getNation())
+                .append("zjxy", getZjxy())
+                .append("whcd", getWhcd())
+                .append("hyzk", getHyzk())
+                .append("zyjfwcs", getZyjfwcs())
+                .append("bxsqtzz", getBxsqtzz())
+                .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk())
+                .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk())
+                .append("jiguan", getJiguan())
+                .append("xzz", getXzz())
+                .append("hzName", getHzName())
+                .append("hb", getHb())
+                .append("byzk", getByzk())
+                .append("height", getHeight())
+                .append("blood", getBlood())
+                .append("zy", getZy())
+                .append("cardId", getCardId())
+                .append("picIds", getPicIds())
+                .append("pictures", getPictures())
+                .append("allPicIds", getAllPicIds())
+                .append("allPics", getAllPics())
+                .append("errorCorrect", getErrorCorrect())
+                .append("auditStatus", getAuditStatus())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdjczk.java

@@ -0,0 +1,740 @@
+package com.da.dangan.domain.vo;
+
+import com.da.common.annotation.Excel;
+import com.da.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 常住人口登记对象 da_czrkdj
+ *
+ * @author hs
+ * @date 2024-06-14
+ */
+public class Czrkdjczk extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 业务类型(字典)
+     */
+    //@Excel(name = "业务类型",dictType = "yw_type")
+    private String ywType;
+
+    /**
+     * 目录id
+     */
+    //@Excel(name = "目录id")
+    private Long muId;
+
+    /** 档案目录路径 */
+    @Excel(name = "档案目录路径")
+    private String muPath;
+
+    /**
+     * 与户主关系
+     */
+    @Excel(name = "与户主关系")
+    private String relation;
+
+    /**
+     * 姓名
+     */
+    @Excel(name = "姓名")
+    private String name;
+
+    /**
+     * 别名
+     */
+    @Excel(name = "别名")
+    private String otherName;
+
+    /**
+     * 性别
+     */
+    @Excel(name = "性别")
+    private String sex;
+
+    /** 出生日期 */
+    @Excel(name = "出生日期")
+    private String birthday;
+
+    /**
+     * 出生地址
+     */
+    @Excel(name = "出生地址")
+    private String address;
+
+    /**
+     * 原籍
+     */
+    @Excel(name = "原籍")
+    private String yj;
+
+    /**
+     * 民族
+     */
+    @Excel(name = "民族")
+    private String nation;
+
+    /**
+     * 宗教信仰
+     */
+    @Excel(name = "宗教信仰")
+    private String zjxy;
+
+    /**
+     * 文化程度
+     */
+    @Excel(name = "文化程度")
+    private String whcd;
+
+    /**
+     * 婚姻状况
+     */
+    @Excel(name = "婚姻状况")
+    private String hyzk;
+
+    /**
+     * 职业及服务处所
+     */
+    @Excel(name = "职业及服务处所")
+    private String zyjfwcs;
+
+    /**
+     * 本县(市)其他住址
+     */
+    @Excel(name = "本县(市)其他住址")
+    private String bxsqtzz;
+
+    /**
+     * 公民证代号号码签发
+     * 公民证代号号码签发机关及日期
+     */
+    @Excel(name = "公民证代号号码签发机关及日期")
+    private String gmzdhhmqfjgjrq;
+
+    /**
+     * 何时由何地迁来本县市何时登记户口
+     */
+    @Excel(name = "何时由何地迁来本县市何时登记户口")
+    private String hsyhdqlbxshsdjhk;
+
+    /**
+     * 何时由本县、市何处迁来何时登记户口
+     */
+    @Excel(name = "何时由本县、市何处迁来何时登记户口")
+    private String hsybxshcqlhsdjhk;
+
+    /**
+     * 注销户口日期
+     */
+    @Excel(name = "注销户口日期")
+    private String zxhkrq;
+
+    /**
+     * 注销户口原因
+     */
+    @Excel(name = "注销户口原因")
+    private String zxhkyy;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_1
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_1")
+    private String hkdjsxbgjznrsjjblrz1;
+
+    /**
+     * 户口登记事项变更记载内容、时间及办理人章_2
+     */
+    @Excel(name = "户口登记事项变更记载内容、时间及办理人章_2")
+    private String hkdjsxbgjznrsjjblrz2;
+
+    /**
+     * 籍贯
+     */
+    @Excel(name = "籍贯")
+    private String jiguan;
+
+    /**
+     * 现住址
+     */
+    @Excel(name = "现住址")
+    private String xzz;
+
+    /**
+     * 户主姓名
+     */
+    @Excel(name = "户主姓名")
+    private String hzName;
+
+    /**
+     * 户别
+     */
+    @Excel(name = "户别")
+    private String hb;
+
+    /**
+     * 登记日期
+     */
+    @Excel(name = "登记日期")
+    private String djrq;
+
+    /**
+     * 兵役状况
+     */
+    @Excel(name = "兵役状况")
+    private String byzk;
+
+    /**
+     * 身高
+     */
+    @Excel(name = "身高")
+    private String height;
+
+    /**
+     * 血型
+     */
+    @Excel(name = "血型")
+    private String blood;
+
+    /**
+     * 职业
+     */
+    @Excel(name = "职业")
+    private String zy;
+
+    /**
+     * 申领居民身份证原因
+     */
+    @Excel(name = "申领居民身份证原因")
+    private String slReason;
+
+    /**
+     * 申领居民身份证签名
+     */
+    @Excel(name = "申领居民身份证签名")
+    private String sljmsfzqm;
+
+    /**
+     * 签发意见
+     */
+    @Excel(name = "签发意见")
+    private String qfyj;
+
+    /**
+     * 有效日期
+     */
+    @Excel(name = "有效日期")
+    private String yxrq;
+
+    /**
+     * 身份证号
+     */
+    @Excel(name = "身份证号")
+    private String cardId;
+
+    /**
+     * 识别图片id
+     */
+    @Excel(name = "识别图片id")
+    private String picIds;
+
+    /**
+     * 识别图片
+     */
+    @Excel(name = "识别图片")
+    private String pictures;
+
+    /**
+     * 相关图片id
+     */
+    @Excel(name = "相关图片id")
+    private String allPicIds;
+
+    /**
+     * 相关图片
+     */
+    @Excel(name = "相关图片")
+    private String allPics;
+
+    /**
+     * 是否纠错(字典0否1是)
+     */
+    @Excel(name = "是否纠错",dictType = "error_correct")
+    private String errorCorrect;
+
+    /**
+     * 审核状态(字典)
+     */
+    @Excel(name = "审核状态",dictType = "audit_status")
+    private String auditStatus;
+
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人")
+    private String auditName;
+
+    /**
+     * 审核结果
+     */
+    @Excel(name = "审核结果")
+    private String auditResult;
+
+    /**
+     * 审核原由
+     */
+    @Excel(name = "审核原由")
+    private String auditReason;
+
+    /**
+     * 当前用户id
+     */
+    private Long userId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getMuPath() {
+        return muPath;
+    }
+
+    public void setMuPath(String muPath) {
+        this.muPath = muPath;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setYwType(String ywType) {
+        this.ywType = ywType;
+    }
+
+    public String getYwType() {
+        return ywType;
+    }
+
+    public void setMuId(Long muId) {
+        this.muId = muId;
+    }
+
+    public Long getMuId() {
+        return muId;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setOtherName(String otherName) {
+        this.otherName = otherName;
+    }
+
+    public String getOtherName() {
+        return otherName;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setYj(String yj) {
+        this.yj = yj;
+    }
+
+    public String getYj() {
+        return yj;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setZjxy(String zjxy) {
+        this.zjxy = zjxy;
+    }
+
+    public String getZjxy() {
+        return zjxy;
+    }
+
+    public void setWhcd(String whcd) {
+        this.whcd = whcd;
+    }
+
+    public String getWhcd() {
+        return whcd;
+    }
+
+    public void setHyzk(String hyzk) {
+        this.hyzk = hyzk;
+    }
+
+    public String getHyzk() {
+        return hyzk;
+    }
+
+    public void setZyjfwcs(String zyjfwcs) {
+        this.zyjfwcs = zyjfwcs;
+    }
+
+    public String getZyjfwcs() {
+        return zyjfwcs;
+    }
+
+    public void setBxsqtzz(String bxsqtzz) {
+        this.bxsqtzz = bxsqtzz;
+    }
+
+    public String getBxsqtzz() {
+        return bxsqtzz;
+    }
+
+    public void setGmzdhhmqfjgjrq(String gmzdhhmqfjgjrq) {
+        this.gmzdhhmqfjgjrq = gmzdhhmqfjgjrq;
+    }
+
+    public String getGmzdhhmqfjgjrq() {
+        return gmzdhhmqfjgjrq;
+    }
+
+    public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) {
+        this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk;
+    }
+
+    public String getHsyhdqlbxshsdjhk() {
+        return hsyhdqlbxshsdjhk;
+    }
+
+    public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) {
+        this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk;
+    }
+
+    public String getHsybxshcqlhsdjhk() {
+        return hsybxshcqlhsdjhk;
+    }
+
+    public void setZxhkrq(String zxhkrq) {
+        this.zxhkrq = zxhkrq;
+    }
+
+    public String getZxhkrq() {
+        return zxhkrq;
+    }
+
+    public void setZxhkyy(String zxhkyy) {
+        this.zxhkyy = zxhkyy;
+    }
+
+    public String getZxhkyy() {
+        return zxhkyy;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz1(String hkdjsxbgjznrsjjblrz1) {
+        this.hkdjsxbgjznrsjjblrz1 = hkdjsxbgjznrsjjblrz1;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz1() {
+        return hkdjsxbgjznrsjjblrz1;
+    }
+
+    public void setHkdjsxbgjznrsjjblrz2(String hkdjsxbgjznrsjjblrz2) {
+        this.hkdjsxbgjznrsjjblrz2 = hkdjsxbgjznrsjjblrz2;
+    }
+
+    public String getHkdjsxbgjznrsjjblrz2() {
+        return hkdjsxbgjznrsjjblrz2;
+    }
+
+    public void setJiguan(String jiguan) {
+        this.jiguan = jiguan;
+    }
+
+    public String getJiguan() {
+        return jiguan;
+    }
+
+    public void setXzz(String xzz) {
+        this.xzz = xzz;
+    }
+
+    public String getXzz() {
+        return xzz;
+    }
+
+    public void setHzName(String hzName) {
+        this.hzName = hzName;
+    }
+
+    public String getHzName() {
+        return hzName;
+    }
+
+    public void setHb(String hb) {
+        this.hb = hb;
+    }
+
+    public String getHb() {
+        return hb;
+    }
+
+    public void setDjrq(String djrq) {
+        this.djrq = djrq;
+    }
+
+    public String getDjrq() {
+        return djrq;
+    }
+
+    public void setByzk(String byzk) {
+        this.byzk = byzk;
+    }
+
+    public String getByzk() {
+        return byzk;
+    }
+
+    public void setHeight(String height) {
+        this.height = height;
+    }
+
+    public String getHeight() {
+        return height;
+    }
+
+    public void setBlood(String blood) {
+        this.blood = blood;
+    }
+
+    public String getBlood() {
+        return blood;
+    }
+
+    public void setZy(String zy) {
+        this.zy = zy;
+    }
+
+    public String getZy() {
+        return zy;
+    }
+
+    public void setSlReason(String slReason) {
+        this.slReason = slReason;
+    }
+
+    public String getSlReason() {
+        return slReason;
+    }
+
+    public void setSljmsfzqm(String sljmsfzqm) {
+        this.sljmsfzqm = sljmsfzqm;
+    }
+
+    public String getSljmsfzqm() {
+        return sljmsfzqm;
+    }
+
+    public void setQfyj(String qfyj) {
+        this.qfyj = qfyj;
+    }
+
+    public String getQfyj() {
+        return qfyj;
+    }
+
+    public void setYxrq(String yxrq) {
+        this.yxrq = yxrq;
+    }
+
+    public String getYxrq() {
+        return yxrq;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setPicIds(String picIds) {
+        this.picIds = picIds;
+    }
+
+    public String getPicIds() {
+        return picIds;
+    }
+
+    public void setPictures(String pictures) {
+        this.pictures = pictures;
+    }
+
+    public String getPictures() {
+        return pictures;
+    }
+
+    public void setAllPicIds(String allPicIds) {
+        this.allPicIds = allPicIds;
+    }
+
+    public String getAllPicIds() {
+        return allPicIds;
+    }
+
+    public void setAllPics(String allPics) {
+        this.allPics = allPics;
+    }
+
+    public String getAllPics() {
+        return allPics;
+    }
+
+    public void setErrorCorrect(String errorCorrect) {
+        this.errorCorrect = errorCorrect;
+    }
+
+    public String getErrorCorrect() {
+        return errorCorrect;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditResult(String auditResult) {
+        this.auditResult = auditResult;
+    }
+
+    public String getAuditResult() {
+        return auditResult;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason;
+    }
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("ywType", getYwType())
+                .append("muId", getMuId())
+                .append("muPath", getMuPath())
+                .append("relation", getRelation())
+                .append("name", getName())
+                .append("otherName", getOtherName())
+                .append("sex", getSex())
+                .append("birthday", getBirthday())
+                .append("address", getAddress())
+                .append("yj", getYj())
+                .append("nation", getNation())
+                .append("zjxy", getZjxy())
+                .append("whcd", getWhcd())
+                .append("hyzk", getHyzk())
+                .append("zyjfwcs", getZyjfwcs())
+                .append("bxsqtzz", getBxsqtzz())
+                .append("gmzdhhmqfjgjrq", getGmzdhhmqfjgjrq())
+                .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk())
+                .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk())
+                .append("zxhkrq", getZxhkrq())
+                .append("zxhkyy", getZxhkyy())
+                .append("hkdjsxbgjznrsjjblrz1", getHkdjsxbgjznrsjjblrz1())
+                .append("hkdjsxbgjznrsjjblrz2", getHkdjsxbgjznrsjjblrz2())
+                .append("jiguan", getJiguan())
+                .append("xzz", getXzz())
+                .append("hzName", getHzName())
+                .append("hb", getHb())
+                .append("djrq", getDjrq())
+                .append("byzk", getByzk())
+                .append("height", getHeight())
+                .append("blood", getBlood())
+                .append("zy", getZy())
+                .append("slReason", getSlReason())
+                .append("sljmsfzqm", getSljmsfzqm())
+                .append("qfyj", getQfyj())
+                .append("yxrq", getYxrq())
+                .append("cardId", getCardId())
+                .append("picIds", getPicIds())
+                .append("pictures", getPictures())
+                .append("allPicIds", getAllPicIds())
+                .append("allPics", getAllPics())
+                .append("errorCorrect", getErrorCorrect())
+                .append("auditStatus", getAuditStatus())
+                .append("auditName", getAuditName())
+                .append("auditResult", getAuditResult())
+                .append("auditReason", getAuditReason())
+                .append("remark", getRemark())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

dangan-dangan/src/main/java/com/da/dangan/domain/vo/PicParams.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaPicturesRecard;
 import java.util.List;
 
 public class PicParams {
+    private static final long serialVersionUID = 1L;
     private List<DaPicturesRecard> checked;
     private List<DaPicturesRecard> unchecked;
     private String singeOrDouble;  //单双面    0单面   1双面

dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaQyz;
 import java.util.List;
 
 public class QyzDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaQyz> info;
 

dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaYtzm;
 import java.util.List;
 
 public class YtzmDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaYtzm> info;
 

dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaZfnyhkcg;
 import java.util.List;
 
 public class ZfnyDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaZfnyhkcg> info;
 

dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java

@@ -5,6 +5,7 @@ import com.da.dangan.domain.DaZqz;
 import java.util.List;
 
 public class ZqzDatas {
+    private static final long serialVersionUID = 1L;
     private List<Long> Picid;
     private List<DaZqz> info;
 

dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml

@@ -11,7 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="relation"    column="relation"    />
         <result property="name"    column="name"    />
         <result property="otherName"    column="other_name"    />
+        <result property="usedName"    column="used_name"    />
         <result property="sex"    column="sex"    />
+        <result property="jhr1"    column="jhr1"    />
+        <result property="jhgx1"    column="jhgx1"    />
+        <result property="jhr2"    column="jhr2"    />
+        <result property="jhgx2"    column="jhgx2"    />
+        <result property="gmcszqfrq"    column="gmcszqfrq"    />
         <result property="birthday"    column="birthday"    />
         <result property="address"    column="address"    />
         <result property="yj"    column="yj"    />
@@ -24,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gmzdhhmqfjgjrq"    column="gmzdhhmqfjgjrq"    />
         <result property="hsyhdqlbxshsdjhk"    column="hsyhdqlbxshsdjhk"    />
         <result property="hsybxshcqlhsdjhk"    column="hsybxshcqlhsdjhk"    />
+        <result property="hshyqwhd"    column="hshyqwhd"    />
         <result property="zxhkrq"    column="zxhkrq"    />
         <result property="zxhkyy"    column="zxhkyy"    />
         <result property="hkdjsxbgjznrsjjblrz1"    column="hkdjsxbgjznrsjjblrz1"    />
@@ -59,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDaCzrkdjVo">
-        select id, yw_type, mu_id, mu_path, relation, name, other_name, sex, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, hkdjsxbgjznrsjjblrz2, jiguan, xzz, hz_name, hb, djrq, byzk, height, blood, zy, sl_reason, sljmsfzqm, qfyj, yxrq, card_id, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
+        select id, yw_type, mu_id, mu_path, relation, name, other_name, used_name, sex, jhr1, jhgx1, jhr2, jhgx2, gmcszqfrq, birthday, address, yj, nation, zjxy, whcd, hyzk, zyjfwcs, bxsqtzz, gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, hshyqwhd, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, hkdjsxbgjznrsjjblrz2, jiguan, xzz, hz_name, hb, djrq, byzk, height, blood, zy, sl_reason, sljmsfzqm, qfyj, yxrq, card_id, pic_ids, pictures, all_pic_ids, all_pics, error_correct, audit_status, audit_name, audit_result, audit_reason, remark, create_by, create_time, update_by, update_time from da_czrkdj
     </sql>
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
@@ -75,11 +82,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and ( name like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%')
                 or other_name like concat('%', #{name}, '%')
+                or used_name like concat('%', #{name}, '%')
+                or jhr1 like concat('%', #{name}, '%')
+                or jhr2 like concat('%', #{name}, '%')
                 )
              </if>
             <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
+            <if test="usedName != null  and usedName != ''"> and used_name like concat('%', #{usedName}, '%')</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="birthday != null "> and birthday = #{birthday}</if>
+            <if test="jhr1 != null  and jhr1 != ''"> and jhr1 = #{jhr1}</if>
+            <if test="jhgx1 != null  and jhgx1 != ''"> and jhgx1 = #{jhgx1}</if>
+            <if test="jhr2 != null  and jhr2 != ''"> and jhr2 = #{jhr2}</if>
+            <if test="jhgx2 != null  and jhgx2 != ''"> and jhgx2 = #{jhgx2}</if>
+            <if test="gmcszqfrq != null  and gmcszqfrq != ''"> and gmcszqfrq = #{gmcszqfrq}</if>
+            <if test="birthday != null  and birthday != ''"> and birthday = #{birthday}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="yj != null  and yj != ''"> and yj = #{yj}</if>
             <if test="nation != null  and nation != ''"> and nation = #{nation}</if>
@@ -91,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmzdhhmqfjgjrq != null  and gmzdhhmqfjgjrq != ''"> and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}</if>
             <if test="hsyhdqlbxshsdjhk != null  and hsyhdqlbxshsdjhk != ''"> and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}</if>
             <if test="hsybxshcqlhsdjhk != null  and hsybxshcqlhsdjhk != ''"> and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}</if>
+            <if test="hshyqwhd != null  and hshyqwhd != ''"> and hshyqwhd = #{hshyqwhd}</if>
             <if test="zxhkrq != null  and zxhkrq != ''"> and zxhkrq = #{zxhkrq}</if>
             <if test="zxhkyy != null  and zxhkyy != ''"> and zxhkyy = #{zxhkyy}</if>
             <if test="hkdjsxbgjznrsjjblrz1 != null  and hkdjsxbgjznrsjjblrz1 != ''"> and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}</if>
@@ -130,15 +147,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ywType != null  and ywType != ''"> and yw_type = #{ywType}</if>
             <if test="muId != null "> and c.mu_id = #{muId}</if>
             <if test="muPath != null  and muPath != ''"> and mu_path = #{muPath}</if>
+            <if test="relation != null  and relation != ''"> and relation = #{relation}</if>
             <if test="name != null  and name != ''">
                 and ( name like concat('%', #{name}, '%')
                 or hz_name like concat('%', #{name}, '%')
                 or other_name like concat('%', #{name}, '%')
+                or used_name like concat('%', #{name}, '%')
+                or jhr1 like concat('%', #{name}, '%')
+                or jhr2 like concat('%', #{name}, '%')
                 )
             </if>
             <if test="otherName != null  and otherName != ''"> and other_name like concat('%', #{otherName}, '%')</if>
+            <if test="usedName != null  and usedName != ''"> and used_name like concat('%', #{usedName}, '%')</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
-            <if test="birthday != null "> and birthday = #{birthday}</if>
+            <if test="jhr1 != null  and jhr1 != ''"> and jhr1 = #{jhr1}</if>
+            <if test="jhgx1 != null  and jhgx1 != ''"> and jhgx1 = #{jhgx1}</if>
+            <if test="jhr2 != null  and jhr2 != ''"> and jhr2 = #{jhr2}</if>
+            <if test="jhgx2 != null  and jhgx2 != ''"> and jhgx2 = #{jhgx2}</if>
+            <if test="gmcszqfrq != null  and gmcszqfrq != ''"> and gmcszqfrq = #{gmcszqfrq}</if>
+            <if test="birthday != null  and birthday != ''"> and birthday = #{birthday}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="yj != null  and yj != ''"> and yj = #{yj}</if>
             <if test="nation != null  and nation != ''"> and nation = #{nation}</if>
@@ -150,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmzdhhmqfjgjrq != null  and gmzdhhmqfjgjrq != ''"> and gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}</if>
             <if test="hsyhdqlbxshsdjhk != null  and hsyhdqlbxshsdjhk != ''"> and hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}</if>
             <if test="hsybxshcqlhsdjhk != null  and hsybxshcqlhsdjhk != ''"> and hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}</if>
+            <if test="hshyqwhd != null  and hshyqwhd != ''"> and hshyqwhd = #{hshyqwhd}</if>
             <if test="zxhkrq != null  and zxhkrq != ''"> and zxhkrq = #{zxhkrq}</if>
             <if test="zxhkyy != null  and zxhkyy != ''"> and zxhkyy = #{zxhkyy}</if>
             <if test="hkdjsxbgjznrsjjblrz1 != null  and hkdjsxbgjznrsjjblrz1 != ''"> and hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}</if>
@@ -195,7 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation != null">relation,</if>
             <if test="name != null">name,</if>
             <if test="otherName != null">other_name,</if>
+            <if test="usedName != null">used_name,</if>
             <if test="sex != null">sex,</if>
+            <if test="jhr1 != null">jhr1,</if>
+            <if test="jhgx1 != null">jhgx1,</if>
+            <if test="jhr2 != null">jhr2,</if>
+            <if test="jhgx2 != null">jhgx2,</if>
+            <if test="gmcszqfrq != null">gmcszqfrq,</if>
             <if test="birthday != null">birthday,</if>
             <if test="address != null">address,</if>
             <if test="yj != null">yj,</if>
@@ -208,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmzdhhmqfjgjrq != null">gmzdhhmqfjgjrq,</if>
             <if test="hsyhdqlbxshsdjhk != null">hsyhdqlbxshsdjhk,</if>
             <if test="hsybxshcqlhsdjhk != null">hsybxshcqlhsdjhk,</if>
+            <if test="hshyqwhd != null">hshyqwhd,</if>
             <if test="zxhkrq != null">zxhkrq,</if>
             <if test="zxhkyy != null">zxhkyy,</if>
             <if test="hkdjsxbgjznrsjjblrz1 != null">hkdjsxbgjznrsjjblrz1,</if>
@@ -248,7 +283,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation != null">#{relation},</if>
             <if test="name != null">#{name},</if>
             <if test="otherName != null">#{otherName},</if>
+            <if test="usedName != null">#{usedName},</if>
             <if test="sex != null">#{sex},</if>
+            <if test="jhr1 != null">#{jhr1},</if>
+            <if test="jhgx1 != null">#{jhgx1},</if>
+            <if test="jhr2 != null">#{jhr2},</if>
+            <if test="jhgx2 != null">#{jhgx2},</if>
+            <if test="gmcszqfrq != null">#{gmcszqfrq},</if>
             <if test="birthday != null">#{birthday},</if>
             <if test="address != null">#{address},</if>
             <if test="yj != null">#{yj},</if>
@@ -261,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmzdhhmqfjgjrq != null">#{gmzdhhmqfjgjrq},</if>
             <if test="hsyhdqlbxshsdjhk != null">#{hsyhdqlbxshsdjhk},</if>
             <if test="hsybxshcqlhsdjhk != null">#{hsybxshcqlhsdjhk},</if>
+            <if test="hshyqwhd != null">#{hshyqwhd},</if>
             <if test="zxhkrq != null">#{zxhkrq},</if>
             <if test="zxhkyy != null">#{zxhkyy},</if>
             <if test="hkdjsxbgjznrsjjblrz1 != null">#{hkdjsxbgjznrsjjblrz1},</if>
@@ -305,7 +347,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relation != null">relation = #{relation},</if>
             <if test="name != null">name = #{name},</if>
             <if test="otherName != null">other_name = #{otherName},</if>
+            <if test="usedName != null">used_name = #{usedName},</if>
             <if test="sex != null">sex = #{sex},</if>
+            <if test="jhr1 != null">jhr1 = #{jhr1},</if>
+            <if test="jhgx1 != null">jhgx1 = #{jhgx1},</if>
+            <if test="jhr2 != null">jhr2 = #{jhr2},</if>
+            <if test="jhgx2 != null">jhgx2 = #{jhgx2},</if>
+            <if test="gmcszqfrq != null">gmcszqfrq = #{gmcszqfrq},</if>
             <if test="birthday != null">birthday = #{birthday},</if>
             <if test="address != null">address = #{address},</if>
             <if test="yj != null">yj = #{yj},</if>
@@ -318,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="gmzdhhmqfjgjrq != null">gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq},</if>
             <if test="hsyhdqlbxshsdjhk != null">hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk},</if>
             <if test="hsybxshcqlhsdjhk != null">hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk},</if>
+            <if test="hshyqwhd != null">hshyqwhd = #{hshyqwhd},</if>
             <if test="zxhkrq != null">zxhkrq = #{zxhkrq},</if>
             <if test="zxhkyy != null">zxhkyy = #{zxhkyy},</if>
             <if test="hkdjsxbgjznrsjjblrz1 != null">hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1},</if>