jiangjiazhi / regional-platform

Authored by wangbo almost 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 11 additions and 10 deletions

...	...	@@ -47,24 +47,24 @@
47	47	private String cardID;
48	48
49	49	// 其他高危
50		- private String otherHighRisk;
	50	+ private String highriskDesc;
51	51	//高危补充说明
52		- private String otherRisk;
	52	+ private List otherRisk;
53	53
54	54
55		- public String getOtherHighRisk() {
56		- return otherHighRisk;
	55	+ public String getHighriskDesc() {
	56	+ return highriskDesc;
57	57	}
58	58
59		- public void setOtherHighRisk(String otherHighRisk) {
60		- this.otherHighRisk = otherHighRisk;
	59	+ public void setHighriskDesc(String highriskDesc) {
	60	+ this.highriskDesc = highriskDesc;
61	61	}
62	62
63		- public String getOtherRisk() {
	63	+ public List getOtherRisk() {
64	64	return otherRisk;
65	65	}
66	66
67		- public void setOtherRisk(String otherRisk) {
	67	+ public void setOtherRisk(List otherRisk) {
68	68	this.otherRisk = otherRisk;
69	69	}
70	70

...	...	@@ -14,6 +14,7 @@
14	14	import org.springframework.web.bind.annotation.*;
15	15
16	16	import javax.servlet.http.HttpServletRequest;
	17	+import javax.validation.Valid;
17	18
18	19	@Controller
19	20	@RequestMapping("/temporary/weight")
...	...	@@ -25,7 +26,7 @@
25	26	@RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
26	27	@TokenRequired
27	28	@ResponseBody
28		- public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
	29	+ public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
29	30	return temporaryWeightService.addTemporaryWeight(temporaryWeightModel);
30	31	}
31	32

...	...	@@ -63,7 +63,7 @@
63	63	if (temporaryWeightModel != null) {
64	64	if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) {
65	65	weightModel.setModified(new Date());
66		- temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getPhone())), weightModel);
	66	+ temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel);
67	67	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
68	68	}
69	69	} else {