jiangjiazhi / regional-platform

Commit 79c3cb105bb506a22447fbac281fbe9d224aeaa1

Authored by zhangchao about 1 year ago

Exists in dev

#fix:优化调查问卷填写逻辑

Showing 5 changed files with 36 additions and 29 deletions

platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/DetailsRecordDTO.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/vo/QuestionnaireRecordDTO.java

...	...	@@ -48,7 +48,7 @@
48	48	VALUES (#{phone},#{username},#{name},#{pId},#{questionnaireId},#{point},#{created})
49	49	</insert>
50	50
51		- <select id="queryQuestionnaireCount" resultType="int"
	51	+ <select id="queryQuestionnaireRecordCount" resultType="int"
52	52	parameterType="com.lyms.platform.permission.model.QuestionnaireRecordQuery">
53	53	SELECT count(id) from questionnaire_record
54	54	where
...	...	@@ -58,6 +58,9 @@
58	58	</if>
59	59	<if test="username!=null">
60	60	and username=#{username,jdbcType=VARCHAR}
	61	+ </if>
	62	+ <if test="pId!=null">
	63	+ and pId=#{pId,jdbcType=VARCHAR}
61	64	</if>
62	65	</select>
63	66

...	...	@@ -28,8 +28,8 @@
28	28	*/
29	29
30	30	@RequestMapping(method = RequestMethod.GET, value = "/questionnaireRecord/getList")
31		- public void getList(HttpServletResponse response, @RequestParam(required = true) Integer page,
32		- @RequestParam(required = true) Integer limit,
	31	+ public void getList(HttpServletResponse response, @RequestParam(required = false) Integer page,
	32	+ @RequestParam(required = false) Integer limit,
33	33	@RequestParam(required = false) Integer questionnaireId,
34	34	@RequestParam(required = false) String username,
35	35	@RequestParam(required = false) String patientId,
...	...	@@ -37,6 +37,11 @@
37	37	QuestionnaireRecordQuery questionnaireQuery=new QuestionnaireRecordQuery();
38	38	if (id!=null){
39	39	questionnaireQuery.setId(id);
	40	+ }else {
	41	+ questionnaireQuery.setNeed("true");
	42	+ questionnaireQuery.setSort("id");
	43	+ questionnaireQuery.setLimit(limit);
	44	+ questionnaireQuery.setPage(page);
40	45	}
41	46	if (questionnaireId!=null){
42	47	questionnaireQuery.setQuestionnaireId(questionnaireId);
...	...	@@ -47,10 +52,6 @@
47	52	if (StringUtils.isNotEmpty(patientId)){
48	53	questionnaireQuery.setpId(patientId);
49	54	}
50		- questionnaireQuery.setNeed("true");
51		- questionnaireQuery.setSort("id");
52		- questionnaireQuery.setLimit(limit);
53		- questionnaireQuery.setPage(page);
54	55	List<QuestionnaireRecordEntity> list= questionnaireUserFacade.getList(questionnaireQuery);
55	56	ResultUtils.buildSuccessResultAndWrite(response,list);
56	57	// return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list);

1	1	package com.lyms.platform.operate.web.facade;
2	2
	3	+import com.lyms.platform.operate.web.vo.DetailsRecordDTO;
3	4	import com.lyms.platform.operate.web.vo.QuestionnaireRecordDTO;
4	5	import com.lyms.platform.permission.model.QuestionnaireOptionEntity;
5	6	import com.lyms.platform.permission.model.QuestionnaireRecordDetailsEntity;
6	7
...	...	@@ -46,9 +47,9 @@
46	47	questionnaireRecordEntity.setUsername(questionnaireRecordDTO.getUsername());
47	48	questionnaireRecordEntity.setQuestionnaireId(questionnaireRecordDTO.getQuestionnaireId());
48	49	questionnaireRecordService.add(questionnaireRecordEntity);
49		- for (QuestionnaireRecordDTO.DetailsRecordDTO detailsRecordDTO :questionnaireRecordDTO.getList()){
	50	+ for (DetailsRecordDTO detailsRecordDTO :questionnaireRecordDTO.getList()){
50	51	QuestionnaireRecordDetailsEntity questionnaireRecordDetailsEntity=new QuestionnaireRecordDetailsEntity();
51		- questionnaireRecordDetailsEntity.setQuestionnaireRecordId(detailsRecordDTO.getQuestionnaireOptionId());
	52	+ questionnaireRecordDetailsEntity.setQuestionnaireRecordId(questionnaireRecordEntity.getId());
52	53	QuestionnaireOptionEntity questionnaireOptionEntity= questionnaireFacade.getOptionInfo(detailsRecordDTO.getQuestionnaireOptionId());
53	54	questionnaireRecordDetailsEntity.setAnswer(questionnaireOptionEntity.getAnswer());
54	55	questionnaireRecordDetailsEntity.setChoice(detailsRecordDTO.getChoice());

	1	+package com.lyms.platform.operate.web.vo;
	2	+
	3	+public class DetailsRecordDTO {
	4	+ private Integer questionnaireOptionId;//选项ID
	5	+ private String choice;//选项
	6	+
	7	+ public Integer getQuestionnaireOptionId() {
	8	+ return questionnaireOptionId;
	9	+ }
	10	+
	11	+ public void setQuestionnaireOptionId(Integer questionnaireOptionId) {
	12	+ this.questionnaireOptionId = questionnaireOptionId;
	13	+ }
	14	+
	15	+ public String getChoice() {
	16	+ return choice;
	17	+ }
	18	+
	19	+ public void setChoice(String choice) {
	20	+ this.choice = choice;
	21	+ }
	22	+}

...	...	@@ -11,26 +11,6 @@
11	11	private String name;//调查问卷名称
12	12	List<DetailsRecordDTO> list;//选项集合
13	13
14		- public class DetailsRecordDTO{
15		- private Integer questionnaireOptionId;//选项ID
16		- private String choice;//选项
17		-
18		- public Integer getQuestionnaireOptionId() {
19		- return questionnaireOptionId;
20		- }
21		-
22		- public void setQuestionnaireOptionId(Integer questionnaireOptionId) {
23		- this.questionnaireOptionId = questionnaireOptionId;
24		- }
25		-
26		- public String getChoice() {
27		- return choice;
28		- }
29		-
30		- public void setChoice(String choice) {
31		- this.choice = choice;
32		- }
33		- }
34	14
35	15	public String getPhone() {
36	16	return phone;