jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bf01b3d63825db52648aafe2fc3f5e113a11957b

Authored by zhangchao
1 parent c6cfedce58
Exists in dev

#fix:优化调查问卷查询逻辑

Showing 4 changed files with 22 additions and 5 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/QuestionnaireRecordQuery.java View file @ bf01b3d
... ... @@ -6,6 +6,15 @@
6 6 private Integer questionnaireId;
7 7 private String username;
8 8 private String pId;
  9 + private Integer id;
  10 +
  11 + public Integer getId() {
  12 + return id;
  13 + }
  14 +
  15 + public void setId(Integer id) {
  16 + this.id = id;
  17 + }
9 18  
10 19 public Integer getQuestionnaireId() {
11 20 return questionnaireId;
platform-biz-service/src/main/resources/mainOrm/master/QuestionnaireRecordMapper.xml View file @ bf01b3d
... ... @@ -28,6 +28,9 @@
28 28 FROM questionnaire_record
29 29 where
30 30 1=1
  31 + <if test="id!=null">
  32 + and id=#{id,jdbcType=INTEGER}
  33 + </if>
31 34 <if test="questionnaireId!=null">
32 35 and questionnaire_id=#{questionnaireId,jdbcType=INTEGER}
33 36 </if>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java View file @ bf01b3d
... ... @@ -32,8 +32,12 @@
32 32 @RequestParam(required = true) Integer limit,
33 33 @RequestParam(required = false) Integer questionnaireId,
34 34 @RequestParam(required = false) String username,
35   - @RequestParam(required = false) String patientId){
  35 + @RequestParam(required = false) String patientId,
  36 + @RequestParam(required = false) Integer id){
36 37 QuestionnaireRecordQuery questionnaireQuery=new QuestionnaireRecordQuery();
  38 + if (id!=null){
  39 + questionnaireQuery.setId(id);
  40 + }
37 41 if (questionnaireId!=null){
38 42 questionnaireQuery.setQuestionnaireId(questionnaireId);
39 43 }
... ... @@ -74,8 +78,8 @@
74 78 /* BaseResponse baseResponse= new BaseResponse();
75 79 baseResponse.setErrormsg("成功");
76 80 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);*/
77   - questionnaireUserFacade.addDetails(questionnaireRecordDTO);
78   - ResultUtils.buildSuccessResultAndWrite(response);
  81 + Integer id= questionnaireUserFacade.addDetails(questionnaireRecordDTO);
  82 + ResultUtils.buildSuccessResultAndWrite(response,id);
79 83 }
80 84  
81 85 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/QuestionnaireUserFacade.java View file @ bf01b3d
... ... @@ -35,7 +35,7 @@
35 35 return questionnaireRecordDetailsService.getList(id);
36 36 }
37 37  
38   - public void addDetails(QuestionnaireRecordDTO questionnaireRecordDTO){
  38 + public Integer addDetails(QuestionnaireRecordDTO questionnaireRecordDTO){
39 39 if (CollectionUtils.isNotEmpty(questionnaireRecordDTO.getList())){
40 40 QuestionnaireRecordEntity questionnaireRecordEntity=new QuestionnaireRecordEntity();
41 41 questionnaireRecordEntity.setCreated(new Date());
42 42  
... ... @@ -57,9 +57,10 @@
57 57 questionnaireRecordDetailsEntity.setOption(questionnaireOptionEntity.getOption());
58 58 questionnaireRecordDetailsService.add(questionnaireRecordDetailsEntity);
59 59 }
60   -
  60 + return questionnaireRecordEntity.getId();
61 61 }
62 62  
  63 + return null;
63 64 }
64 65 }