java/zhihuishenqu.git

			@@ -7,6 +7,7 @@
			import lombok.Data;

			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;

			/**
			@@ -81,8 +82,60 @@
			@ExcelProperty(value = "是否列管", index = 20)
			private Integer isRehab;

			@ExcelProperty(value = "备注", index = 21)
			@ExcelProperty(value = "是否累惯犯（1.是 0.否）", index = 21)
			private Integer isRecidivist;

			@ExcelProperty(value = "原判刑期", index = 22)
			private String originalTerm;

			@ExcelProperty(value = "服刑日期", index = 23)
			private Date sentenceBegin;

			@ExcelProperty(value = "原罪名", index = 24)
			private String originalCharge;

			@ExcelProperty(value = "释放日期", index = 25)
			private Date sentenceEnd;

			@ExcelProperty(value = "服刑场所", index = 26)
			private String sentencePlace;

			@ExcelProperty(value = "危险性评估", index = 27)
			private String riskAssessment;

			@ExcelProperty(value = "衔接日期", index = 28)
			private Date joinDate;

			@ExcelProperty(value = "衔接情况", index = 29)
			private String joinSituation;

			@ExcelProperty(value = "是否重新犯罪（1.是 0.否）", index = 30)
			private Integer isAgainCrime;

			@ExcelProperty(value = "重新犯罪名称", index = 31)
			private String againCrimeName;

			@ExcelProperty(value = "安置情况", index = 32)
			private String placeSituation;

			@ExcelProperty(value = "安置日期", index = 33)
			private Date placeDate;

			@ExcelProperty(value = "未安置原因", index = 34)
			private String notPlaceReason;

			@ExcelProperty(value = "帮教开始", index = 35)
			private Date helpBegin;

			@ExcelProperty(value = "帮教结束", index = 36)
			private Date helpEnd;

			@ExcelProperty(value = "帮教情况", index = 37)
			private String helpSituation;

			@ExcelProperty(value = "备注", index = 38)
			private String remark;

			/**
			* 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
			*/