fangcheng / regional-platform

Authored by liquanyu almost 9 years ago

Showing 3 changed files with 15 additions and 6 deletions

...	...	@@ -19,5 +19,12 @@
19	19	//职业类型
20	20	public static final String PROFESSION_TYPE_ID = "7579024c-5932-4566-b48f-a3b23da33aa5";
21	21
	22	+ //户籍类型
	23	+ public static final String CENSUS_TYPE_ID = "57624ba30cf23d4631523e9d";
	24	+
	25	+ //居住类型
	26	+ public static final String LIVE_TYPE_ID = "57624c330cf23d4631523ea0";
	27	+
	28	+
22	29	}

...	...	@@ -253,9 +253,6 @@
253	253	condition=condition.and("username", name, MongoOper.IS);
254	254	}
255	255
256		- if(null!=vcCardNo){
257		- condition=condition.and("vcCardNo", vcCardNo, MongoOper.IS);
258		- }
259	256
260	257	if(-1!=yn){
261	258	condition=condition.and("yn", yn, MongoOper.IS);

...	...	@@ -105,9 +105,6 @@
105	105	}
106	106
107	107	Map<String,List> mapProvince = new HashMap<>();
108		-// //省
109		-// List<BasicConfigResult> provincesResults = getBaseicConfigByParentId(SystemConfig.CHINA_BASIC_ID);
110		-// mapProvince.put("provinces",provincesResults);
111	108
112	109	//证件类型
113	110	List<BasicConfigResult> pcerteTypeResult = getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
...	...	@@ -124,6 +121,14 @@
124	121	// 职业类别
125	122	List<BasicConfigResult> professionTypeResults = getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
126	123	mapProvince.put("professionType",professionTypeResults);
	124	+
	125	+ // 户籍类别
	126	+ List<BasicConfigResult> censusType = getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID);
	127	+ mapProvince.put("censusType",censusType);
	128	+
	129	+ // 户籍类别
	130	+ List<BasicConfigResult> liveType = getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
	131	+ mapProvince.put("liveType",liveType);
127	132
128	133	list.add(mapProvince);
129	134