jiangjiazhi / regional-platform

Commit ceb80a39ef9095115a58e1531203549c95cbbf09

Authored by zhangchao about 1 year ago

Exists in dev

#fix:优化调查问卷管理，新增分页查询逻辑

Showing 2 changed files with 16 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.result.CommonResult;
3	4	import com.lyms.platform.common.utils.ResultUtils;
4	5	import com.lyms.platform.operate.web.facade.QuestionnaireFacade;
5	6	import com.lyms.platform.permission.model.QuestionnaireEntity;
...	...	@@ -41,8 +42,11 @@
41	42	questionnaireQuery.setLimit(limit);
42	43	questionnaireQuery.setPage(page);
43	44	List<QuestionnaireEntity> list= questionnaireFacade.getList(questionnaireQuery);
44		- ResultUtils.buildSuccessResultAndWrite(response,list);
45		- // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);
	45	+ CommonResult commonResult=new CommonResult();
	46	+ commonResult.setList(list);
	47	+ commonResult.setPageInfo(questionnaireQuery.getPageInfo());
	48	+ ResultUtils.buildSuccessResultAndWrite(response,commonResult);
	49	+ ResultUtils.buildSuccessResultAndWrite(response,commonResult);
46	50	}
47	51
48	52	/**
49	53
...	...	@@ -53,12 +57,7 @@
53	57	@RequestMapping(method = RequestMethod.GET, value = "/questionnaire/getInfo")
54	58	public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){
55	59	List<QuestionnaireOptionEntity> list=questionnaireFacade.getListById(id);
56		- /* BaseResponse baseResponse= new BaseResponse();
57		- baseResponse.setErrormsg("成功");
58		- baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
59		- baseResponse.setObject(list);*/
60	60	ResultUtils.buildSuccessResultAndWrite(response,list);
61		- // return baseResponse;
62	61	}
63	62
64	63	@RequestMapping(method = RequestMethod.POST, value = "/questionnaire/update")

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.result.CommonResult;
3	4	import com.lyms.platform.common.utils.ResultUtils;
4	5	import com.lyms.platform.common.utils.StringUtils;
5	6	import com.lyms.platform.operate.web.facade.QuestionnaireUserFacade;
...	...	@@ -42,6 +43,7 @@
42	43	questionnaireQuery.setSort("id");
43	44	questionnaireQuery.setLimit(limit);
44	45	questionnaireQuery.setPage(page);
	46	+
45	47	}
46	48	if (questionnaireId!=null){
47	49	questionnaireQuery.setQuestionnaireId(questionnaireId);
...	...	@@ -53,8 +55,14 @@
53	55	questionnaireQuery.setpId(patientId);
54	56	}
55	57	List<QuestionnaireRecordEntity> list= questionnaireUserFacade.getList(questionnaireQuery);
56		- ResultUtils.buildSuccessResultAndWrite(response,list);
57		- // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);
	58	+ if (id!=null){
	59	+ ResultUtils.buildSuccessResultAndWrite(response,list);
	60	+ }else {
	61	+ CommonResult commonResult=new CommonResult();
	62	+ commonResult.setList(list);
	63	+ commonResult.setPageInfo(questionnaireQuery.getPageInfo());
	64	+ ResultUtils.buildSuccessResultAndWrite(response,commonResult);
	65	+ }
58	66	}
59	67
60	68	/**
61	69
62	70
63	71
...	...	@@ -63,22 +71,13 @@
63	71	* @return
64	72	*/
65	73	@RequestMapping(method = RequestMethod.GET, value = "/questionnaireRecord/getInfo")
66		- //@ResponseBody
67	74	public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){
68	75	List<QuestionnaireRecordDetailsEntity> list=questionnaireUserFacade.getListById(id);
69		- /* BaseResponse baseResponse= new BaseResponse();
70		- baseResponse.setErrormsg("成功");
71		- baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
72		- baseResponse.setObject(list);*/
73	76	ResultUtils.buildSuccessResultAndWrite(response,list);
74	77	}
75	78
76	79	@RequestMapping(method = RequestMethod.POST, value = "/questionnaireRecord/add")
77		- // @ResponseBody
78	80	public void add(HttpServletResponse response,@RequestBody QuestionnaireRecordDTO questionnaireRecordDTO){
79		- /* BaseResponse baseResponse= new BaseResponse();
80		- baseResponse.setErrormsg("成功");
81		- baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);*/
82	81	Integer id= questionnaireUserFacade.addDetails(questionnaireRecordDTO);
83	82	ResultUtils.buildSuccessResultAndWrite(response,id);
84	83	}