jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 26 additions and 14 deletions

...	...	@@ -53,7 +53,7 @@
53	53	@RequestMapping(method = RequestMethod.PUT, value = "/basicConfig/{id}")
54	54	@ResponseBody
55	55	public BaseResponse updateOneBasicConfigById(@PathVariable("id")
56		- String id, @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) {
	56	+ String id, @RequestBody @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) {
57	57	basicConfigUpdateRequest.setId(id);
58	58	return basicConfigFacade.updateOneBasicConfig(basicConfigUpdateRequest);
59	59	}

...	...	@@ -82,7 +82,7 @@
82	82	obj.setEnable(basicConfigUpdateRequest.getEnable());
83	83	obj.setTypeId(basicConfigUpdateRequest.getTypeId());
84	84	obj.setScore(basicConfigUpdateRequest.getScore());
85		- obj.setDescribe(basicConfigUpdateRequest.getDescribe());
	85	+ obj.setDescribe(basicConfigUpdateRequest.getDesc());
86	86	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
87	87	basicConfigQuery.setId(basicConfigUpdateRequest.getId());
88	88	basicConfigQuery.setYn(YnEnums.YES.getId());

1	1	package com.lyms.platform.operate.web.request;
2	2
3		-import org.hibernate.validator.constraints.NotEmpty;
	3	+import java.util.List;
4	4
5		-import com.lyms.platform.common.core.annotation.form.Form;
6		-import com.lyms.platform.common.core.annotation.form.FormParam;
7	5
8		-@Form
9	6	public class BasicConfigUpdateRequest {
10	7	private String id;
11	8
12		- @FormParam
13	9	// @NotEmpty(message = "名称不能为空.")
14	10	private String name;
15		-
16	11	private String code;
17		- @FormParam
18	12	private int enable;
19	13	private String typeId;
20	14	private Integer score;
21		- private String describe;
	15	+ private String desc;
	16	+ private String parentId;
	17	+ private List childConfigs;
22	18
	19	+ public List getChildConfigs() {
	20	+ return childConfigs;
	21	+ }
	22	+
	23	+ public void setChildConfigs(List childConfigs) {
	24	+ this.childConfigs = childConfigs;
	25	+ }
	26	+
	27	+ public String getParentId() {
	28	+ return parentId;
	29	+ }
	30	+
	31	+ public void setParentId(String parentId) {
	32	+ this.parentId = parentId;
	33	+ }
	34	+
23	35	public String getTypeId() {
24	36	return typeId;
25	37	}
26	38
...	...	@@ -36,12 +48,12 @@
36	48	this.score = score;
37	49	}
38	50
39		- public String getDescribe() {
40		- return describe;
	51	+ public String getDesc() {
	52	+ return desc;
41	53	}
42	54
43		- public void setDescribe(String describe) {
44		- this.describe = describe;
	55	+ public void setDesc(String desc) {
	56	+ this.desc = desc;
45	57	}
46	58
47	59	public int getEnable() {