diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
index 930d4dd..1b6312e 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcHkbgRecard.java
@@ -12,7 +12,7 @@ import java.util.Date;
* 户口变更记录对象 szxc_hkbg_recard
*
* @author hs
- * @date 2024-03-21
+ * @date 2024-03-26
*/
public class SzxcHkbgRecard extends BaseEntity
{
@@ -21,30 +21,54 @@ public class SzxcHkbgRecard extends BaseEntity
/** id */
private Long id;
+ /** 户号 */
+ @Excel(name = "户号")
+ private Long acountNo;
+
/** 居民id */
@Excel(name = "居民id")
private Long jmId;
- /** 姓名 */
- @Excel(name = "姓名")
+ /** 居民姓名 */
+ @Excel(name = "居民姓名")
private String name;
- /** 身份证号 */
- @Excel(name = "身份证号")
+ /** 居民身份证号 */
+ @Excel(name = "居民身份证号")
private String idCard;
- /** 户号 */
- @Excel(name = "户号")
- private Long acountNo;
+ /** 原居民id */
+ @Excel(name = "原居民id")
+ private Long yJmId;
+
+ /** 原户主姓名 */
+ @Excel(name = "原户主姓名")
+ private String yName;
+
+ /** 原户主身份证号 */
+ @Excel(name = "原户主身份证号")
+ private String yIdCard;
+
+ /** 变更原因(字典) */
+ @Excel(name = "变更原因(字典)")
+ private String bgReason;
+
+ /** 原居民id */
+ @Excel(name = "原居民id")
+ private Long xJmId;
+
+ /** 新户主姓名 */
+ @Excel(name = "新户主姓名")
+ private String xName;
+
+ /** 新户主身份证号 */
+ @Excel(name = "新户主身份证号")
+ private String xIdCard;
/** 与户主关系 */
@Excel(name = "与户主关系")
private String relation;
- /** 变更类别 */
- @Excel(name = "变更类别")
- private String bgType;
-
/** 变更编号 */
@Excel(name = "变更编号")
private String number;
@@ -54,10 +78,6 @@ public class SzxcHkbgRecard extends BaseEntity
@Excel(name = "变更时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date bgTime;
- /** 变更原因 */
- @Excel(name = "变更原因")
- private String bgReason;
-
/** 部门id */
@Excel(name = "部门id")
private Long deptId;
@@ -75,6 +95,15 @@ public class SzxcHkbgRecard extends BaseEntity
{
return id;
}
+ public void setAcountNo(Long acountNo)
+ {
+ this.acountNo = acountNo;
+ }
+
+ public Long getAcountNo()
+ {
+ return acountNo;
+ }
public void setJmId(Long jmId)
{
this.jmId = jmId;
@@ -102,32 +131,77 @@ public class SzxcHkbgRecard extends BaseEntity
{
return idCard;
}
- public void setAcountNo(Long acountNo)
+ public void setyJmId(Long yJmId)
{
- this.acountNo = acountNo;
+ this.yJmId = yJmId;
}
- public Long getAcountNo()
+ public Long getyJmId()
{
- return acountNo;
+ return yJmId;
}
- public void setRelation(String relation)
+ public void setyName(String yName)
{
- this.relation = relation;
+ this.yName = yName;
}
- public String getRelation()
+ public String getyName()
{
- return relation;
+ return yName;
+ }
+ public void setyIdCard(String yIdCard)
+ {
+ this.yIdCard = yIdCard;
+ }
+
+ public String getyIdCard()
+ {
+ return yIdCard;
+ }
+ public void setBgReason(String bgReason)
+ {
+ this.bgReason = bgReason;
+ }
+
+ public String getBgReason()
+ {
+ return bgReason;
+ }
+ public void setxJmId(Long xJmId)
+ {
+ this.xJmId = xJmId;
+ }
+
+ public Long getxJmId()
+ {
+ return xJmId;
+ }
+ public void setxName(String xName)
+ {
+ this.xName = xName;
+ }
+
+ public String getxName()
+ {
+ return xName;
+ }
+ public void setxIdCard(String xIdCard)
+ {
+ this.xIdCard = xIdCard;
}
- public void setBgType(String bgType)
+
+ public String getxIdCard()
{
- this.bgType = bgType;
+ return xIdCard;
+ }
+ public void setRelation(String relation)
+ {
+ this.relation = relation;
}
- public String getBgType()
+ public String getRelation()
{
- return bgType;
+ return relation;
}
public void setNumber(String number)
{
@@ -147,15 +221,6 @@ public class SzxcHkbgRecard extends BaseEntity
{
return bgTime;
}
- public void setBgReason(String bgReason)
- {
- this.bgReason = bgReason;
- }
-
- public String getBgReason()
- {
- return bgReason;
- }
public void setDeptId(Long deptId)
{
this.deptId = deptId;
@@ -179,15 +244,21 @@ public class SzxcHkbgRecard extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
+ .append("acountNo", getAcountNo())
.append("jmId", getJmId())
.append("name", getName())
.append("idCard", getIdCard())
- .append("acountNo", getAcountNo())
+ .append("yJmId", getyJmId())
+ .append("yName", getyName())
+ .append("yIdCard", getyIdCard())
+ .append("bgReason", getBgReason())
+ .append("xJmId", getxJmId())
+ .append("xName", getxName())
+ .append("xIdCard", getxIdCard())
.append("relation", getRelation())
- .append("bgType", getBgType())
.append("number", getNumber())
.append("bgTime", getBgTime())
- .append("bgReason", getBgReason())
+ .append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java
index ec47b87..6cb4791 100644
--- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java
+++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcJmInfo.java
@@ -12,7 +12,7 @@ import java.util.Date;
* 居民信息对象 szxc_jm_info
*
* @author hs
- * @date 2024-03-18
+ * @date 2024-03-26
*/
public class SzxcJmInfo extends BaseEntity
{
@@ -122,6 +122,10 @@ public class SzxcJmInfo extends BaseEntity
@Excel(name = "户号")
private Long acountNo;
+ /** 核查状态（0待核查 1已核查） */
+ @Excel(name = "核查状态", readConverterExp = "0=待核查,1=已核查")
+ private String hcStatus;
+
/** 是否注销 0:正常 1:注销 */
@Excel(name = "是否注销 0:正常 1:注销")
private String off;
@@ -364,6 +368,15 @@ public class SzxcJmInfo extends BaseEntity
{
return acountNo;
}
+ public void setHcStatus(String hcStatus)
+ {
+ this.hcStatus = hcStatus;
+ }
+
+ public String getHcStatus()
+ {
+ return hcStatus;
+ }
public void setOff(String off)
{
this.off = off;
@@ -412,6 +425,7 @@ public class SzxcJmInfo extends BaseEntity
.append("ills", getIlls())
.append("head", getHead())
.append("acountNo", getAcountNo())
+ .append("hcStatus", getHcStatus())
.append("off", getOff())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml
index d697d3e..d4639dc 100644
--- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml
+++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcHkbgRecardMapper.xml
@@ -6,15 +6,21 @@
+
-
+
+
+
+
+
+
+
-
-
+
@@ -24,21 +30,26 @@
- select id, jm_id, name, id_card, acount_no, relation, bg_type, number, bg_time, bg_reason, create_by, create_time, update_by, update_time, dept_id, user_id from szxc_hkbg_recard
+ select id, acount_no, jm_id, name, id_card, y_jm_id, y_name, y_id_card, bg_reason, x_jm_id, x_name, x_id_card, relation, number, bg_time, remark, create_by, create_time, update_by, update_time, dept_id, user_id from szxc_hkbg_recard