diff --git a/dangan-admin/src/main/resources/application-hs.yml b/dangan-admin/src/main/resources/application-hs.yml index ef6e955..c9836a7 100644 --- a/dangan-admin/src/main/resources/application-hs.yml +++ b/dangan-admin/src/main/resources/application-hs.yml @@ -7,8 +7,11 @@ spring: # 主库数据源 master: url: jdbc:mysql://localhost:3307/dangan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #url: jdbc:mysql://localhost:3306/dangan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root + #username: dangan password: hs123456 + #password: dangan # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/dangan-admin/src/main/resources/application-prod.yml b/dangan-admin/src/main/resources/application-prod.yml index 9c94644..5068924 100644 --- a/dangan-admin/src/main/resources/application-prod.yml +++ b/dangan-admin/src/main/resources/application-prod.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/dangan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: dangan + password: Huawei12#$ # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/dangan-admin/src/main/resources/application.yml b/dangan-admin/src/main/resources/application.yml index ab346d0..697c00f 100644 --- a/dangan-admin/src/main/resources/application.yml +++ b/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 # 令牌密钥 @@ -132,4 +134,6 @@ xss: ocr: #第三方访问地址 - url: http://123.57.142.195:443/upload_api \ No newline at end of file + url: http://123.57.142.195:443/upload_api + #url: http://localhost:22443/upload_api + #20.206.150.166 \ No newline at end of file diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java index 1f7c2c5..be546ae 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCzrkdjController.java +++ b/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,9 +66,58 @@ public class DaCzrkdjController extends BaseController { @Log(title = "常住人口登记", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, DaCzrkdj daCzrkdj) { + List czrkdj1=new ArrayList<>(); + List czrkdj2=new ArrayList<>(); + List czrkdj3=new ArrayList<>(); + List czrkdjczk=new ArrayList<>(); List list = daCzrkdjService.selectDaCzrkdjList(daCzrkdj); - ExcelUtil util = new ExcelUtil(DaCzrkdj.class); - util.exportExcel(response, list, "常住人口登记数据"); + 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 util1 = new ExcelUtil(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 util2 = new ExcelUtil(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 util3 = new ExcelUtil(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 util4 = new ExcelUtil(Czrkdjczk.class); + util4.exportExcel(response, czrkdjczk, "常住卡"); + break; + } + }else{ + ExcelUtil util = new ExcelUtil(DaCzrkdj.class); + util.exportExcel(response, list, "常住人口登记数据"); + } } /** diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java index 7c96782..6a89006 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaCzrkdj.java @@ -14,259 +14,198 @@ import org.apache.commons.lang3.builder.ToStringStyle; public class DaCzrkdj extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * id - */ + /** id */ private Long id; - /** - * 业务类型(字典) - */ - @Excel(name = "业务类型",dictType = "yw_type") + /** 业务类型(字典) */ + //@Excel(name = "业务类型(字典)") private String ywType; - /** - * 目录id - */ - @Excel(name = "目录id") + /** 目录id */ + //@Excel(name = "目录id") private Long muId; /** 档案目录路径 */ @Excel(name = "档案目录路径") private String muPath; - public String getMuPath() { - return muPath; - } - - public void setMuPath(String muPath) { - this.muPath = muPath; - } - - /** - * 与户主关系 - */ + /** 与户主关系 */ @Excel(name = "与户主关系") private String relation; - /** - * 姓名 - */ + /** 姓名 */ @Excel(name = "姓名") private String name; - /** - * 别名 - */ + /** 别名 */ @Excel(name = "别名") private String otherName; - /** - * 性别 - */ + /** 曾用名 */ + @Excel(name = "曾用名") + private String usedName; + + /** 性别 */ @Excel(name = "性别") private String sex; + /** 监护人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 gmcszqfrq; + /** 出生日期 */ @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 hshyqwhd; + + /** 注销户口日期 */ @Excel(name = "注销户口日期") private String zxhkrq; - /** - * 注销户口原因 - */ + /** 注销户口原因 */ @Excel(name = "注销户口原因") private String zxhkyy; - /** - * 户口登记事项变更记载内容、时间及办理人章_1 - */ + /** 户口登记事项变更记载内容、时间及办理人章_1 */ @Excel(name = "户口登记事项变更记载内容、时间及办理人章_1") private String hkdjsxbgjznrsjjblrz1; - /** - * 户口登记事项变更记载内容、时间及办理人章_2 - */ + /** 户口登记事项变更记载内容、时间及办理人章_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 = "有效日期") + /** 居民身份证签发日期及有效日期 */ + @Excel(name = "居民身份证签发日期及有效日期") private String yxrq; - /** - * 身份证号 - */ + /** 身份证号 */ @Excel(name = "身份证号") private String cardId; - /** - * 识别图片id - */ + /** 识别图片id */ @Excel(name = "识别图片id") private String picIds; - /** - * 识别图片 - */ + /** 识别图片 */ @Excel(name = "识别图片") private String pictures; - /** - * 相关图片id - */ + /** 相关图片id */ @Excel(name = "相关图片id") private String allPicIds; - /** - * 相关图片 - */ + /** 相关图片 */ @Excel(name = "相关图片") private String allPics; @@ -282,21 +221,15 @@ public class DaCzrkdj extends BaseEntity { @Excel(name = "审核状态",dictType = "audit_status") private String auditStatus; - /** - * 审核人 - */ + /** 审核人 */ @Excel(name = "审核人") private String auditName; - /** - * 审核结果 - */ + /** 审核结果 */ @Excel(name = "审核结果") private String auditResult; - /** - * 审核原由 - */ + /** 审核原由 */ @Excel(name = "审核原由") private String auditReason; @@ -312,377 +245,496 @@ public class DaCzrkdj extends BaseEntity { public void setUserId(Long userId) { this.userId = userId; } - public void setId(Long id) { + public void setId(Long id) + { this.id = id; } - public Long getId() { + public Long getId() + { return id; } - - public void setYwType(String ywType) { + public void setYwType(String ywType) + { this.ywType = ywType; } - public String getYwType() { + public String getYwType() + { return ywType; } - - public void setMuId(Long muId) { + public void setMuId(Long muId) + { this.muId = muId; } - public Long getMuId() { + public Long getMuId() + { return muId; } + public void setMuPath(String muPath) + { + this.muPath = muPath; + } - public void setRelation(String relation) { + public String getMuPath() + { + return muPath; + } + public void setRelation(String relation) + { this.relation = relation; } - public String getRelation() { + public String getRelation() + { return relation; } - - public void setName(String name) { + public void setName(String name) + { this.name = name; } - public String getName() { + public String getName() + { return name; } - - public void setOtherName(String otherName) { + public void setOtherName(String otherName) + { this.otherName = otherName; } - public String getOtherName() { + public String getOtherName() + { return otherName; } + public void setUsedName(String usedName) + { + this.usedName = usedName; + } - public void setSex(String sex) { + public String getUsedName() + { + return usedName; + } + public void setSex(String sex) + { this.sex = sex; } - public String getSex() { + public String getSex() + { return sex; } + public void setJhr1(String jhr1) + { + this.jhr1 = jhr1; + } - public String getBirthday() { - return birthday; + public String getJhr1() + { + return jhr1; + } + public void setJhgx1(String jhgx1) + { + this.jhgx1 = jhgx1; } - public void setBirthday(String birthday) { + public String getJhgx1() + { + return jhgx1; + } + public void setJhr2(String jhr2) + { + this.jhr2 = jhr2; + } + + public String getJhr2() + { + return jhr2; + } + public void setJhgx2(String jhgx2) + { + this.jhgx2 = jhgx2; + } + + public String getJhgx2() + { + return jhgx2; + } + public void setGmcszqfrq(String gmcszqfrq) + { + this.gmcszqfrq = gmcszqfrq; + } + + public String getGmcszqfrq() + { + return gmcszqfrq; + } + public void setBirthday(String birthday) + { this.birthday = birthday; } - public void setAddress(String address) { + public String getBirthday() + { + return birthday; + } + public void setAddress(String address) + { this.address = address; } - public String getAddress() { + public String getAddress() + { return address; } - - public void setYj(String yj) { + public void setYj(String yj) + { this.yj = yj; } - public String getYj() { + public String getYj() + { return yj; } - - public void setNation(String nation) { + public void setNation(String nation) + { this.nation = nation; } - public String getNation() { + public String getNation() + { return nation; } - - public void setZjxy(String zjxy) { + public void setZjxy(String zjxy) + { this.zjxy = zjxy; } - public String getZjxy() { + public String getZjxy() + { return zjxy; } - - public void setWhcd(String whcd) { + public void setWhcd(String whcd) + { this.whcd = whcd; } - public String getWhcd() { + public String getWhcd() + { return whcd; } - - public void setHyzk(String hyzk) { + public void setHyzk(String hyzk) + { this.hyzk = hyzk; } - public String getHyzk() { + public String getHyzk() + { return hyzk; } - - public void setZyjfwcs(String zyjfwcs) { + public void setZyjfwcs(String zyjfwcs) + { this.zyjfwcs = zyjfwcs; } - public String getZyjfwcs() { + public String getZyjfwcs() + { return zyjfwcs; } - - public void setBxsqtzz(String bxsqtzz) { + public void setBxsqtzz(String bxsqtzz) + { this.bxsqtzz = bxsqtzz; } - public String getBxsqtzz() { + public String getBxsqtzz() + { return bxsqtzz; } - - public void setGmzdhhmqfjgjrq(String gmzdhhmqfjgjrq) { + public void setGmzdhhmqfjgjrq(String gmzdhhmqfjgjrq) + { this.gmzdhhmqfjgjrq = gmzdhhmqfjgjrq; } - public String getGmzdhhmqfjgjrq() { + public String getGmzdhhmqfjgjrq() + { return gmzdhhmqfjgjrq; } - - public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) { + public void setHsyhdqlbxshsdjhk(String hsyhdqlbxshsdjhk) + { this.hsyhdqlbxshsdjhk = hsyhdqlbxshsdjhk; } - public String getHsyhdqlbxshsdjhk() { + public String getHsyhdqlbxshsdjhk() + { return hsyhdqlbxshsdjhk; } - - public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) { + public void setHsybxshcqlhsdjhk(String hsybxshcqlhsdjhk) + { this.hsybxshcqlhsdjhk = hsybxshcqlhsdjhk; } - public String getHsybxshcqlhsdjhk() { + public String getHsybxshcqlhsdjhk() + { return hsybxshcqlhsdjhk; } + public void setHshyqwhd(String hshyqwhd) + { + this.hshyqwhd = hshyqwhd; + } - public void setZxhkrq(String zxhkrq) { + public String getHshyqwhd() + { + return hshyqwhd; + } + public void setZxhkrq(String zxhkrq) + { this.zxhkrq = zxhkrq; } - public String getZxhkrq() { + public String getZxhkrq() + { return zxhkrq; } - - public void setZxhkyy(String zxhkyy) { + public void setZxhkyy(String zxhkyy) + { this.zxhkyy = zxhkyy; } - public String getZxhkyy() { + public String getZxhkyy() + { return zxhkyy; } - - public void setHkdjsxbgjznrsjjblrz1(String hkdjsxbgjznrsjjblrz1) { + public void setHkdjsxbgjznrsjjblrz1(String hkdjsxbgjznrsjjblrz1) + { this.hkdjsxbgjznrsjjblrz1 = hkdjsxbgjznrsjjblrz1; } - public String getHkdjsxbgjznrsjjblrz1() { + public String getHkdjsxbgjznrsjjblrz1() + { return hkdjsxbgjznrsjjblrz1; } - - public void setHkdjsxbgjznrsjjblrz2(String hkdjsxbgjznrsjjblrz2) { + public void setHkdjsxbgjznrsjjblrz2(String hkdjsxbgjznrsjjblrz2) + { this.hkdjsxbgjznrsjjblrz2 = hkdjsxbgjznrsjjblrz2; } - public String getHkdjsxbgjznrsjjblrz2() { + public String getHkdjsxbgjznrsjjblrz2() + { return hkdjsxbgjznrsjjblrz2; } - - public void setJiguan(String jiguan) { + public void setJiguan(String jiguan) + { this.jiguan = jiguan; } - public String getJiguan() { + public String getJiguan() + { return jiguan; } - - public void setXzz(String xzz) { + public void setXzz(String xzz) + { this.xzz = xzz; } - public String getXzz() { + public String getXzz() + { return xzz; } - - public void setHzName(String hzName) { + public void setHzName(String hzName) + { this.hzName = hzName; } - public String getHzName() { + public String getHzName() + { return hzName; } - - public void setHb(String hb) { + public void setHb(String hb) + { this.hb = hb; } - public String getHb() { + public String getHb() + { return hb; } - - public void setDjrq(String djrq) { + public void setDjrq(String djrq) + { this.djrq = djrq; } - public String getDjrq() { + public String getDjrq() + { return djrq; } - - public void setByzk(String byzk) { + public void setByzk(String byzk) + { this.byzk = byzk; } - public String getByzk() { + public String getByzk() + { return byzk; } - - public void setHeight(String height) { + public void setHeight(String height) + { this.height = height; } - public String getHeight() { + public String getHeight() + { return height; } - - public void setBlood(String blood) { + public void setBlood(String blood) + { this.blood = blood; } - public String getBlood() { + public String getBlood() + { return blood; } - - public void setZy(String zy) { + public void setZy(String zy) + { this.zy = zy; } - public String getZy() { + public String getZy() + { return zy; } - - public void setSlReason(String slReason) { + public void setSlReason(String slReason) + { this.slReason = slReason; } - public String getSlReason() { + public String getSlReason() + { return slReason; } - - public void setSljmsfzqm(String sljmsfzqm) { + public void setSljmsfzqm(String sljmsfzqm) + { this.sljmsfzqm = sljmsfzqm; } - public String getSljmsfzqm() { + public String getSljmsfzqm() + { return sljmsfzqm; } - - public void setQfyj(String qfyj) { + public void setQfyj(String qfyj) + { this.qfyj = qfyj; } - public String getQfyj() { + public String getQfyj() + { return qfyj; } - - public void setYxrq(String yxrq) { + public void setYxrq(String yxrq) + { this.yxrq = yxrq; } - public String getYxrq() { + public String getYxrq() + { return yxrq; } - - public void setCardId(String cardId) { + public void setCardId(String cardId) + { this.cardId = cardId; } - public String getCardId() { + public String getCardId() + { return cardId; } - - public void setPicIds(String picIds) { + public void setPicIds(String picIds) + { this.picIds = picIds; } - public String getPicIds() { + public String getPicIds() + { return picIds; } - - public void setPictures(String pictures) { + public void setPictures(String pictures) + { this.pictures = pictures; } - public String getPictures() { + public String getPictures() + { return pictures; } - - public void setAllPicIds(String allPicIds) { + public void setAllPicIds(String allPicIds) + { this.allPicIds = allPicIds; } - public String getAllPicIds() { + public String getAllPicIds() + { return allPicIds; } - - public void setAllPics(String allPics) { + public void setAllPics(String allPics) + { this.allPics = allPics; } - public String getAllPics() { + public String getAllPics() + { return allPics; } - - public void setErrorCorrect(String errorCorrect) { + public void setErrorCorrect(String errorCorrect) + { this.errorCorrect = errorCorrect; } - public String getErrorCorrect() { + public String getErrorCorrect() + { return errorCorrect; } - - public void setAuditStatus(String auditStatus) { + public void setAuditStatus(String auditStatus) + { this.auditStatus = auditStatus; } - public String getAuditStatus() { + public String getAuditStatus() + { return auditStatus; } - - public void setAuditName(String auditName) { + public void setAuditName(String auditName) + { this.auditName = auditName; } - public String getAuditName() { + public String getAuditName() + { return auditName; } - - public void setAuditResult(String auditResult) { + public void setAuditResult(String auditResult) + { this.auditResult = auditResult; } - public String getAuditResult() { + public String getAuditResult() + { return auditResult; } - - public void setAuditReason(String auditReason) { + public void setAuditReason(String auditReason) + { this.auditReason = auditReason; } - public String getAuditReason() { + public String getAuditReason() + { return auditReason; } @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("ywType", getYwType()) .append("muId", getMuId()) @@ -690,7 +742,13 @@ public class DaCzrkdj extends BaseEntity { .append("relation", getRelation()) .append("name", getName()) .append("otherName", getOtherName()) + .append("usedName", getUsedName()) .append("sex", getSex()) + .append("jhr1", getJhr1()) + .append("jhgx1", getJhgx1()) + .append("jhr2", getJhr2()) + .append("jhgx2", getJhgx2()) + .append("gmcszqfrq", getGmcszqfrq()) .append("birthday", getBirthday()) .append("address", getAddress()) .append("yj", getYj()) @@ -703,6 +761,7 @@ public class DaCzrkdj extends BaseEntity { .append("gmzdhhmqfjgjrq", getGmzdhhmqfjgjrq()) .append("hsyhdqlbxshsdjhk", getHsyhdqlbxshsdjhk()) .append("hsybxshcqlhsdjhk", getHsybxshcqlhsdjhk()) + .append("hshyqwhd", getHshyqwhd()) .append("zxhkrq", getZxhkrq()) .append("zxhkyy", getZxhkyy()) .append("hkdjsxbgjznrsjjblrz1", getHkdjsxbgjznrsjjblrz1()) diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java index 5fd652a..8e986ac 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CszmDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaBirthDj; import java.util.List; public class CszmDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java index d5852d4..fbea6a5 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/CzrkDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaCzrkdj; import java.util.List; public class CzrkDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj1.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj1.java new file mode 100644 index 0000000..62fcda5 --- /dev/null +++ b/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(); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj2.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj2.java new file mode 100644 index 0000000..895dea1 --- /dev/null +++ b/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(); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj3.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdj3.java new file mode 100644 index 0000000..9f87e57 --- /dev/null +++ b/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(); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdjczk.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/Czrkdjczk.java new file mode 100644 index 0000000..0372045 --- /dev/null +++ b/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(); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/PicParams.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/PicParams.java index 162e6ad..db32921 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/PicParams.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/PicParams.java @@ -5,9 +5,10 @@ import com.da.dangan.domain.DaPicturesRecard; import java.util.List; public class PicParams { - private List checked; - private List unchecked; - private String singeOrDouble; //单双面 0单面 1双面 + private static final long serialVersionUID = 1L; + private List checked; + private List unchecked; + private String singeOrDouble; //单双面 0单面 1双面 public String getSingeOrDouble() { return singeOrDouble; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java index 4dc35fa..d6aff77 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/QyzDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaQyz; import java.util.List; public class QyzDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java index 1406146..fcb90a6 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/YtzmDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaYtzm; import java.util.List; public class YtzmDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java index 37ae4ed..f1a7c13 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZfnyDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaZfnyhkcg; import java.util.List; public class ZfnyDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java index 289bafb..ee180e6 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/vo/ZqzDatas.java @@ -5,8 +5,9 @@ import com.da.dangan.domain.DaZqz; import java.util.List; public class ZqzDatas { - private List Picid; - private List info; + private static final long serialVersionUID = 1L; + private List Picid; + private List info; public List getPicid() { return Picid; diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java index b475c8d..70d7d32 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java @@ -9,8 +9,11 @@ import com.da.common.core.domain.model.LoginUser; import com.da.common.exception.ServiceException; import com.da.common.utils.DateUtils; import com.da.common.utils.StringUtils; +import com.da.dangan.domain.DaPicturesRecard; import com.da.dangan.mapper.DaCatalogMapper; import com.da.dangan.service.IDaCatalogService; +import com.da.dangan.service.IDaPicturesRecardService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -30,7 +33,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService { @Resource private DaCatalogMapper daCatalogMapper; - + @Autowired + private IDaPicturesRecardService daPicturesRecardService; /** * 查询档案目录 * @@ -170,6 +174,13 @@ public class DaCatalogServiceImpl implements IDaCatalogService if(daCatalogs!=null&&daCatalogs.size()>0){ return AjaxResult.error("有子级目录，不能删除"); } + //目录下已有上传图片的 不能删除 + DaPicturesRecard picturesRecard = new DaPicturesRecard(); + picturesRecard.setMuId(id); + List daPicturesRecards = daPicturesRecardService.selectDaPicturesRecardList(picturesRecard); + if(daPicturesRecards!=null&&daPicturesRecards.size()>0){ + return AjaxResult.error("目录下有已上传的图片，不能删除"); + } int i= daCatalogMapper.deleteDaCatalogById(id); if(i>0){ return AjaxResult.success(); diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml index c70e196..5f8144d 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml @@ -11,7 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + @@ -24,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -59,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - + insert into da_czrkdj @@ -195,7 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" relation, name, other_name, + used_name, sex, + jhr1, + jhgx1, + jhr2, + jhgx2, + gmcszqfrq, birthday, address, yj, @@ -208,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gmzdhhmqfjgjrq, hsyhdqlbxshsdjhk, hsybxshcqlhsdjhk, + hshyqwhd, zxhkrq, zxhkyy, hkdjsxbgjznrsjjblrz1, @@ -248,7 +283,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{relation}, #{name}, #{otherName}, + #{usedName}, #{sex}, + #{jhr1}, + #{jhgx1}, + #{jhr2}, + #{jhgx2}, + #{gmcszqfrq}, #{birthday}, #{address}, #{yj}, @@ -261,6 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{gmzdhhmqfjgjrq}, #{hsyhdqlbxshsdjhk}, #{hsybxshcqlhsdjhk}, + #{hshyqwhd}, #{zxhkrq}, #{zxhkyy}, #{hkdjsxbgjznrsjjblrz1}, @@ -305,7 +347,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" relation = #{relation}, name = #{name}, other_name = #{otherName}, + used_name = #{usedName}, sex = #{sex}, + jhr1 = #{jhr1}, + jhgx1 = #{jhgx1}, + jhr2 = #{jhr2}, + jhgx2 = #{jhgx2}, + gmcszqfrq = #{gmcszqfrq}, birthday = #{birthday}, address = #{address}, yj = #{yj}, @@ -318,6 +366,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" gmzdhhmqfjgjrq = #{gmzdhhmqfjgjrq}, hsyhdqlbxshsdjhk = #{hsyhdqlbxshsdjhk}, hsybxshcqlhsdjhk = #{hsybxshcqlhsdjhk}, + hshyqwhd = #{hshyqwhd}, zxhkrq = #{zxhkrq}, zxhkyy = #{zxhkyy}, hkdjsxbgjznrsjjblrz1 = #{hkdjsxbgjznrsjjblrz1}, diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue index 5abd7cb..de312b8 100644 --- a/dangan-ui/src/views/dangan/collection/index.vue +++ b/dangan-ui/src/views/dangan/collection/index.vue @@ -665,6 +665,7 @@ export default { /** 查询识别进度 */ getProgress() { // 向给定ID的用户发起请求 + //axios.post('http://20.206.150.166:22443/get_file_count',`username=${this.$store.state.user.name}`, { axios.post('http://123.57.142.195:443/get_file_count',`username=${this.$store.state.user.name}`, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue index 00ee006..7442ee5 100644 --- a/dangan-ui/src/views/dangan/pictureRecard/index.vue +++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue @@ -336,6 +336,7 @@ export default { /** 查询识别进度 */ getProgress() { // 向给定ID的用户发起请求 + //axios.post('http://20.206.150.166:22443/get_file_count',`username=${this.$store.state.user.name}`, { axios.post('http://123.57.142.195:443/get_file_count',`username=${this.$store.state.user.name}`, { headers: { 'Content-Type': 'application/x-www-form-urlencoded'