diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java index 690e7b1..1fc5d9e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java @@ -23,10 +23,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("dict_type") +@TableName("nu_dict_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="dict_type对象", description="业务字典主表") +@ApiModel(value="nu_dict_type对象", description="业务字典主表") public class DictType implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java similarity index 88% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java index b37e4c2..f93ade6 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java @@ -1,24 +1,20 @@ package com.nu.modules.dictType.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: dict_type_item @@ -27,10 +23,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("dict_type_item") +@TableName("nu_dict_type_item") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="dict_type_item对象", description="dict_type_item") +@ApiModel(value="nu_dict_type_item对象", description="dict_type_item") public class DictTypeItem implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml similarity index 67% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml index a2f52f0..769c239 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml similarity index 68% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml index 19118df..9010d83 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java diff --git a/nursing-unit-admin/pom.xml b/nursing-unit-admin/pom.xml index 805b8eb..b36b042 100644 --- a/nursing-unit-admin/pom.xml +++ b/nursing-unit-admin/pom.xml @@ -7,6 +7,7 @@ nursing-unit-parent 2.0.0 + nu基础管理模块 4.0.0 nursing-unit-admin pom diff --git a/nursing-unit-base-core/pom.xml b/nursing-unit-base-core/pom.xml index 16bb52a..077c23a 100644 --- a/nursing-unit-base-core/pom.xml +++ b/nursing-unit-base-core/pom.xml @@ -6,9 +6,9 @@ nursing-unit-parent 2.0.0 + 框架基础模块 4.0.0 nursing-unit-base-core - aliyun diff --git a/nursing-unit-demo/pom.xml b/nursing-unit-demo/pom.xml index 4cd97ea..56083fd 100644 --- a/nursing-unit-demo/pom.xml +++ b/nursing-unit-demo/pom.xml @@ -7,8 +7,8 @@ nursing-unit-parent 2.0.0 + 框架demo模块 4.0.0 - nursing-unit-demo diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index 51b11bb..47e5a7f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -10,7 +10,6 @@ import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-invoicing/pom.xml b/nursing-unit-invoicing/pom.xml index 6fa24e2..86701b0 100644 --- a/nursing-unit-invoicing/pom.xml +++ b/nursing-unit-invoicing/pom.xml @@ -7,8 +7,8 @@ nursing-unit-parent 2.0.0 + 进销存 4.0.0 - nursing-unit-invoicing pom diff --git a/nursing-unit-iot/pom.xml b/nursing-unit-iot/pom.xml index 383741c..9ecc14c 100644 --- a/nursing-unit-iot/pom.xml +++ b/nursing-unit-iot/pom.xml @@ -7,6 +7,7 @@ nursing-unit-parent 2.0.0 + 摄像头 4.0.0 nursing-unit-iot pom diff --git a/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml b/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml new file mode 100644 index 0000000..1f4ba09 --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml @@ -0,0 +1,14 @@ + + + + com.nursingunit.boot + nu-service-directive-api + 2.0.0 + + 4.0.0 + + nu-service-directive-local-api + + diff --git a/nursing-unit-service-directive/nu-service-directive-api/pom.xml b/nursing-unit-service-directive/nu-service-directive-api/pom.xml new file mode 100644 index 0000000..98bed17 --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-api/pom.xml @@ -0,0 +1,25 @@ + + + + com.nursingunit.boot + nursing-unit-service-directive + 2.0.0 + + 4.0.0 + + nu-service-directive-api + pom + + + nu-service-directive-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml new file mode 100644 index 0000000..809337a --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml @@ -0,0 +1,42 @@ + + + com.nursingunit.boot + nursing-unit-service-directive + 2.0.0 + + 4.0.0 + + nu-service-directive-biz + + + + com.nursingunit.boot + nu-service-directive-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + com.belerweb + pinyin4j + 2.5.0 + + + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java similarity index 93% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java index bd92300..3178b74 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_service_type") +@TableName("nu_config_service_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_type对象", description="服务类型") +@ApiModel(value="nu_config_service_type对象", description="服务类型") public class ConfigServiceType implements Serializable { private static final long serialVersionUID = 1L; @@ -41,7 +41,7 @@ public class ConfigServiceType implements Serializable { /**服务类别id*/ @Excel(name = "服务类别", width = 15) @ApiModelProperty(value = "服务类别") - @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型名称*/ @Excel(name = "服务类型名称", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java index 4f7e193..0fea656 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_directive_tag") +@TableName("nu_config_directive_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_directive_tag对象", description="指令标签") +@ApiModel(value="nu_config_directive_tag对象", description="指令标签") public class DirectiveTag implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java index bd0802b..ffc5fec 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_service_category") +@TableName("nu_config_service_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_category对象", description="服务类别") +@ApiModel(value="nu_config_service_category对象", description="服务类别") public class ConfigServiceCategory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java similarity index 94% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java index 987d3a7..92d2687 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java @@ -22,10 +22,10 @@ import java.util.List; * @Version: V1.0 */ @Data -@TableName("config_service_directive") +@TableName("nu_config_service_directive") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_directive对象", description="服务指令") +@ApiModel(value="nu_config_service_directive对象", description="服务指令") public class ConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; @@ -36,12 +36,12 @@ public class ConfigServiceDirective implements Serializable { /**服务类别id*/ @Excel(name = "服务类别", width = 15) @ApiModelProperty(value = "服务类别") - @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型id*/ @Excel(name = "服务类型", width = 15) @ApiModelProperty(value = "服务类型") - @Dict(dicCode = "id" , dictTable = "config_service_type" , dicText = "type_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_type" , dicText = "type_name") private java.lang.String typeId; /**分类标签*/ @Excel(name = "分类标签", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 91% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 81584bf..cfb9cb0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -64,9 +64,9 @@ c.mp4_file, tag.id as tagId, tag.tag_name as tagName - FROM config_service_directive c - LEFT JOIN directive_tag d ON c.id = d.directive_id - LEFT JOIN config_directive_tag tag ON d.tag_id = tag.id + FROM nu_config_service_directive c + LEFT JOIN nu_directive_tag d ON c.id = d.directive_id + LEFT JOIN nu_config_directive_tag tag ON d.tag_id = tag.id c.id IN @@ -77,7 +77,7 @@