jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

add return pageinfo

Showing 4 changed files with 52 additions and 2 deletions

...	...	@@ -20,6 +20,34 @@
20	20	private Date created;
21	21	private String shortCode;
22	22
	23	+ private String levelStr;
	24	+ private String typeStr;
	25	+
	26	+ public String getShortCode() {
	27	+ return shortCode;
	28	+ }
	29	+
	30	+ public String getLevelStr() {
	31	+ return levelStr;
	32	+ }
	33	+
	34	+ public void setLevelStr(String levelStr) {
	35	+ this.levelStr = levelStr;
	36	+ }
	37	+
	38	+ public String getTypeStr() {
	39	+ return typeStr;
	40	+ }
	41	+
	42	+ public void setTypeStr(String typeStr) {
	43	+ this.typeStr = typeStr;
	44	+ }
	45	+
	46	+ public void setShortCode(String shortCode) {
	47	+ this.shortCode = shortCode;
	48	+ }
	49	+
	50	+
23	51	public Integer getId() {
24	52	return id;
25	53	}

1	1	package com.lyms.platform.common.enums;
2	2
	3	+import java.util.HashMap;
	4	+
3	5	/**
4	6	* 机构级别
5	7	* Created by Zhang.Rui on 2016/4/7.
...	...	@@ -34,5 +36,13 @@
34	36	this.text = text;
35	37	}
36	38
	39	+ public static String getById(int id) {
	40	+ for (OrganizationLevelEnum e : OrganizationLevelEnum.values()) {
	41	+ if(e.getId().equals(id)) {
	42	+ return e.getText();
	43	+ }
	44	+ }
	45	+ return null;
	46	+ }
37	47	}

...	...	@@ -35,5 +35,13 @@
35	35	this.text = text;
36	36	}
37	37
	38	+ public static String getById(int id) {
	39	+ for (OrganizationTypeEnum e : OrganizationTypeEnum.values()) {
	40	+ if(e.getId().equals(id)) {
	41	+ return e.getText();
	42	+ }
	43	+ }
	44	+ return null;
	45	+ }
38	46	}

...	...	@@ -5,6 +5,8 @@
5	5	import com.lyms.platform.common.base.BaseController;
6	6	import com.lyms.platform.common.base.LoginContext;
7	7	import com.lyms.platform.common.constants.ErrorCodeConstants;
	8	+import com.lyms.platform.common.enums.OrganizationLevelEnum;
	9	+import com.lyms.platform.common.enums.OrganizationTypeEnum;
8	10	import com.lyms.platform.common.enums.YnEnums;
9	11	import com.lyms.platform.common.utils.ResultUtils;
10	12	import com.lyms.platform.operate.web.result.FrontEndResult;
...	...	@@ -219,8 +221,10 @@
219	221
220	222	List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
221	223
222		-
223		-
	224	+ for(Organization organization : organizations) {
	225	+ organization.setTypeStr(OrganizationLevelEnum.getById(organization.getLevel()));
	226	+ organization.setLevelStr(OrganizationTypeEnum.getById(organization.getType()));
	227	+ }
224	228
225	229	FrontEndResult frontEndResult = new FrontEndResult();
226	230	frontEndResult.setData(organizations);