jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 44 additions and 2 deletions

...	...	@@ -7,6 +7,7 @@
7	7	public HusbandSmn() {
8	8	}
9	9
	10	+ private String id;
10	11	private String parentId;//行记录id
11	12	private String husbandName;//丈夫姓名
12	13	private Integer husbandAge;//丈夫年龄
...	...	@@ -39,6 +40,15 @@
39	40	private String orgProvinceId;
40	41	private String orgCityId;
41	42	private String orgAreaId;
	43	+
	44	+
	45	+ public String getId() {
	46	+ return id;
	47	+ }
	48	+
	49	+ public void setId(String id) {
	50	+ this.id = id;
	51	+ }
42	52
43	53	public String getParentId() {
44	54	return parentId;

...	...	@@ -43,6 +43,14 @@
43	43	}
44	44
45	45
	46	+ @RequestMapping(method = RequestMethod.POST, value = "/editHusbandSmn")
	47	+ @ResponseBody
	48	+ @TokenRequired
	49	+ public BaseResponse editHusbandSmn(@RequestBody HusbandSmn param, HttpServletRequest request) {
	50	+ return smnFacade.editHusbandSmn(param, getUserId(request));
	51	+ }
	52	+
	53	+
46	54	/**
47	55	* 编辑单个
48	56	*

...	...	@@ -319,9 +319,9 @@
319	319	param.setOrgAreaId(org.getAreaId());
320	320	param.setYbNum(usersService.getSmnSeq(hospitalId));
321	321	param.setHospitalId(hospitalId);
322		- param.setStatus(1);
	322	+ param.setStatus(2);
323	323	param.setCreated(new Date());
324		-
	324	+ param.setId(StringUtils.uuid());
325	325	if (CollectionUtils.isNotEmpty(husbandSmns))
326	326	{
327	327	husbandSmns.add(param);
...	...	@@ -330,6 +330,30 @@
330	330	{
331	331	husbandSmns = new ArrayList<>();
332	332	husbandSmns.add(param);
	333	+ }
	334	+ smnModel.setHusbandSmns(husbandSmns);
	335	+
	336	+ Update update = MongoConvertHelper
	337	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(smnModel));
	338	+ mongoTemplate.updateFirst(query, update, SmnModel.class);
	339	+
	340	+ return new BaseResponse();
	341	+ }
	342	+
	343	+ public BaseResponse editHusbandSmn(HusbandSmn param, Integer userId) {
	344	+ Query query = Query.query(Criteria.where("id").is(param.getParentId()));
	345	+ SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
	346	+
	347	+ List<HusbandSmn> husbandSmns = smnModel.getHusbandSmns();
	348	+ if (CollectionUtils.isNotEmpty(husbandSmns))
	349	+ {
	350	+ for (HusbandSmn husbandSmn : husbandSmns)
	351	+ {
	352	+ if (husbandSmn.getId().equals(param.getId()))
	353	+ {
	354	+ BeanUtils.copyProperties(param,husbandSmn);
	355	+ }
	356	+ }
333	357	}
334	358	smnModel.setHusbandSmns(husbandSmns);
335	359