jiangjiazhi / center

Commit 7b22dc2a15277691fb660a860f2841f58e86755e

Authored by fangcheng about 9 years ago

Exists in master

修改标准字段名称和说明

create_id 创建人id
create_time 创建时间
modify_id 修改人id
modify_time 修改时间
ifDel 是否删除 1删除，0未删除
enable 是否启用 1启用，0未启用

这些业务无关的属性一般情况下放在表的最后

Showing 5 changed files with 116 additions and 84 deletions

base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml
base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml
base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml
base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java
base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java

...	...	@@ -9,17 +9,18 @@
9	9	<result column="NAME" property="name" />
10	10	<result column="ORG_ID" property="orgId" />
11	11	<result column="DESCRIPTION" property="description" />
12		- <result column="PUBLISH_ID" property="publishId" />
13	12	<result column="IFDEL" property="ifdel" />
14		- <result column="MODIFIED" property="modified" />
15		- <result column="CREATED" property="created" />
16	13	<result column="SHORT_CODE" property="shortCode" />
17	14	<result column="FOREIGN_ID" property="foreignId" />
	15	+ <result column="CREATE_ID" property="createId" />
	16	+ <result column="CREATE_TIME" property="createTime" />
	17	+ <result column="MODIFY_ID" property="modifyId" />
	18	+ <result column="MODIFY_TIME" property="modifyTime" />
18	19	</resultMap>
19	20
20	21	<!-- 通用查询结果列 -->
21	22	<sql id="Base_Column_List">
22		- ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId
	23	+ ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, IFDEL AS ifdel, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
23	24	</sql>
24	25	</mapper>

...	...	@@ -13,10 +13,7 @@
13	13	<result column="AREA_ID" property="areaId" />
14	14	<result column="ADDRESS" property="address" />
15	15	<result column="DESCRIPTION" property="description" />
16		- <result column="PUBLISH_ID" property="publishId" />
17	16	<result column="IFDEL" property="ifdel" />
18		- <result column="MODIFIED" property="modified" />
19		- <result column="CREATED" property="created" />
20	17	<result column="FOREIGN_ID" property="foreignId" />
21	18	<result column="STREET_ID" property="streetId" />
22	19	<result column="STATUS" property="status" />
23	20
...	...	@@ -28,11 +25,15 @@
28	25	<result column="GRADE_LEVEL" property="gradeLevel" />
29	26	<result column="STAR_LEVEL" property="starLevel" />
30	27	<result column="MOBILE" property="mobile" />
	28	+ <result column="CREATE_ID" property="createId" />
	29	+ <result column="CREATE_TIME" property="createTime" />
	30	+ <result column="MODIFY_ID" property="modifyId" />
	31	+ <result column="MODIFY_TIME" property="modifyTime" />
31	32	</resultMap>
32	33
33	34	<!-- 通用查询结果列 -->
34	35	<sql id="Base_Column_List">
35		- ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile
	36	+ ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, IFDEL AS ifdel, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
36	37	</sql>
37	38	</mapper>

...	...	@@ -12,11 +12,8 @@
12	12	<result column="ACCOUNT" property="account" />
13	13	<result column="PWD" property="pwd" />
14	14	<result column="PHONE" property="phone" />
15		- <result column="PUBLISH_ID" property="publishId" />
16	15	<result column="IFDEL" property="ifdel" />
17	16	<result column="ENABLE" property="enable" />
18		- <result column="MODIFIED" property="modified" />
19		- <result column="CREATED" property="created" />
20	17	<result column="REMARKS" property="remarks" />
21	18	<result column="LAST_LOGIN_TIME" property="lastLoginTime" />
22	19	<result column="FOREIGN_ID" property="foreignId" />
23	20
...	...	@@ -27,11 +24,15 @@
27	24	<result column="AVATAR" property="avatar" />
28	25	<result column="WORK_TIME" property="workTime" />
29	26	<result column="GOOD_AT" property="goodAt" />
	27	+ <result column="CREATE_ID" property="createId" />
	28	+ <result column="CREATE_TIME" property="createTime" />
	29	+ <result column="MODIFY_ID" property="modifyId" />
	30	+ <result column="MODIFY_TIME" property="modifyTime" />
30	31	</resultMap>
31	32
32	33	<!-- 通用查询结果列 -->
33	34	<sql id="Base_Column_List">
34		- ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt
	35	+ ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, IFDEL AS ifdel, ENABLE AS enable, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt,CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime
35	36	</sql>
36	37	</mapper>

...	...	@@ -24,7 +24,7 @@
24	24	public Departments() {
25	25	this.id = StrUtils.uuid();
26	26	this.ifdel = ValidityEnum.VALIDITY.getValidity();
27		- this.created = new Date();
	27	+ this.createTime = new Date();
28	28	}
29	29
30	30	/**
31	31
...	...	@@ -55,24 +55,9 @@
55	55	/**
56	56	*
57	57	*/
58		- @TableField(value = "PUBLISH_ID")
59		- private String publishId;
60		- /**
61		- *
62		- */
63	58	@TableField(value = "IFDEL")
64	59	private Integer ifdel;
65	60	/**
66		- *
67		- */
68		- @TableField(value = "MODIFIED")
69		- private Date modified;
70		- /**
71		- *
72		- */
73		- @TableField(value = "CREATED")
74		- private Date created;
75		- /**
76	61	* 简码
77	62	*/
78	63	@TableField(value = "SHORT_CODE")
...	...	@@ -82,6 +67,27 @@
82	67	*/
83	68	@TableField(value = "FOREIGN_ID")
84	69	private String foreignId;
	70	+
	71	+ /**
	72	+ *
	73	+ */
	74	+ @TableField(value = "CREATE_ID")
	75	+ private String createId;
	76	+ /**
	77	+ *
	78	+ */
	79	+ @TableField(value = "CREATE_TIME")
	80	+ private Date createTime;
	81	+ /**
	82	+ *
	83	+ */
	84	+ @TableField(value = "MODIFY_ID")
	85	+ private String modifyId;
	86	+ /**
	87	+ *
	88	+ */
	89	+ @TableField(value = "MODIFY_TIME")
	90	+ private Date modifyTime;
85	91
86	92	public String getId() {
87	93	return id;
...	...	@@ -123,14 +129,6 @@
123	129	this.description = description;
124	130	}
125	131
126		- public String getPublishId() {
127		- return publishId;
128		- }
129		-
130		- public void setPublishId(String publishId) {
131		- this.publishId = publishId;
132		- }
133		-
134	132	public Integer getIfdel() {
135	133	return ifdel;
136	134	}
137	135
138	136
139	137
140	138
...	...	@@ -139,23 +137,39 @@
139	137	this.ifdel = ifdel;
140	138	}
141	139
142		- public Date getModified() {
143		- return modified;
144		- }
	140	+ public String getCreateId() {
	141	+ return createId;
	142	+ }
145	143
146		- public void setModified(Date modified) {
147		- this.modified = modified;
148		- }
	144	+ public void setCreateId(String createId) {
	145	+ this.createId = createId;
	146	+ }
149	147
150		- public Date getCreated() {
151		- return created;
152		- }
	148	+ public Date getCreateTime() {
	149	+ return createTime;
	150	+ }
153	151
154		- public void setCreated(Date created) {
155		- this.created = created;
156		- }
	152	+ public void setCreateTime(Date createTime) {
	153	+ this.createTime = createTime;
	154	+ }
157	155
158		- public String getShortCode() {
	156	+ public String getModifyId() {
	157	+ return modifyId;
	158	+ }
	159	+
	160	+ public void setModifyId(String modifyId) {
	161	+ this.modifyId = modifyId;
	162	+ }
	163	+
	164	+ public Date getModifyTime() {
	165	+ return modifyTime;
	166	+ }
	167	+
	168	+ public void setModifyTime(Date modifyTime) {
	169	+ this.modifyTime = modifyTime;
	170	+ }
	171	+
	172	+ public String getShortCode() {
159	173	return shortCode;
160	174	}
161	175

...	...	@@ -65,26 +65,11 @@
65	65	@TableField(value="DESCRIPTION")
66	66	private String description;
67	67	/**
68		- * 发布人ID
69		- */
70		- @TableField(value="PUBLISH_ID")
71		- private String publishId;
72		- /**
73	68	* 1：有效，2：无效
74	69	*/
75	70	@TableField(value="IFDEL")
76	71	private Integer ifdel;
77	72	/**
78		- * 最后修改时间
79		- */
80		- @TableField(value="MODIFIED")
81		- private Date modified;
82		- /**
83		- * 创建时间
84		- */
85		- @TableField(value="CREATED")
86		- private Date created;
87		- /**
88	73	*
89	74	*/
90	75	@TableField(value="FOREIGN_ID")
...	...	@@ -139,6 +124,27 @@
139	124	*/
140	125	@TableField(value="MOBILE")
141	126	private String mobile;
	127	+
	128	+ /**
	129	+ *
	130	+ */
	131	+ @TableField(value = "CREATE_ID")
	132	+ private String createId;
	133	+ /**
	134	+ *
	135	+ */
	136	+ @TableField(value = "CREATE_TIME")
	137	+ private Date createTime;
	138	+ /**
	139	+ *
	140	+ */
	141	+ @TableField(value = "MODIFY_ID")
	142	+ private String modifyId;
	143	+ /**
	144	+ *
	145	+ */
	146	+ @TableField(value = "MODIFY_TIME")
	147	+ private Date modifyTime;
142	148
143	149
144	150	public String getId() {
145	151
...	...	@@ -213,14 +219,7 @@
213	219	this.description = description;
214	220	}
215	221
216		- public String getPublishId() {
217		- return publishId;
218		- }
219	222
220		- public void setPublishId(String publishId) {
221		- this.publishId = publishId;
222		- }
223		-
224	223	public Integer getIfdel() {
225	224	return ifdel;
226	225	}
227	226
228	227
229	228
230	229
...	...	@@ -229,23 +228,39 @@
229	228	this.ifdel = ifdel;
230	229	}
231	230
232		- public Date getModified() {
233		- return modified;
234		- }
	231	+ public String getCreateId() {
	232	+ return createId;
	233	+ }
235	234
236		- public void setModified(Date modified) {
237		- this.modified = modified;
238		- }
	235	+ public void setCreateId(String createId) {
	236	+ this.createId = createId;
	237	+ }
239	238
240		- public Date getCreated() {
241		- return created;
242		- }
	239	+ public Date getCreateTime() {
	240	+ return createTime;
	241	+ }
243	242
244		- public void setCreated(Date created) {
245		- this.created = created;
246		- }
	243	+ public void setCreateTime(Date createTime) {
	244	+ this.createTime = createTime;
	245	+ }
247	246
248		- public String getForeignId() {
	247	+ public String getModifyId() {
	248	+ return modifyId;
	249	+ }
	250	+
	251	+ public void setModifyId(String modifyId) {
	252	+ this.modifyId = modifyId;
	253	+ }
	254	+
	255	+ public Date getModifyTime() {
	256	+ return modifyTime;
	257	+ }
	258	+
	259	+ public void setModifyTime(Date modifyTime) {
	260	+ this.modifyTime = modifyTime;
	261	+ }
	262	+
	263	+ public String getForeignId() {
249	264	return foreignId;
250	265	}
251	266