From 57ed415dc7a93d0814cfb58348e17f1fe26b56bb Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Mon, 20 Dec 2021 11:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7=E8=B0=83?= =?UTF-8?q?=E6=9F=A5-=E5=8C=BB=E9=99=A2=E5=90=8D=E7=A7=B0=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbasics/api/QuestionnaireController.java | 10 ++++++++++ .../ccsens/carbasics/bean/vo/QuestionnaireVo.java | 7 +++++++ .../persist/dao/QuestionnaireRecordDao.java | 7 +++++++ .../carbasics/service/IQuestionnaireService.java | 7 +++++++ .../carbasics/service/QuestionnaireService.java | 5 +++++ src/main/resources/druid-test.yml | 2 +- .../resources/mapper_dao/QuestionnaireRecordDao.xml | 12 ++++++++++++ 7 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java index 598557b..50cebf2 100644 --- a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java +++ b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java @@ -151,4 +151,14 @@ public class QuestionnaireController { log.info("查询是否可以进入问卷结束{}",isShow); return JsonResponse.newInstance().ok(isShow); } + + @MustLogin + @ApiOperation(value = "医院名称回显", notes = "") + @RequestMapping(value = "/hospitalNameEcho", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse hospitalNameEcho(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("医院名称回显开始{}",params); + QuestionnaireVo.HospitalName hospitalName = questionnaireService.hospitalNameEcho(params.getUserId()); + log.info("医院名称回显结束{}",hospitalName); + return JsonResponse.newInstance().ok(hospitalName); + } } diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java index 3fb6b3c..5a2de85 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java @@ -103,4 +103,11 @@ public class QuestionnaireVo { @ApiModelProperty("职务") private String position; } + + @Data + @ApiModel("医院名称回显-返参") + public static class HospitalName { + @ApiModelProperty("医院名称") + private String name; + } } diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java index 17da7e6..f165768 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java @@ -33,4 +33,11 @@ public interface QuestionnaireRecordDao extends QuestionnaireRecordMapper { * @return 记录 */ List> queryRecord(@Param("export") QuestionnaireDto.Export export, @Param("codes") List codes,@Param("qid") Long qid); + + /** + * 医院名称回显 + * @param userId 用户id + * @return 医院名称回显 + */ + QuestionnaireVo.HospitalName hospitalNameEcho(@Param("userId") Long userId); } diff --git a/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java index bdecc68..819386b 100644 --- a/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java @@ -94,4 +94,11 @@ public interface IQuestionnaireService { * @return 是否展示 */ ButtonVO.IsShow queryIsShow(Long userId); + + /** + * 医院名称回显 + * @param userId 用户id + * @return 医院名称 + */ + QuestionnaireVo.HospitalName hospitalNameEcho(Long userId); } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index 6b96469..b2b4e1e 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -607,6 +607,11 @@ public class QuestionnaireService implements IQuestionnaireService{ return isShow; } + @Override + public QuestionnaireVo.HospitalName hospitalNameEcho(Long userId) { + return questionnaireRecordDao.hospitalNameEcho(userId); + } + public String queryRole(Long positionId){ OrganizationPosition position = positionDao.selectByPrimaryKey(positionId); if (position.getCode().equals(Constant.PositionIdAndRole.CuZhongZhongXinBanGongShiZhuRen.positionCode)){ diff --git a/src/main/resources/druid-test.yml b/src/main/resources/druid-test.yml index 02c6182..7dcd6cc 100644 --- a/src/main/resources/druid-test.yml +++ b/src/main/resources/druid-test.yml @@ -27,7 +27,7 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://test.tall.wiki/carbasics?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://test.tall.wiki/carbasics_bak?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml b/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml index be91950..42319b0 100644 --- a/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml +++ b/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml @@ -51,4 +51,16 @@ group by t1.id + + \ No newline at end of file