From de03286f270f83f93926ef7bd279f22fb47e1d31 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 28 Feb 2024 16:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=A1=8C=E6=94=BF=E5=8C=BA?=
=?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../agency/impl/AgencyServiceImpl.java | 2 +
.../com/xinelu/manage/vo/agency/AgencyVO.java | 10 +++
.../manage/department/DepartmentMapper.xml | 70 ++++++-------------
3 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
index e1f9e9f2..bc39bcef 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
@@ -61,6 +61,8 @@ public class AgencyServiceImpl implements IAgencyService {
agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName());
agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode());
agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName());
+ agency.setCommunityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityCode()) ? "" : nurseStationAndAreaCode.getCommunityCode());
+ agency.setCommunityName(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityName()) ? "" : nurseStationAndAreaCode.getCommunityName());
}
return agency;
}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
index 64ec09b9..906c719b 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
@@ -59,6 +59,16 @@ public class AgencyVO extends Agency {
*/
private String streetCode;
+ /**
+ * 社区名称
+ */
+ private String communityName;
+
+ /**
+ * 社区区域编码
+ */
+ private String communityCode;
+
/**
* 上级机构
*/
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 7568865a..4d9a1c31 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
@@ -65,94 +65,64 @@
- and parent_department_id =
- #{parentDepartmentId}
+ and parent_department_id =#{parentDepartmentId}
- and agency_id =
- #{agencyId}
+ and agency_id =#{agencyId}
- and agency_name like concat('%',
- #{agencyName},
- '%'
- )
+ and agency_name like concat('%',#{agencyName},'%')
- and department_name like concat('%',
- #{departmentName},
- '%'
- )
+ and department_name like concat('%',#{departmentName},'%')
- and department_code =
- #{departmentCode}
+ and department_code =#{departmentCode}
- and department_type =
- #{departmentType}
+ and department_type =#{departmentType}
- and department_abbreviation =
- #{departmentAbbreviation}
+ and department_abbreviation =#{departmentAbbreviation}
- and department_person_id =
- #{departmentPersonId}
+ and department_person_id =#{departmentPersonId}
- and department_person_name like concat('%',
- #{departmentPersonName},
- '%'
- )
+ and department_person_name like concat ('%',#{departmentPersonName},'%')
- and node_type =
- #{nodeType}
+ and node_type =#{nodeType}
- and provide_service_category =
- #{provideServiceCategory}
+ and provide_service_category =#{provideServiceCategory}
- and subdivision_category_id =
- #{subdivisionCategoryId}
+ and subdivision_category_id =#{subdivisionCategoryId}
- and subdivision_category_name like concat('%',
- #{subdivisionCategoryName},
- '%'
- )
+ and subdivision_category_name like concat('%',#{subdivisionCategoryName},'%')
- and norm_department_compare_id =
- #{normDepartmentCompareId}
+ and norm_department_compare_id =#{normDepartmentCompareId}
- and norm_department_compare_name like concat('%',
- #{normDepartmentCompareName},
- '%'
- )
+ and norm_department_compare_name like concat('%',#{normDepartmentCompareName},'%')
- and prepare_beds_count =
- #{prepareBedsCount}
+ and prepare_beds_count =#{prepareBedsCount}
- and department_phone =
- #{departmentPhone}
+ and department_phone =#{departmentPhone}
- and department_mail =
- #{departmentMail}
+ and department_mail =#{departmentMail}
- and establish_date =
- #{establishDate}
+ and establish_date =#{establishDate}
- and revoke_date =
- #{revokeDate}
+ and revoke_date =#{revokeDate}