xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

护理站管理代码移植修改

Browse Source
This commit is contained in:
张恒 2023-09-20 15:36:32 +08:00
parent 30a6e1b575
commit 43466c5b12
28 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xinelu-nurse-manage/src/main/java/com/xinelu/applet/controller/nursestation/NurseStationController.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestation/NurseStationController.java
View File

@ -1,11 +1,11 @@
package com.xinelu.applet.controller.nursestation;
package com.xinelu.manage.controller.nursestation;
import com.xinelu.applet.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.applet.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationVO;
import com.xinelu.applet.service.nursestation.INurseStationService;
import com.xinelu.manage.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.manage.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationVO;
import com.xinelu.manage.service.nursestation.INurseStationService;
import com.xinelu.common.annotation.Log;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.core.controller.BaseController;

6
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationDTO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationDTO.java
View File

@ -1,7 +1,7 @@
package com.xinelu.applet.domain.dto.nursestation;
package com.xinelu.manage.domain.dto.nursestation;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.vo.nursestation.NurseStationLabelVO;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.vo.nursestation.NurseStationLabelVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationImportDTO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationImportDTO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.dto.nursestation;
package com.xinelu.manage.domain.dto.nursestation;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nurseclassifyinfo/NurseClassifyInfo.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nurseclassifyinfo/NurseClassifyInfo.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nurseclassifyinfo;
package com.xinelu.manage.domain.nurseclassifyinfo;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

6
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestation/NurseStation.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nursestation;
package com.xinelu.manage.domain.nursestation;
import com.xinelu.common.annotation.Excel;
@ -158,7 +158,7 @@ public class NurseStation extends BaseDomain implements Serializable {
*/
@ApiModelProperty(value = "护理站简介图片路径")
@Excel(name = "护理站简介图片路径")
private String stationIntroducePcitureUrl;
private String stationIntroducePictureUrl;
/**
* 排序
@ -226,7 +226,7 @@ public class NurseStation extends BaseDomain implements Serializable {
.append("dutyPerson", getDutyPerson())
.append("dutyPhone", getDutyPhone())
.append("stationPictureUrl", getStationPictureUrl())
.append("stationIntroducePcitureUrl", getStationIntroducePcitureUrl())
.append("stationIntroducePcitureUrl", getStationIntroducePictureUrl())
.append("sort", getSort())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nursestationclassifyrelation;
package com.xinelu.manage.domain.nursestationclassifyrelation;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationitem/NurseStationItem.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationitem/NurseStationItem.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nursestationitem;
package com.xinelu.manage.domain.nursestationitem;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationlabel/NurseStationLabel.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationlabel/NurseStationLabel.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nursestationlabel;
package com.xinelu.manage.domain.nursestationlabel;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursetype/NurseType.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursetype/NurseType.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.nursetype;
package com.xinelu.manage.domain.nursetype;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/sysarea/SysArea.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/sysarea/SysArea.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.sysarea;
package com.xinelu.manage.domain.sysarea;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseDomain;

8
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationAndAreaVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationAndAreaVO.java
View File

@ -1,9 +1,9 @@
package com.xinelu.applet.domain.vo.nursestation;
package com.xinelu.manage.domain.vo.nursestation;
import com.xinelu.applet.domain.nurseclassifyinfo.NurseClassifyInfo;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.vo.sysarea.SysAreaVO;
import com.xinelu.manage.domain.nurseclassifyinfo.NurseClassifyInfo;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.vo.sysarea.SysAreaVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

6
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationByUserVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationByUserVO.java
View File

@ -1,7 +1,7 @@
package com.xinelu.applet.domain.vo.nursestation;
package com.xinelu.manage.domain.vo.nursestation;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.vo.sysarea.SysAreaVO;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.vo.sysarea.SysAreaVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationLabelVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationLabelVO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.vo.nursestation;
package com.xinelu.manage.domain.vo.nursestation;
import com.xinelu.common.annotation.Excel;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationSysUserVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationSysUserVO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.vo.nursestation;
package com.xinelu.manage.domain.vo.nursestation;
import lombok.Data;

8
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationVO.java
View File

@ -1,9 +1,9 @@
package com.xinelu.applet.domain.vo.nursestation;
package com.xinelu.manage.domain.vo.nursestation;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.nursetype.NurseType;
import com.xinelu.applet.domain.vo.sysarea.SysAreaVO;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.nursetype.NurseType;
import com.xinelu.manage.domain.vo.sysarea.SysAreaVO;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/AreaInfoVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/AreaInfoVO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.vo.sysarea;
package com.xinelu.manage.domain.vo.sysarea;
import lombok.Data;

4
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/ParentAreaVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/ParentAreaVO.java
View File

@ -1,6 +1,6 @@
package com.xinelu.applet.domain.vo.sysarea;
package com.xinelu.manage.domain.vo.sysarea;
import com.xinelu.applet.domain.sysarea.SysArea;
import com.xinelu.manage.domain.sysarea.SysArea;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/SysAreaVO.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/SysAreaVO.java
View File

@ -1,4 +1,4 @@
package com.xinelu.applet.domain.vo.sysarea;
package com.xinelu.manage.domain.vo.sysarea;
import lombok.Data;

20
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestation/NurseStationMapper.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java
View File

@ -1,15 +1,15 @@
package com.xinelu.applet.mapper.nursestation;
package com.xinelu.manage.mapper.nursestation;
import com.xinelu.applet.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.nursestationitem.NurseStationItem;
import com.xinelu.applet.domain.nursestationlabel.NurseStationLabel;
import com.xinelu.applet.domain.nursetype.NurseType;
import com.xinelu.applet.domain.vo.nursestation.NurseStationAndAreaVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationByUserVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationVO;
import com.xinelu.manage.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.nursestationitem.NurseStationItem;
import com.xinelu.manage.domain.nursestationlabel.NurseStationLabel;
import com.xinelu.manage.domain.nursetype.NurseType;
import com.xinelu.manage.domain.vo.nursestation.NurseStationAndAreaVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationByUserVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

4
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java
View File

@ -1,7 +1,7 @@
package com.xinelu.applet.mapper.nursestationclassifyrelation;
package com.xinelu.manage.mapper.nursestationclassifyrelation;
import com.xinelu.applet.domain.nursestationclassifyrelation.NurseStationClassifyRelation;
import com.xinelu.manage.domain.nursestationclassifyrelation.NurseStationClassifyRelation;
import java.util.List;

0
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml
View File

6
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.java
View File

@ -1,7 +1,7 @@
package com.xinelu.applet.mapper.nursestationlabel;
package com.xinelu.manage.mapper.nursestationlabel;
import com.xinelu.applet.domain.nursestationlabel.NurseStationLabel;
import com.xinelu.applet.domain.vo.nursestation.NurseStationLabelVO;
import com.xinelu.manage.domain.nursestationlabel.NurseStationLabel;
import com.xinelu.manage.domain.vo.nursestation.NurseStationLabelVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

0
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.xml → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.xml
View File

10
xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/sysarea/SysAreaMapper.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java
View File

@ -1,9 +1,9 @@
package com.xinelu.applet.mapper.sysarea;
package com.xinelu.manage.mapper.sysarea;
import com.xinelu.applet.domain.sysarea.SysArea;
import com.xinelu.applet.domain.vo.sysarea.AreaInfoVO;
import com.xinelu.applet.domain.vo.sysarea.ParentAreaVO;
import com.xinelu.applet.domain.vo.sysarea.SysAreaVO;
import com.xinelu.manage.domain.sysarea.SysArea;
import com.xinelu.manage.domain.vo.sysarea.AreaInfoVO;
import com.xinelu.manage.domain.vo.sysarea.ParentAreaVO;
import com.xinelu.manage.domain.vo.sysarea.SysAreaVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;

18
xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/INurseStationService.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/INurseStationService.java
View File

@ -1,14 +1,14 @@
package com.xinelu.applet.service.nursestation;
package com.xinelu.manage.service.nursestation;
import com.xinelu.applet.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.applet.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.nursestationitem.NurseStationItem;
import com.xinelu.applet.domain.vo.nursestation.NurseStationAndAreaVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationByUserVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.applet.domain.vo.nursestation.NurseStationVO;
import com.xinelu.manage.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.manage.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.nursestationitem.NurseStationItem;
import com.xinelu.manage.domain.vo.nursestation.NurseStationAndAreaVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationByUserVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO;
import com.xinelu.manage.domain.vo.nursestation.NurseStationVO;
import com.xinelu.common.core.domain.AjaxResult;
import org.springframework.web.multipart.MultipartFile;

34
xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/impl/NurseStationServiceImpl.java → xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java
View File

@ -1,19 +1,19 @@
package com.xinelu.applet.service.nursestation.impl;
package com.xinelu.manage.service.nursestation.impl;
import com.xinelu.applet.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.applet.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.applet.domain.nurseclassifyinfo.NurseClassifyInfo;
import com.xinelu.applet.domain.nursestation.NurseStation;
import com.xinelu.applet.domain.nursestationclassifyrelation.NurseStationClassifyRelation;
import com.xinelu.applet.domain.nursestationitem.NurseStationItem;
import com.xinelu.applet.domain.nursetype.NurseType;
import com.xinelu.applet.domain.vo.nursestation.*;
import com.xinelu.applet.domain.vo.sysarea.SysAreaVO;
import com.xinelu.applet.mapper.nursestation.NurseStationMapper;
import com.xinelu.applet.mapper.nursestationclassifyrelation.NurseStationClassifyRelationMapper;
import com.xinelu.applet.mapper.nursestationlabel.NurseStationLabelMapper;
import com.xinelu.applet.mapper.sysarea.SysAreaMapper;
import com.xinelu.applet.service.nursestation.INurseStationService;
import com.xinelu.manage.domain.dto.nursestation.NurseStationDTO;
import com.xinelu.manage.domain.dto.nursestation.NurseStationImportDTO;
import com.xinelu.manage.domain.nurseclassifyinfo.NurseClassifyInfo;
import com.xinelu.manage.domain.nursestation.NurseStation;
import com.xinelu.manage.domain.nursestationclassifyrelation.NurseStationClassifyRelation;
import com.xinelu.manage.domain.nursestationitem.NurseStationItem;
import com.xinelu.manage.domain.nursetype.NurseType;
import com.xinelu.manage.domain.vo.nursestation.*;
import com.xinelu.manage.domain.vo.sysarea.SysAreaVO;
import com.xinelu.manage.mapper.nursestation.NurseStationMapper;
import com.xinelu.manage.mapper.nursestationclassifyrelation.NurseStationClassifyRelationMapper;
import com.xinelu.manage.mapper.nursestationlabel.NurseStationLabelMapper;
import com.xinelu.manage.mapper.sysarea.SysAreaMapper;
import com.xinelu.manage.service.nursestation.INurseStationService;
import com.xinelu.common.config.AppletPageConfig;
import com.xinelu.common.config.XinELuConfig;
import com.xinelu.common.constant.Constants;
@ -280,9 +280,9 @@ public class NurseStationServiceImpl implements INurseStationService {
//删除护理站图片地址
this.deletePictureUrl(station.getStationPictureUrl());
}
if (StringUtils.isNotBlank(nurseStation.getStationIntroducePcitureUrl()) && StringUtils.isNotBlank(station.getStationIntroducePcitureUrl()) && !nurseStation.getStationIntroducePcitureUrl().equals(station.getStationIntroducePcitureUrl())) {
if (StringUtils.isNotBlank(nurseStation.getStationIntroducePictureUrl()) && StringUtils.isNotBlank(station.getStationIntroducePictureUrl()) && !nurseStation.getStationIntroducePictureUrl().equals(station.getStationIntroducePictureUrl())) {
//删除护理站简介图片地址
this.deletePictureUrl(station.getStationIntroducePcitureUrl());
this.deletePictureUrl(station.getStationIntroducePictureUrl());
}
//删除护理站富文本图片
this.deleteNurseStationPictureUrl(nurseStation, station);

26
xinelu-nurse-manage/src/main/resources/mapper/manage/nursestation/NurseStationMapper.xml
View File

@ -20,7 +20,7 @@
<result property="dutyPerson" column="duty_person"/>
<result property="dutyPhone" column="duty_phone"/>
<result property="stationPictureUrl" column="station_picture_url"/>
<result property="stationIntroducePcitureUrl" column="station_introduce_pciture_url"/>
<result property="stationIntroducePictureUrl" column="station_introduce_picture_url"/>
<result property="sort" column="sort"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@ -36,7 +36,7 @@
</resultMap>
<resultMap type="com.xinelu.applet.domain.vo.nursestation.NurseStationAndAreaVO" id="NurseStationResultInFo">
<resultMap type="com.xinelu.manage.domain.vo.nursestation.NurseStationAndAreaVO" id="NurseStationResultInFo">
<result property="id" column="id"/>
<result property="areaCode" column="area_code"/>
<result property="userId" column="user_id"/>
@ -68,7 +68,7 @@
<collection property="nurseClassifyInfoList" javaType="java.util.List" resultMap="NurseClassifyInfoResult"/>
</resultMap>
<resultMap type="com.xinelu.applet.domain.vo.nursestation.NurseStationLabelVO" id="NurseStationLabelInfo">
<resultMap type="com.xinelu.manage.domain.vo.nursestation.NurseStationLabelVO" id="NurseStationLabelInfo">
<result property="id" column="id"/>
<result property="nurseStationId" column="nurse_station_id"/>
<result property="userId" column="user_id"/>
@ -124,8 +124,8 @@
from nurse_station
</sql>
<select id="selectNurseStationList" parameterType="com.xinelu.applet.domain.vo.nursestation.NurseStationVO"
resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationVO">
<select id="selectNurseStationList" parameterType="com.xinelu.manage.domain.vo.nursestation.NurseStationVO"
resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationVO">
<include refid="selectNurseStationVo"/>
<where>
<if test="areaCode != null ">
@ -202,7 +202,7 @@
</select>
<select id="selectNurseStationListByUser" parameterType="NurseStation"
resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationByUserVO">
resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationByUserVO">
<include refid="selectNurseStationVo"/>
<where>
<if test="areaCode != null ">
@ -552,7 +552,7 @@
</where>
</select>
<select id="selectNurseStationListByIds" resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationByUserVO">
<select id="selectNurseStationListByIds" resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationByUserVO">
<include refid="selectNurseStationVo"/>
<where>
<if test="nurseStationIdList != null and nurseStationIdList.size() > 0">
@ -694,7 +694,7 @@
</where>
</select>
<select id="getSysDictNurseTypeCode" resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationVO">
<select id="getSysDictNurseTypeCode" resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationVO">
SELECT sdt.dict_name,
sdd.dict_label nurseTypeName,
sdd.dict_value nurseTypeCode
@ -747,8 +747,8 @@
</select>
<select id="getNurseStationByUserId" parameterType="com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO"
resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO">
<select id="getNurseStationByUserId" parameterType="com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO"
resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO">
SELECT
su.user_id,
su.nurse_station_ids
@ -762,8 +762,8 @@
order by su.create_time desc
</select>
<select id="getNurseStationIds" parameterType="com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO"
resultType="com.xinelu.applet.domain.vo.nursestation.NurseStationSysUserVO">
<select id="getNurseStationIds" parameterType="com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO"
resultType="com.xinelu.manage.domain.vo.nursestation.NurseStationSysUserVO">
SELECT
ns.id nurseStationId,
ns.nurse_station_name,
@ -783,7 +783,7 @@
order by ns.create_time desc
</select>
<select id="getAllNurseStationInfo" resultType="com.xinelu.applet.domain.dto.nursestation.NurseStationImportDTO">
<select id="getAllNurseStationInfo" resultType="com.xinelu.manage.domain.dto.nursestation.NurseStationImportDTO">
select nurse_station_name, phone, address, duty_person, duty_phone, agency_introduce FROM nurse_station
<where>
<if test="nurseStationNameList != null and nurseStationNameList.size() > 0">

22
xinelu-nurse-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml
View File

@ -63,7 +63,7 @@
order by sort
</select>
<select id="selectSysAreaById" resultType="com.xinelu.applet.domain.sysarea.SysArea"
<select id="selectSysAreaById" resultType="com.xinelu.manage.domain.sysarea.SysArea"
resultMap="SysAreaResult">
<include refid="selectSysAreaVo"/>
<where>
@ -183,7 +183,7 @@
</delete>
<select id="getCityInfoList"
resultType="com.xinelu.applet.domain.vo.sysarea.AreaInfoVO">
resultType="com.xinelu.manage.domain.vo.sysarea.AreaInfoVO">
SELECT id,
parent_id,
area_code,
@ -196,7 +196,7 @@
</select>
<select id="getStreetInfoList"
resultType="com.xinelu.applet.domain.vo.sysarea.AreaInfoVO">
resultType="com.xinelu.manage.domain.vo.sysarea.AreaInfoVO">
SELECT
id,
parent_id,
@ -217,7 +217,7 @@
</select>
<select id="getSubordinateRegionsFindSuperiorRegions" parameterType="String"
resultType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO">
resultType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO">
SELECT province.area_name province_name,
province.area_code province_code,
city.area_name city_name,
@ -252,8 +252,8 @@
</select>
<select id="getNurseStationAreaByList" parameterType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO">
<select id="getNurseStationAreaByList" parameterType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO">
SELECT
province.area_name province_name,
province.area_code province_code,
@ -280,8 +280,8 @@
</if>
</select>
<select id="getNurseStationGoodsAreaByList" parameterType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO">
<select id="getNurseStationGoodsAreaByList" parameterType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO">
SELECT
province.area_name province_name,
province.area_code province_code,
@ -307,8 +307,8 @@
</select>
<select id="getNurseStationAreaByCode" parameterType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.applet.domain.vo.sysarea.SysAreaVO">
<select id="getNurseStationAreaByCode" parameterType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO"
resultType="com.xinelu.manage.domain.vo.sysarea.SysAreaVO">
SELECT province.area_name province_name,
province.area_code province_code,
city.area_name city_name,
@ -342,7 +342,7 @@
AND region.area_code = #{areaCode} limit 1;
</select>
<select id="selectParentName" resultType="com.xinelu.applet.domain.vo.sysarea.ParentAreaVO">
<select id="selectParentName" resultType="com.xinelu.manage.domain.vo.sysarea.ParentAreaVO">
SELECT sa.id,
sa.parent_code,
(select area_name FROM sys_area where area_code = sa.parent_code) parentName,