From 2509d8a5c46cebca331f1c07e5c36b35061ebdc7 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 7 Jun 2024 09:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E9=97=AE=E5=8D=B7=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/textmessage/TextMessageDTO.java       |  3 +-
 .../impl/ServicePackageServiceImpl.java       | 44 +++++++-------
 .../impl/TextMessageServiceImpl.java          |  2 +
 .../servicepackage/ServicePackageMapper.xml   | 57 ++++++++-----------
 .../manage/textmessage/TextMessageMapper.xml  |  6 +-
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/textmessage/TextMessageDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/textmessage/TextMessageDTO.java
index 993b4506..aee51b01 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/textmessage/TextMessageDTO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/textmessage/TextMessageDTO.java
@@ -1,6 +1,7 @@
 package com.xinelu.manage.dto.textmessage;
 
 import com.xinelu.common.annotation.Excel;
+import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -15,7 +16,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "短信模板信息对象DTO")
-public class TextMessageDTO {
+public class TextMessageDTO extends BaseEntity {
 
     /**
      * 所属科室id
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java
index 060d893f..b3de8863 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.servicepackage.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.exception.ServiceException;
@@ -61,28 +62,30 @@ public class ServicePackageServiceImpl implements IServicePackageService {
         return servicePackageDetailVO;
     }
 
-	/**
-	 * 查询服务包基础信息
-	 *
-	 * @param id 服务包基础信息主键
-	 * @return 服务包基础信息
-	 */
-	@Override public ServicePackageVO getById(Long id) {
-		ServicePackageDetailVO servicePackageDetailVo = servicePackageMapper.selectServicePackagesById(id);
-		if (ObjectUtils.isEmpty(servicePackageDetailVo)) {
-			throw new ServiceException("数据传输错误");
-		}
-		ServicePackageVO servicePackageVO = new ServicePackageVO();
-		BeanUtils.copyBeanProp(servicePackageVO, servicePackageDetailVo);
-		return servicePackageVO;
-	}
+    /**
+     * 查询服务包基础信息
+     *
+     * @param id 服务包基础信息主键
+     * @return 服务包基础信息
+     */
+    @Override
+    public ServicePackageVO getById(Long id) {
+        ServicePackageDetailVO servicePackageDetailVo = servicePackageMapper.selectServicePackagesById(id);
+        if (ObjectUtils.isEmpty(servicePackageDetailVo)) {
+            throw new ServiceException("数据传输错误");
+        }
+        ServicePackageVO servicePackageVO = new ServicePackageVO();
+        BeanUtils.copyBeanProp(servicePackageVO, servicePackageDetailVo);
+        return servicePackageVO;
+    }
 
-	/**
+    /**
      * 查询服务包基础信息列表
      *
      * @param servicePackage 服务包基础信息
      * @return 服务包基础信息
      */
+    @DataScope(agencyAlias = "d", deptAlias = "sp")
     @Override
     public TableDataInfo selectServicePackageList(ServicePackage servicePackage) {
         pageServiceUtil.startPage();
@@ -95,11 +98,12 @@ public class ServicePackageServiceImpl implements IServicePackageService {
         return pageServiceUtil.getDataTable(voList);
     }
 
-	@Override public List<ServicePackageVO> selectList(ServicePackage servicePackage) {
-		return servicePackageMapper.selectServicePackageLists(servicePackage);
-	}
+    @Override
+    public List<ServicePackageVO> selectList(ServicePackage servicePackage) {
+        return servicePackageMapper.selectServicePackageLists(servicePackage);
+    }
 
-	/**
+    /**
      * 新增服务包基础信息
      *
      * @param servicePackageAddDTO 服务包基础信息
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java
index 46f18fe3..b7a2edef 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.xinelu.manage.service.textmessage.impl;
 
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.core.domain.entity.SysDictData;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.SecurityUtils;
@@ -66,6 +67,7 @@ public class TextMessageServiceImpl implements ITextMessageService {
      * @param textMessageDTO 短信模板信息
      * @return 短信模板信息
      */
+    @DataScope(agencyAlias = "d", deptAlias = "tm")
     @Override
     public List<TextMessageTaskVO> selectTextMessageList(TextMessageDTO textMessageDTO) {
         List<TextMessageVO> voList = textMessageMapper.selectTextMessageList(textMessageDTO);
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
index 91110841..0ff707b1 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/servicepackage/ServicePackageMapper.xml
@@ -161,55 +161,46 @@
 
     <select id="selectServicePackageLists" resultType="com.xinelu.manage.vo.servicepackage.ServicePackageVO"
             parameterType="com.xinelu.manage.domain.servicepackage.ServicePackage">
-        select id,
-        disease_type_id,
-        disease_type_name,
-        package_name,
-        package_introduction,
-        package_version,
-        package_term,
-        package_term_unit,
-        package_price,
-        package_remark,
-        whether_release
-        from service_package
+        select
+        sp.id,
+        sp.disease_type_id,
+        sp.disease_type_name,
+        sp.package_name,
+        sp.package_introduction,
+        sp.package_version,
+        sp.package_term,
+        sp.package_term_unit,
+        sp.package_price,
+        sp.package_remark,
+        sp.whether_release
+        from service_package sp
+        left join department d on d.id = sp.department_id
         <where>
             <if test="departmentId != null ">
-                and department_id =
-                #{departmentId}
+                and sp.department_id = #{departmentId}
             </if>
             <if test="diseaseTypeId != null ">
-                and disease_type_id =
-                #{diseaseTypeId}
+                and sp.disease_type_id = #{diseaseTypeId}
             </if>
             <if test="diseaseTypeName != null  and diseaseTypeName != ''">
-                and disease_type_name like concat('%',
-                #{diseaseTypeName},
-                '%'
-                )
+                and sp.disease_type_name like concat('%',#{diseaseTypeName},'%')
             </if>
             <if test="packageName != null  and packageName != ''">
-                and package_name like concat('%',
-                #{packageName},
-                '%'
-                )
+                and sp.package_name like concat('%',#{packageName},'%')
             </if>
             <if test="packageVersion != null  and packageVersion != ''">
-                and package_version like concat('%',
-                #{packageVersion},
-                '%'
-                )
+                and sp.package_version like concat('%',#{packageVersion},'%')
             </if>
             <if test="packagePrice != null ">
-                and package_price =
-                #{packagePrice}
+                and sp.package_price = #{packagePrice}
             </if>
             <if test="whetherRelease != null ">
-                and whether_release =
-                #{whetherRelease}
+                and sp.whether_release = #{whetherRelease}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
-        order by create_time DESC
+        order by sp.create_time DESC
     </select>
     <select id="selectServicePackageVoListById"
             resultType="com.xinelu.manage.vo.servicepackagecontent.ServicePackageContentVO">
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
index d6456163..cd50455e 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
@@ -113,8 +113,8 @@
         tmst.suit_task_type_id,
         tmst.suit_task_type_name
         from text_message tm
-        left join text_message_suit_task tmst on
-        tm.id = tmst.message_id
+        left join text_message_suit_task tmst on tm.id = tmst.message_id
+        left join department d on d.id = tm.department_id
         <where>
             <if test="departmentId != null">
                 AND tm.department_id =
@@ -136,6 +136,8 @@
                 AND tm.text_message_status =
                 #{textMessageStatus}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by tm.create_time DESC ,tmst.create_time DESC
     </select>