diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/controller/nursestation/NurseStationController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestation/NurseStationController.java similarity index 95% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/controller/nursestation/NurseStationController.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestation/NurseStationController.java index f19b99c..deedc21 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/controller/nursestation/NurseStationController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestation/NurseStationController.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationDTO.java similarity index 87% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationDTO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationDTO.java index 3ac2ad3..4d49bae 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationDTO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationImportDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationImportDTO.java similarity index 97% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationImportDTO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationImportDTO.java index 3d3733c..5051986 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/dto/nursestation/NurseStationImportDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/dto/nursestation/NurseStationImportDTO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nurseclassifyinfo/NurseClassifyInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nurseclassifyinfo/NurseClassifyInfo.java similarity index 98% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nurseclassifyinfo/NurseClassifyInfo.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nurseclassifyinfo/NurseClassifyInfo.java index 3b0ca1c..c068b26 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nurseclassifyinfo/NurseClassifyInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nurseclassifyinfo/NurseClassifyInfo.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestation/NurseStation.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java similarity index 98% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestation/NurseStation.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java index 790595d..0728b04 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestation/NurseStation.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestation/NurseStation.java @@ -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()) diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java similarity index 96% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java index a180402..5550b00 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationclassifyrelation/NurseStationClassifyRelation.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationitem/NurseStationItem.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationitem/NurseStationItem.java similarity index 99% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationitem/NurseStationItem.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationitem/NurseStationItem.java index 50d19ff..1ee94e8 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationitem/NurseStationItem.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationitem/NurseStationItem.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationlabel/NurseStationLabel.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationlabel/NurseStationLabel.java similarity index 98% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationlabel/NurseStationLabel.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationlabel/NurseStationLabel.java index 74dbe63..285df7c 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursestationlabel/NurseStationLabel.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationlabel/NurseStationLabel.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursetype/NurseType.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursetype/NurseType.java similarity index 98% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursetype/NurseType.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursetype/NurseType.java index 0617273..72df2d5 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/nursetype/NurseType.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursetype/NurseType.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/sysarea/SysArea.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/sysarea/SysArea.java similarity index 98% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/sysarea/SysArea.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/sysarea/SysArea.java index 1a47591..6734e34 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/sysarea/SysArea.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/sysarea/SysArea.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationAndAreaVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationAndAreaVO.java similarity index 85% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationAndAreaVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationAndAreaVO.java index afdfb82..6dff826 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationAndAreaVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationAndAreaVO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationByUserVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationByUserVO.java similarity index 76% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationByUserVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationByUserVO.java index 970aa5c..c3b2cad 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationByUserVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationByUserVO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationLabelVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationLabelVO.java similarity index 97% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationLabelVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationLabelVO.java index e257482..10f63a7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationLabelVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationLabelVO.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.domain.vo.nursestation; +package com.xinelu.manage.domain.vo.nursestation; import com.xinelu.common.annotation.Excel; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationSysUserVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationSysUserVO.java similarity index 94% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationSysUserVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationSysUserVO.java index 3b12a00..6dd8aa2 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationSysUserVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationSysUserVO.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.domain.vo.nursestation; +package com.xinelu.manage.domain.vo.nursestation; import lombok.Data; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationVO.java similarity index 79% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationVO.java index a596580..1911691 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/nursestation/NurseStationVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/nursestation/NurseStationVO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/AreaInfoVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/AreaInfoVO.java similarity index 94% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/AreaInfoVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/AreaInfoVO.java index 7e1d718..c4f3d3a 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/AreaInfoVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/AreaInfoVO.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.domain.vo.sysarea; +package com.xinelu.manage.domain.vo.sysarea; import lombok.Data; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/ParentAreaVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/ParentAreaVO.java similarity index 82% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/ParentAreaVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/ParentAreaVO.java index 0a10ff4..b7af585 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/ParentAreaVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/ParentAreaVO.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/SysAreaVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/SysAreaVO.java similarity index 95% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/SysAreaVO.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/SysAreaVO.java index a669783..32bb4f8 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/domain/vo/sysarea/SysAreaVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/vo/sysarea/SysAreaVO.java @@ -1,4 +1,4 @@ -package com.xinelu.applet.domain.vo.sysarea; +package com.xinelu.manage.domain.vo.sysarea; import lombok.Data; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestation/NurseStationMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java similarity index 92% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestation/NurseStationMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java index b52d71c..8c997e7 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestation/NurseStationMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestation/NurseStationMapper.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java similarity index 95% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java index 9fcd8cc..9080cb0 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml similarity index 100% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationclassifyrelation/NurseStationClassifyRelationMapper.xml diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.java similarity index 92% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.java index ce8ffa8..a7cd323 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.xml b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.xml similarity index 100% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/nursestationlabel/NurseStationLabelMapper.xml rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/nursestationlabel/NurseStationLabelMapper.xml diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/sysarea/SysAreaMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java similarity index 91% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/sysarea/SysAreaMapper.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java index 1f41233..0e744a2 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/mapper/sysarea/SysAreaMapper.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/sysarea/SysAreaMapper.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/INurseStationService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/INurseStationService.java similarity index 87% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/INurseStationService.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/INurseStationService.java index 086ce01..c334558 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/INurseStationService.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/INurseStationService.java @@ -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; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/impl/NurseStationServiceImpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java similarity index 97% rename from xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/impl/NurseStationServiceImpl.java rename to xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java index 49d5e3c..b44287d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/applet/service/nursestation/impl/NurseStationServiceImpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/nursestation/impl/NurseStationServiceImpl.java @@ -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); 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 0967ef1..81aeeed 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 @@ -20,7 +20,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -124,8 +124,8 @@ from nurse_station - @@ -202,7 +202,7 @@ - @@ -694,7 +694,7 @@ - SELECT sdt.dict_name, sdd.dict_label nurseTypeName, sdd.dict_value nurseTypeCode @@ -747,8 +747,8 @@ - SELECT su.user_id, su.nurse_station_ids @@ -762,8 +762,8 @@ order by su.create_time desc - SELECT ns.id nurseStationId, ns.nurse_station_name, @@ -783,7 +783,7 @@ order by ns.create_time desc - select nurse_station_name, phone, address, duty_person, duty_phone, agency_introduce FROM nurse_station diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml index e7e89d1..55655f7 100644 --- a/xinelu-nurse-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/sysarea/SysAreaMapper.xml @@ -63,7 +63,7 @@ order by sort - + resultType="com.xinelu.manage.domain.vo.sysarea.AreaInfoVO"> SELECT id, parent_id, area_code, @@ -196,7 +196,7 @@ - SELECT province.area_name province_name, province.area_code province_code, @@ -280,8 +280,8 @@ - SELECT province.area_name province_name, province.area_code province_code, @@ -307,8 +307,8 @@ - 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 sa.id, sa.parent_code, (select area_name FROM sys_area where area_code = sa.parent_code) parentName,