From ceb80a39ef9095115a58e1531203549c95cbbf09 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 5 Jun 2024 08:41:38 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E8=B0=83=E6=9F=A5?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=AE=A1=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/QuestionnaireController.java | 13 ++++++------- .../controller/QuestionnaireRecordController.java | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java index fd72778..841a000 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.operate.web.facade.QuestionnaireFacade; import com.lyms.platform.permission.model.QuestionnaireEntity; @@ -41,8 +42,11 @@ public class QuestionnaireController { questionnaireQuery.setLimit(limit); questionnaireQuery.setPage(page); List list= questionnaireFacade.getList(questionnaireQuery); - ResultUtils.buildSuccessResultAndWrite(response,list); - // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list); + CommonResult commonResult=new CommonResult(); + commonResult.setList(list); + commonResult.setPageInfo(questionnaireQuery.getPageInfo()); + ResultUtils.buildSuccessResultAndWrite(response,commonResult); + ResultUtils.buildSuccessResultAndWrite(response,commonResult); } /** @@ -53,12 +57,7 @@ public class QuestionnaireController { @RequestMapping(method = RequestMethod.GET, value = "/questionnaire/getInfo") public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){ List list=questionnaireFacade.getListById(id); - /* BaseResponse baseResponse= new BaseResponse(); - baseResponse.setErrormsg("成功"); - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseResponse.setObject(list);*/ ResultUtils.buildSuccessResultAndWrite(response,list); - // return baseResponse; } @RequestMapping(method = RequestMethod.POST, value = "/questionnaire/update") diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java index 5411998..4b3b8c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QuestionnaireRecordController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.QuestionnaireUserFacade; @@ -42,6 +43,7 @@ public class QuestionnaireRecordController { questionnaireQuery.setSort("id"); questionnaireQuery.setLimit(limit); questionnaireQuery.setPage(page); + } if (questionnaireId!=null){ questionnaireQuery.setQuestionnaireId(questionnaireId); @@ -53,8 +55,14 @@ public class QuestionnaireRecordController { questionnaireQuery.setpId(patientId); } List list= questionnaireUserFacade.getList(questionnaireQuery); - ResultUtils.buildSuccessResultAndWrite(response,list); - // return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(questionnaireQuery.getPageInfo()).setData(list); + if (id!=null){ + ResultUtils.buildSuccessResultAndWrite(response,list); + }else { + CommonResult commonResult=new CommonResult(); + commonResult.setList(list); + commonResult.setPageInfo(questionnaireQuery.getPageInfo()); + ResultUtils.buildSuccessResultAndWrite(response,commonResult); + } } /** @@ -63,22 +71,13 @@ public class QuestionnaireRecordController { * @return */ @RequestMapping(method = RequestMethod.GET, value = "/questionnaireRecord/getInfo") - //@ResponseBody public void getInfo(HttpServletResponse response,@RequestParam(required = true) Integer id){ List list=questionnaireUserFacade.getListById(id); - /* BaseResponse baseResponse= new BaseResponse(); - baseResponse.setErrormsg("成功"); - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - baseResponse.setObject(list);*/ ResultUtils.buildSuccessResultAndWrite(response,list); } @RequestMapping(method = RequestMethod.POST, value = "/questionnaireRecord/add") - // @ResponseBody public void add(HttpServletResponse response,@RequestBody QuestionnaireRecordDTO questionnaireRecordDTO){ - /* BaseResponse baseResponse= new BaseResponse(); - baseResponse.setErrormsg("成功"); - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);*/ Integer id= questionnaireUserFacade.addDetails(questionnaireRecordDTO); ResultUtils.buildSuccessResultAndWrite(response,id); } -- 1.8.3.1