From 4326987f33eb649e81fc7476c86b764cddede691 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 四月 2022 09:31:17 +0800
Subject: [PATCH] 党建bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java | 248 ++++++++++++++++++++++---------------------------
1 files changed, 110 insertions(+), 138 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
index 8324f0b..db275ea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.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,264 +23,236 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
- */
+ * 主键id
+ */
@TableId(type = IdType.INPUT)
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 String correctType;
/**
- * 矫正开始时间
- */
+ * 矫正开始时间
+ */
private Date correctBegin;
/**
- * 矫正结束时间
- */
+ * 矫正结束时间
+ */
private Date correctEnd;
/**
- * 接收方式
- */
+ * 接收方式
+ */
private String receiveMethod;
/**
- * 是否累惯犯（1.是 0.否）
- */
+ * 是否累惯犯（1.是 0.否）
+ */
private Integer isRecidivist;
/**
- * 四史情况
- */
+ * 四史情况
+ */
private String fourHistory;
/**
- * 三涉情况
- */
+ * 三涉情况
+ */
private String threeInvovle;
/**
- * 是否建立矫正小组（1.是 0.否）
- */
+ * 是否建立矫正小组（1.是 0.否）
+ */
private Integer isCorrectGroup;
/**
- * 矫正小组人员组成情况
- */
+ * 矫正小组人员组成情况
+ */
private String correctGroupConstitute;
/**
- * 矫正解除（终止）类型
- */
+ * 矫正解除（终止）类型
+ */
private String correctRelieveType;
/**
- * 是否有脱管（1.是 0.否）
- */
+ * 是否有脱管（1.是 0.否）
+ */
private Integer isOutControl;
/**
- * 脱管原因
- */
+ * 脱管原因
+ */
private String outControlReason;
/**
- * 脱管纠正情况
- */
+ * 脱管纠正情况
+ */
private String outControlCorrect;
/**
- * 检察监督脱管情况
- */
+ * 检察监督脱管情况
+ */
private String inspectOutControl;
/**
- * 是否有漏管（1.是 0.否）
- */
+ * 是否有漏管（1.是 0.否）
+ */
private Integer isMissControl;
/**
- * 漏管原因
- */
+ * 漏管原因
+ */
private String missControlReason;
/**
- * 漏管纠正情况
- */
+ * 漏管纠正情况
+ */
private String missControlCorrect;
/**
- * 检察监督漏管
- */
+ * 检察监督漏管
+ */
private String inspectMissControl;
/**
- * 奖惩情况
- */
+ * 奖惩情况
+ */
private String rewardAndPunishiment;
/**
- * 是否重新犯罪（1.是 0.否）
- */
+ * 是否重新犯罪（1.是 0.否）
+ */
private Integer isAgainCrime;
/**
- * 重新犯罪名称
- */
+ * 重新犯罪名称
+ */
private String againCrimeName;
/**
- * 刑罚变更执行情况
- */
+ * 刑罚变更执行情况
+ */
private String pubishmentChange;
/**
- * 案件类别
- */
+ * 案件类别
+ */
private String caseType;
/**
- * 具体罪名
- */
+ * 具体罪名
+ */
private String specificCharge;
/**
- * 原判刑期
- */
+ * 原判刑期
+ */
private String originalTerm;
/**
- * 原判刑开始日期
- */
+ * 原判刑开始日期
+ */
private Date originalTermBegin;
/**
- * 原判刑结束日期
- */
+ * 原判刑结束日期
+ */
private Date originalTermEnd;
/**
- * 学历
- */
- private Integer cultureLevel;
+ * 学历
+ */
+ private String cultureLevel;
/**
- * 社区矫正人员编号
- */
+ * 社区矫正人员编号
+ */
private String correctPersonCode;
/**
- * 原羁押场所
- */
+ * 原羁押场所
+ */
private String originalCustodyplace;
/**
- * 备注
- */
+ * 备注
+ */
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 "ComCorrectPopulationDO{" +
- "id=" + id +
- ", populationId=" + populationId +
- ", streetId=" + streetId +
- ", communityId=" + communityId +
- ", name=" + name +
- ", cardNo=" + cardNo +
- ", phone=" + phone +
- ", correctType=" + correctType +
- ", correctBegin=" + correctBegin +
- ", correctEnd=" + correctEnd +
- ", receiveMethod=" + receiveMethod +
- ", isRecidivist=" + isRecidivist +
- ", fourHistory=" + fourHistory +
- ", threeInvovle=" + threeInvovle +
- ", isCorrectGroup=" + isCorrectGroup +
- ", correctGroupConstitute=" + correctGroupConstitute +
- ", correctRelieveType=" + correctRelieveType +
- ", isOutControl=" + isOutControl +
- ", outControlReason=" + outControlReason +
- ", outControlCorrect=" + outControlCorrect +
- ", inspectOutControl=" + inspectOutControl +
- ", isMissControl=" + isMissControl +
- ", missControlReason=" + missControlReason +
- ", missControlCorrect=" + missControlCorrect +
- ", inspectMissControl=" + inspectMissControl +
- ", rewardAndPunishiment=" + rewardAndPunishiment +
- ", isAgainCrime=" + isAgainCrime +
- ", againCrimeName=" + againCrimeName +
- ", pubishmentChange=" + pubishmentChange +
- ", caseType=" + caseType +
- ", specificCharge=" + specificCharge +
- ", originalTerm=" + originalTerm +
- ", originalTermBegin=" + originalTermBegin +
- ", originalTermEnd=" + originalTermEnd +
- ", cultureLevel=" + cultureLevel +
- ", correctPersonCode=" + correctPersonCode +
- ", originalCustodyplace=" + originalCustodyplace +
- ", remark=" + remark +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- ", updateAt=" + updateAt +
- ", updateBy=" + updateBy +
- "}";
- }
- }
\ No newline at end of file
+ @Override
+ public String toString() {
+ return "ComCorrectPopulationDO{" + "id=" + id + ", populationId=" + populationId + ", streetId=" + streetId
+ + ", communityId=" + communityId + ", name=" + name + ", cardNo=" + cardNo + ", phone=" + phone
+ + ", correctType=" + correctType + ", correctBegin=" + correctBegin + ", correctEnd=" + correctEnd
+ + ", receiveMethod=" + receiveMethod + ", isRecidivist=" + isRecidivist + ", fourHistory=" + fourHistory
+ + ", threeInvovle=" + threeInvovle + ", isCorrectGroup=" + isCorrectGroup + ", correctGroupConstitute="
+ + correctGroupConstitute + ", correctRelieveType=" + correctRelieveType + ", isOutControl=" + isOutControl
+ + ", outControlReason=" + outControlReason + ", outControlCorrect=" + outControlCorrect
+ + ", inspectOutControl=" + inspectOutControl + ", isMissControl=" + isMissControl + ", missControlReason="
+ + missControlReason + ", missControlCorrect=" + missControlCorrect + ", inspectMissControl="
+ + inspectMissControl + ", rewardAndPunishiment=" + rewardAndPunishiment + ", isAgainCrime=" + isAgainCrime
+ + ", againCrimeName=" + againCrimeName + ", pubishmentChange=" + pubishmentChange + ", caseType=" + caseType
+ + ", specificCharge=" + specificCharge + ", originalTerm=" + originalTerm + ", originalTermBegin="
+ + originalTermBegin + ", originalTermEnd=" + originalTermEnd + ", cultureLevel=" + cultureLevel
+ + ", correctPersonCode=" + correctPersonCode + ", originalCustodyplace=" + originalCustodyplace
+ + ", remark=" + remark + ", createAt=" + createAt + ", createBy=" + createBy + ", updateAt=" + updateAt
+ + ", updateBy=" + updateBy + "}";
+ }
+}
\ No newline at end of file
--
Gitblit v1.7.1