From d0542b6f8b7ead9cea467f12d989eaabb8ec6e60 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 07 一月 2025 17:06:57 +0800
Subject: [PATCH] 添加车辆运输路线记录
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java | 138 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 108 insertions(+), 30 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
index ce7095b..dbb9d57 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDepartmentServiceImpl.java
@@ -1,9 +1,11 @@
package com.sinata.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.constant.CacheConstants;
+import com.sinata.common.core.domain.entity.SysUser;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
@@ -138,6 +140,45 @@
}
return root;
}
+ @Override
+ public List<SysDepartmentVO> getRegionTree1(String keyword) {
+ SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+
+ List<SysDepartmentVO> root = new ArrayList<>();
+ SysDepartment sysDepartment = this.baseMapper.selectById(sysUser.getDepartmentId());
+ SysDepartment currentDepartment = this.baseMapper.selectById(sysDepartment.getParentId());
+ if (Objects.isNull(currentDepartment)) {
+ return root;
+ }
+ if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
+ return root;
+ }
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+ SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ root.add(sysDepartmentVO);
+ if (StringUtils.isNotBlank(keyword)) {
+ treeMatch(root, keyword);
+ }
+ return root;
+ }
+ public List<SysDepartmentVO> getRegionTree2(String keyword) {
+
+ List<SysDepartmentVO> root = new ArrayList<>();
+ SysDepartment currentDepartment = this.baseMapper.selectById(-1);
+ if (Objects.isNull(currentDepartment)) {
+ return root;
+ }
+ if (!currentDepartment.getOrgType().equals(DepartmentEnum.REGION.getCode())) {
+ return root;
+ }
+ Map<Long, List<SysDepartment>> childrenMap = getChildrenDepartmentByOrgType(currentDepartment, Collections.singletonList(DepartmentEnum.REGION.getCode()));
+ SysDepartmentVO sysDepartmentVO = fillChildrenTreeModel(currentDepartment, childrenMap);
+ root.add(sysDepartmentVO);
+ if (StringUtils.isNotBlank(keyword)) {
+ treeMatch(root, keyword);
+ }
+ return root;
+ }
/**
* 获取当前登录用户所属区域
@@ -223,7 +264,7 @@
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
//获取部门树编码
department.setOrgType(DepartmentEnum.REGION.getCode());
- department.setTreeCode(getTreeCode(dto.getParentId()));
+ department.setTreeCode(generateTreeCode(dto.getParentId()));
department.setOrgCode(getOrgCode(dto.getParentId(), DepartmentEnum.REGION.getCode()));
save(department);
}
@@ -258,7 +299,7 @@
SysDepartment sysDepartment = getById(dto.getId());
if (!dto.getParentId().equals(sysDepartment.getParentId())) {
//获取部门树编码
- department.setTreeCode(getTreeCode(dto.getParentId()));
+ department.setTreeCode(generateTreeCode(dto.getParentId()));
}
updateById(department);
}
@@ -270,7 +311,7 @@
* @return
*/
@Override
- public String getTreeCode(Long parentId) {
+ public String generateTreeCode(Long parentId) {
String treeId;
String preTreeCode = "";
@@ -363,15 +404,22 @@
*/
@Override
public PageDTO<MedicalInstitutionVO> pageMedicalList(DepartmentQuery query) {
- String treeCode = "";
+ String treeCode;
if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
+ SysDepartment department = getMyDepartment();
+ treeCode = department.getTreeCode();
+ } else {
+ SysDepartment department = getById(query.getDepartmentId());
+ //如果是处置单位，则获取父级部门
+ if (department.getOrgType().equals(DepartmentEnum.DISPOSAL_UNIT.getCode())) {
+ department = getDepartmentByParentId(department.getParentId());
}
- treeCode = myDepartment.getTreeCode();
+ treeCode = department.getTreeCode();
}
- Page<MedicalInstitutionVO> page = baseMapper.pageMedicalList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getDepartmentName(), query.getContactPerson(), query.getContactPhone(), treeCode);
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MedicalInstitutionVO> page = baseMapper.pageMedicalList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentName(), query.getContactPerson(), query.getContactPhone(), treeCode);
return PageDTO.of(page);
}
@@ -401,7 +449,7 @@
throw new ServiceException("医疗机构已存在");
}
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.MEDICAL_INSTITUTION.getCode()));
department.setOrgType(DepartmentEnum.MEDICAL_INSTITUTION.getCode());
//查询父级完整区域
@@ -413,6 +461,12 @@
sysDepartmentInfoService.save(sysDepartmentInfo);
}
+ /**
+ * 根据父级区域id查询处置单位列表
+ *
+ * @param id
+ * @return
+ */
@Override
public List<DisposalUnitVO> getDisposalUnitListByParentId(Long id) {
List<DisposalUnitVO> disposalUnitList = null;
@@ -425,7 +479,7 @@
}
/**
- * 获取完成区域
+ * 获取完整区域
*
* @param department
* @return
@@ -475,7 +529,7 @@
}
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
if (!department.getParentId().equals(sysDepartment.getParentId())) {
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
//查询父级完整区域
String region = getRegionName(parent);
department.setRegion(region);
@@ -524,13 +578,9 @@
*/
@Override
public PageDTO<DisposalUnitVO> pageDisposalUnitList(DepartmentQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
+ String treeCode = getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
Page<DisposalUnitVO> page = baseMapper.pageRegulatoryUnitList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), query.getDepartmentName(), query.getContactPerson(), query.getContactPhone(), treeCode);
return PageDTO.of(page);
@@ -562,7 +612,7 @@
throw new ServiceException("处置单位已存在");
}
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.DISPOSAL_UNIT.getCode()));
department.setOrgType(DepartmentEnum.DISPOSAL_UNIT.getCode());
//查询父级完整区域
@@ -609,7 +659,7 @@
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
if (!department.getParentId().equals(sysDepartment.getParentId())) {
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
//查询父级完整区域
String region = getRegionName(parent);
department.setRegion(region);
@@ -650,19 +700,16 @@
*/
@Override
public PageDTO<RegulatoryUnitVO> pageRegulatoryUnitList(DepartmentQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
+ String treeCode = getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
Page<SysDepartment> page = this.lambdaQuery().eq(Objects.nonNull(query.getDepartmentId()), SysDepartment::getParentId, query.getDepartmentId())
.likeRight(StringUtils.isNotBlank(treeCode), SysDepartment::getTreeCode, treeCode)
.like(StringUtils.isNotEmpty(query.getDepartmentName()), SysDepartment::getDepartmentName, query.getDepartmentName())
.like(StringUtils.isNotBlank(query.getContactPerson()), SysDepartment::getContactPerson, query.getContactPerson())
.like(StringUtils.isNotBlank(query.getContactPhone()), SysDepartment::getContactPhone, query.getContactPhone())
+ .eq(SysDepartment::getOrgType, DepartmentEnum.REGULATORY_UNIT.getCode())
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
return PageDTO.of(page, RegulatoryUnitVO.class);
}
@@ -692,7 +739,7 @@
throw new ServiceException("监管单位已存在");
}
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
department.setOrgCode(getOrgCode(parent.getId(), DepartmentEnum.REGULATORY_UNIT.getCode()));
department.setOrgType(DepartmentEnum.REGULATORY_UNIT.getCode());
//查询父级完整区域
@@ -736,7 +783,7 @@
SysDepartment department = BeanUtils.copyBean(dto, SysDepartment.class);
if (!department.getParentId().equals(sysDepartment.getParentId())) {
- department.setTreeCode(getTreeCode(parent.getId()));
+ department.setTreeCode(generateTreeCode(parent.getId()));
//查询父级完整区域
String region = getRegionName(parent);
department.setRegion(region);
@@ -772,4 +819,35 @@
}
removeById(id);
}
+
+ /**
+ * 根据部门id获取树编码，如果为空则获取当前登录用户所在区域树编码
+ *
+ * @param departmentId
+ * @return
+ */
+ @Override
+ public String getTreeCodeByDepartmentId(Long departmentId) {
+ SysDepartment department;
+ if (Objects.isNull(departmentId)) {
+ department = getMyDepartment();
+ } else {
+ department = getById(departmentId);
+ }
+ if (Objects.nonNull(department)) {
+ return department.getTreeCode();
+ }
+ return null;
+ }
+
+ /**
+ * 路线关联医院列表
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public List<MedicalInstitutionVO> getHospitalListByRouteId(Long id) {
+ return baseMapper.getHospitalListByRouteId(id);
+ }
}
--
Gitblit v1.7.1