From 4789e33f2a46efdb48030b19f1f5f8289aed8c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= <3226558941@qq.com> Date: Tue, 10 Oct 2023 11:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xinelu/common/constant/Constants.java | 2 +- .../NearbyNursingStationVO.java | 2 +- .../NearbyNursingStationMapper.xml | 4 +-- .../domain/nursestation/NurseStation.java | 2 +- .../dto/nursestation/NurseStationDTO.java | 1 + .../nursestation/NurseStationMapper.java | 4 +-- .../impl/NurseStationServiceImpl.java | 2 +- .../nursestation/NurseStationSysUserVO.java | 2 +- .../manage/goodsInfo/GoodsInfoMapper.xml | 2 +- .../nursestation/NurseStationMapper.xml | 28 +++++++++---------- 10 files changed, 25 insertions(+), 24 deletions(-) diff --git a/xinelu-common/src/main/java/com/xinelu/common/constant/Constants.java b/xinelu-common/src/main/java/com/xinelu/common/constant/Constants.java index a15b82e..616ba50 100644 --- a/xinelu-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/xinelu-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -227,7 +227,7 @@ public class Constants { /** * 护理站简介附近图片路径上传 */ - public static final String NURSE_STATION_INTRODUCE_TYPE = "stationIntroducePcitureUrl"; + public static final String NURSE_STATION_INTRODUCE_TYPE = "stationIntroducePictureUrl"; /** * 护理站项目图片路径上传 diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NearbyNursingStationVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NearbyNursingStationVO.java index 72d2310..64bf893 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NearbyNursingStationVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NearbyNursingStationVO.java @@ -101,7 +101,7 @@ public class NearbyNursingStationVO implements Serializable { /** * 护理站图片路径2 */ - private String stationIntroducePcitureUrl; + private String stationIntroducePictureUrl; /** * 排序 diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nearbynursingstation/NearbyNursingStationMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nearbynursingstation/NearbyNursingStationMapper.xml index a4bdfee..0aa0a5d 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nearbynursingstation/NearbyNursingStationMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nearbynursingstation/NearbyNursingStationMapper.xml @@ -37,7 +37,7 @@ - + @@ -262,7 +262,7 @@ IFNULL(ns.duty_person, '') duty_person, IFNULL(ns.duty_phone, '') duty_phone, IFNULL(ns.station_picture_url, '') station_picture_url, - IFNULL(ns.station_introduce_pciture_url, '') station_introduce_pciture_url, + IFNULL(ns.station_introduce_picture_url, '') station_introduce_picture_url, ns.sort, ns.nurse_grade, ns.opening_hours_describe, diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java index 0728b04..3de81f7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java @@ -226,7 +226,7 @@ public class NurseStation extends BaseDomain implements Serializable { .append("dutyPerson", getDutyPerson()) .append("dutyPhone", getDutyPhone()) .append("stationPictureUrl", getStationPictureUrl()) - .append("stationIntroducePcitureUrl", getStationIntroducePictureUrl()) + .append("stationIntroducePictureUrl", getStationIntroducePictureUrl()) .append("sort", getSort()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/nursestation/NurseStationDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/nursestation/NurseStationDTO.java index 2a6e335..169ccf0 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/nursestation/NurseStationDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/nursestation/NurseStationDTO.java @@ -23,6 +23,7 @@ public class NurseStationDTO extends NurseStation implements Serializable { * 护理站的id **/ private Long nurseStationId; + /** * 护理站标签信息表id集合 **/ diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java index 6931220..79bec62 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java @@ -104,10 +104,10 @@ public interface NurseStationMapper { * 修改护理站简介图片路径 * * @param nurseStationCode 护理站编号 - * @param stationIntroducePcitureUrl 护理站图片路径 + * @param stationIntroducePictureUrl 护理站图片路径 * @return int **/ - int updateNurseStationIntroduceByHead(@Param("nurseStationCode") String nurseStationCode, @Param("stationIntroducePcitureUrl") String stationIntroducePcitureUrl); + int updateNurseStationIntroduceByHead(@Param("nurseStationCode") String nurseStationCode, @Param("stationIntroducePictureUrl") String stationIntroducePictureUrl); /** diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java index 6d7c473..a65e47f 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java @@ -303,7 +303,7 @@ public class NurseStationServiceImpl implements INurseStationService { //获取护理站图片地址 List stationPictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationPictureUrl())).map(NurseStationSysUserVO::getStationPictureUrl).distinct().collect(Collectors.toList()); //获取护理站简介图片地址 - List stationIntroducePictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationIntroducePcitureUrl())).map(NurseStationSysUserVO::getStationIntroducePcitureUrl).distinct().collect(Collectors.toList()); + List stationIntroducePictureUrlList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getStationIntroducePictureUrl())).map(NurseStationSysUserVO::getStationIntroducePictureUrl).distinct().collect(Collectors.toList()); //获取护理站富文本的内容 List nurseStationAgencyIntroduceList = nurseStationIds.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getAgencyIntroduce())).map(NurseStationSysUserVO::getAgencyIntroduce).distinct().collect(Collectors.toList()); // 删除护理站信息 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestation/NurseStationSysUserVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestation/NurseStationSysUserVO.java index fda82b9..234ec78 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestation/NurseStationSysUserVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestation/NurseStationSysUserVO.java @@ -41,7 +41,7 @@ public class NurseStationSysUserVO implements Serializable { /** * 护理站简介图片路径 */ - private String stationIntroducePcitureUrl; + private String stationIntroducePictureUrl; /** * 护理站简介 diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsInfo/GoodsInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsInfo/GoodsInfoMapper.xml index c40aaae..7194f58 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsInfo/GoodsInfoMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/goodsInfo/GoodsInfoMapper.xml @@ -520,7 +520,7 @@ duty_person, duty_phone, station_picture_url, - station_introduce_pciture_url, + station_introduce_picture_url, sort, create_by, create_time, diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml index ca4ff94..8243e2a 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml @@ -52,7 +52,7 @@ - + @@ -108,7 +108,7 @@ duty_person, duty_phone, station_picture_url, - station_introduce_pciture_url, + station_introduce_picture_url, sort, create_by, create_time, @@ -173,8 +173,8 @@ and station_picture_url = #{stationPictureUrl} - - and station_introduce_pciture_url = #{stationIntroducePcitureUrl} + + and station_introduce_picture_url = #{stationIntroducePictureUrl} and sort = #{sort} @@ -270,7 +270,7 @@ ns.duty_person, ns.duty_phone, ns.station_picture_url, - ns.station_introduce_pciture_url, + ns.station_introduce_picture_url, ns.sort, ns.create_by, ns.create_time, @@ -334,7 +334,7 @@ station_picture_url, - station_introduce_pciture_url, + station_introduce_picture_url, sort, @@ -390,7 +390,7 @@ #{stationPictureUrl}, - #{stationIntroducePcitureUrl}, + #{stationIntroducePictureUrl}, #{sort}, @@ -464,8 +464,8 @@ station_picture_url = #{stationPictureUrl}, - station_introduce_pciture_url = - #{stationIntroducePcitureUrl}, + station_introduce_picture_url = + #{stationIntroducePictureUrl}, sort = #{sort}, @@ -535,7 +535,7 @@ update nurse_station - set station_introduce_pciture_url = #{stationIntroducePcitureUrl} + set station_introduce_picture_url = #{stationIntroducePictureUrl} where nurse_station_code = #{nurseStationCode} @@ -586,7 +586,7 @@ duty_person, duty_phone, station_picture_url, - station_introduce_pciture_url, + station_introduce_picture_url, sort, create_by, create_time, @@ -617,7 +617,7 @@ duty_person, duty_phone, station_picture_url, - station_introduce_pciture_url, + station_introduce_picture_url, sort, create_by, create_time, @@ -640,7 +640,7 @@ #{NurseStation.dutyPerson}, #{NurseStation.dutyPhone}, #{NurseStation.stationPictureUrl}, - #{NurseStation.stationIntroducePcitureUrl}, + #{NurseStation.stationIntroducePictureUrl}, #{NurseStation.sort}, #{NurseStation.createBy}, #{NurseStation.createTime}, @@ -769,7 +769,7 @@ ns.nurse_station_name, ns.agency_introduce, ns.station_picture_url, - ns.station_introduce_pciture_url + ns.station_introduce_picture_url FROM nurse_station ns