From 8f31ab72b8ab372901b47bcacfe45a44e696f553 Mon Sep 17 00:00:00 2001 From: youxilong Date: Wed, 28 Feb 2024 14:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E5=8F=8A=E5=85=B6=E4=B8=8B=E5=B1=9E=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/DepartmentController.java | 14 ++-- .../manage/domain/department/Department.java | 8 --- .../com/xinelu/manage/dto/DepartmentDto.java | 66 +++++++++++++++++++ .../mapper/department/DepartmentMapper.java | 16 +++-- .../department/IDepartmentService.java | 16 +++-- .../impl/DepartmentServiceImpl.java | 17 ++--- .../textmessage/ITextMessageService.java | 61 +++++++++++++++++ .../manage/department/DepartmentMapper.xml | 6 +- 8 files changed, 166 insertions(+), 38 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/DepartmentDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java index 49f17832..c9e6e0cc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java @@ -3,11 +3,11 @@ package com.xinelu.manage.controller.department; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.dto.DepartmentDto; import com.xinelu.manage.service.department.IDepartmentService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -99,8 +99,8 @@ public class DepartmentController extends BaseController { * 查询科室信息列表及包含话术数量 */ @GetMapping("/listScriptNum") - public AjaxResult listScriptNum(Department department) { - List list = departmentService.selectDepartmentListScriptNum(department); + public AjaxResult listScriptNum(DepartmentDto departmentDto) { + List list = departmentService.selectDepartmentListScriptNum(departmentDto); return AjaxResult.success(list); } @@ -108,8 +108,8 @@ public class DepartmentController extends BaseController { * 查询科室信息列表及包含手术数量 */ @GetMapping("/listOperationNum") - public AjaxResult listOperationNum(Department department) { - List list = departmentService.selectDepartmentListOperationNum(department); + public AjaxResult listOperationNum(DepartmentDto departmentDto) { + List list = departmentService.selectDepartmentListOperationNum(departmentDto); return AjaxResult.success(list); } @@ -117,8 +117,8 @@ public class DepartmentController extends BaseController { * 查询科室信息列表及包含微信库数量 */ @GetMapping("/listWechatTemplateNum") - public AjaxResult listWechatTemplateNum(Department department) { - List list = departmentService.selectDepartmentListWechatTemplateNum(department); + public AjaxResult listWechatTemplateNum(DepartmentDto departmentDto) { + List list = departmentService.selectDepartmentListWechatTemplateNum(departmentDto); return AjaxResult.success(list); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java index a6c96196..93349be5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java @@ -176,13 +176,6 @@ public class Department extends BaseEntity { @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd") private Date revokeDate; - /** - * 包含附属数量：比如科室下所含话术数量 - */ - @ApiModelProperty(value = "包含附属数量") - private Integer countNum; - - @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -207,7 +200,6 @@ public class Department extends BaseEntity { .append("departmentMail", getDepartmentMail()) .append("establishDate", getEstablishDate()) .append("revokeDate", getRevokeDate()) - .append("countNum", getCountNum()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/DepartmentDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/DepartmentDto.java new file mode 100644 index 00000000..3b7b42b5 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/DepartmentDto.java @@ -0,0 +1,66 @@ +package com.xinelu.manage.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.models.auth.In; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * @author : youxilong + * @date : 2024/2/28 14:44 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "科室信息Dto对象") +public class DepartmentDto extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ApiModelProperty(value = "科室id") + private Long id; + + /** + * 科室名称 + */ + @ApiModelProperty(value = "科室名称") + private String departmentName; + + /** + * 科室代码 + */ + @ApiModelProperty(value = "科室代码") + private String departmentCode; + + /** + *所属科室下属数量：比如科室下所含话术数量 + */ + @ApiModelProperty(value = "科室代码") + private Integer countNum; + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("departmentName", getDepartmentName()) + .append("departmentCode", getDepartmentCode()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java index a0a6f072..c1789eb3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.department; import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.dto.DepartmentDto; import java.util.List; @@ -62,23 +63,26 @@ public interface DepartmentMapper { /** * 查询科室信息列表及包含话术数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListScriptNum(Department department); + List selectDepartmentListScriptNum(DepartmentDto departmentDto); /** * 查询科室信息列表及包含手术数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListOperationNum(Department department); + List selectDepartmentListOperationNum(DepartmentDto departmentDto); /** * 查询科室信息列表及包含微信库数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListWechatTemplateNum(Department department); + List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java index f4133ebe..dd12bf81 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.department; import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.dto.DepartmentDto; import java.util.List; @@ -62,22 +63,25 @@ public interface IDepartmentService { /** * 查询科室信息列表及包含话术数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListScriptNum(Department department); + List selectDepartmentListScriptNum(DepartmentDto departmentDto); /** * 查询科室信息列表及包含手术数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListOperationNum(Department department); + List selectDepartmentListOperationNum(DepartmentDto departmentDto); /** * 查询科室信息列表及包含微信库数量 - * @param department + * + * @param departmentDto * @return */ - List selectDepartmentListWechatTemplateNum(Department department); + List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java index 336b9c72..d9dee418 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.department.impl; import com.xinelu.common.utils.DateUtils; import com.xinelu.manage.domain.department.Department; +import com.xinelu.manage.dto.DepartmentDto; import com.xinelu.manage.mapper.department.DepartmentMapper; import com.xinelu.manage.service.department.IDepartmentService; import org.springframework.stereotype.Service; @@ -96,29 +97,29 @@ public class DepartmentServiceImpl implements IDepartmentService { * @return */ @Override - public List selectDepartmentListScriptNum(Department department) { - return departmentMapper.selectDepartmentListScriptNum(department); + public List selectDepartmentListScriptNum(DepartmentDto departmentDto) { + return departmentMapper.selectDepartmentListScriptNum(departmentDto); } /** * 查询科室信息列表及包含手术数量 * - * @param department + * @param departmentDto * @return */ @Override - public List selectDepartmentListOperationNum(Department department) { - return departmentMapper.selectDepartmentListOperationNum(department); + public List selectDepartmentListOperationNum(DepartmentDto departmentDto) { + return departmentMapper.selectDepartmentListOperationNum(departmentDto); } /** * 查询科室信息列表及包含微信库数量 * - * @param department + * @param departmentDto * @return */ @Override - public List selectDepartmentListWechatTemplateNum(Department department) { - return departmentMapper.selectDepartmentListWechatTemplateNum(department); + public List selectDepartmentListWechatTemplateNum(DepartmentDto departmentDto) { + return departmentMapper.selectDepartmentListWechatTemplateNum(departmentDto); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java new file mode 100644 index 00000000..7b10254e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/ITextMessageService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.textmessage; + +import com.xinelu.manage.domain.textmessage.TextMessage; + +import java.util.List; + +/** + * 短信模板信息Service接口 + * + * @author xinelu + * @date 2024-02-28 + */ +public interface ITextMessageService { + /** + * 查询短信模板信息 + * + * @param id 短信模板信息主键 + * @return 短信模板信息 + */ + public TextMessage selectTextMessageById(Long id); + + /** + * 查询短信模板信息列表 + * + * @param textMessage 短信模板信息 + * @return 短信模板信息集合 + */ + public List selectTextMessageList(TextMessage textMessage); + + /** + * 新增短信模板信息 + * + * @param textMessage 短信模板信息 + * @return 结果 + */ + public int insertTextMessage(TextMessage textMessage); + + /** + * 修改短信模板信息 + * + * @param textMessage 短信模板信息 + * @return 结果 + */ + public int updateTextMessage(TextMessage textMessage); + + /** + * 批量删除短信模板信息 + * + * @param ids 需要删除的短信模板信息主键集合 + * @return 结果 + */ + public int deleteTextMessageByIds(Long[] ids); + + /** + * 删除短信模板信息信息 + * + * @param id 短信模板信息主键 + * @return 结果 + */ + public int deleteTextMessageById(Long id); +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index 241f5090..ea65defe 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -163,7 +163,7 @@ where id = #{id} - select d.id, d.department_name, d.department_code, @@ -182,7 +182,7 @@ d.department_code - select d.id, d.department_name, d.department_code, @@ -201,7 +201,7 @@ d.department_code