From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java | 195 +++++++++++++++++++++---------------------------
1 files changed, 86 insertions(+), 109 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
index 5d3160b..606a513 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
@@ -1,13 +1,13 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
-import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+
+import lombok.Data;
/**
* @auther txb
@@ -23,204 +23,181 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
- */
- @TableId(type = IdType.INPUT)
+ * 主键id
+ */
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
- * 人口id
- */
+ * 人口id
+ */
private Long populationId;
/**
- * 街道id
- */
+ * 街道id
+ */
private Long streetId;
/**
- * 社区id
- */
+ * 社区id
+ */
private Long communityId;
/**
- * 名字
- */
+ * 名字
+ */
private String name;
/**
- * 身份证号码
- */
+ * 身份证号码
+ */
@EncryptDecryptField
private String cardNo;
/**
- * 联系电话
- */
+ * 联系电话
+ */
private String phone;
/**
- * 与人员关系
- */
- private Integer patientRelation;
+ * 与人员关系
+ */
+ private String patientRelation;
/**
- * 列管原因及类型
- */
+ * 列管原因及类型
+ */
private String rehabReasonAndType;
/**
- * 是否列管（1.是 0.否）
- */
+ * 是否列管（1.是 0.否）
+ */
private Integer isRehab;
/**
- * 是否累惯犯（1.是 0.否）
- */
+ * 是否累惯犯（1.是 0.否）
+ */
private Integer isRecidivist;
/**
- * 原判刑期
- */
+ * 原判刑期
+ */
private String originalTerm;
/**
- * 服刑日期
- */
+ * 服刑日期
+ */
private Date sentenceBegin;
/**
- * 原罪名
- */
+ * 原罪名
+ */
private String originalCharge;
/**
- * 释放日期
- */
+ * 释放日期
+ */
private Date sentenceEnd;
/**
- * 服刑场所
- */
+ * 服刑场所
+ */
private String sentencePlace;
/**
- * 危险性评估
- */
+ * 危险性评估
+ */
private String riskAssessment;
/**
- * 衔接日期
- */
+ * 衔接日期
+ */
private Date joinDate;
/**
- * 衔接情况
- */
+ * 衔接情况
+ */
private String joinSituation;
/**
- * 是否重新犯罪（1.是 0.否）
- */
+ * 是否重新犯罪（1.是 0.否）
+ */
private Integer isAgainCrime;
/**
- * 重新犯罪名称
- */
+ * 重新犯罪名称
+ */
private String againCrimeName;
/**
- * 安置情况
- */
+ * 安置情况
+ */
private String placeSituation;
/**
- * 安置日期
- */
+ * 安置日期
+ */
private Date placeDate;
/**
- * 未安置原因
- */
+ * 未安置原因
+ */
private String notPlaceReason;
/**
- * 帮教开始
- */
+ * 帮教开始
+ */
private Date helpBegin;
/**
- * 帮教结束
- */
+ * 帮教结束
+ */
private Date helpEnd;
/**
- * 帮教情况
- */
+ * 帮教情况
+ */
private String helpSituation;
/**
- * 备注
- */
+ * 备注
+ */
private String remark;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@TableField(fill = FieldFill.INSERT)
private Date createAt;
/**
- * 创建用户
- */
+ * 创建用户
+ */
private Long createBy;
/**
- * 修改时间
- */
+ * 修改时间
+ */
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateAt;
/**
- * 修改用户
- */
+ * 修改用户
+ */
private Long updateBy;
-@Override
-public String toString() {
- return "ComRehabilitationPopulationDO{" +
- "id=" + id +
- ", populationId=" + populationId +
- ", streetId=" + streetId +
- ", communityId=" + communityId +
- ", name=" + name +
- ", cardNo=" + cardNo +
- ", phone=" + phone +
- ", patientRelation=" + patientRelation +
- ", rehabReasonAndType=" + rehabReasonAndType +
- ", isRehab=" + isRehab +
- ", isRecidivist=" + isRecidivist +
- ", originalTerm=" + originalTerm +
- ", sentenceBegin=" + sentenceBegin +
- ", originalCharge=" + originalCharge +
- ", sentenceEnd=" + sentenceEnd +
- ", sentencePlace=" + sentencePlace +
- ", riskAssessment=" + riskAssessment +
- ", joinDate=" + joinDate +
- ", joinSituation=" + joinSituation +
- ", isAgainCrime=" + isAgainCrime +
- ", againCrimeName=" + againCrimeName +
- ", placeSituation=" + placeSituation +
- ", placeDate=" + placeDate +
- ", notPlaceReason=" + notPlaceReason +
- ", helpBegin=" + helpBegin +
- ", helpEnd=" + helpEnd +
- ", helpSituation=" + helpSituation +
- ", remark=" + remark +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- ", updateAt=" + updateAt +
- ", updateBy=" + updateBy +
- "}";
- }
- }
\ No newline at end of file
+ @Override
+ public String toString() {
+ return "ComRehabilitationPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId="
+ + streetId + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
+ + ", patientRelation=" + patientRelation + ", rehabReasonAndType=" + rehabReasonAndType + ", isRehab="
+ + isRehab + ", isRecidivist=" + isRecidivist + ", originalTerm=" + originalTerm + ", sentenceBegin="
+ + sentenceBegin + ", originalCharge=" + originalCharge + ", sentenceEnd=" + sentenceEnd + ", sentencePlace="
+ + sentencePlace + ", riskAssessment=" + riskAssessment + ", joinDate=" + joinDate + ", joinSituation="
+ + joinSituation + ", isAgainCrime=" + isAgainCrime + ", againCrimeName=" + againCrimeName
+ + ", placeSituation=" + placeSituation + ", placeDate=" + placeDate + ", notPlaceReason=" + notPlaceReason
+ + ", helpBegin=" + helpBegin + ", helpEnd=" + helpEnd + ", helpSituation=" + helpSituation + ", remark="
+ + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt + ", updateBy="
+ + updateBy + "}";
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1