From 2ecb3e50fa8c365fd267345d301cc0738ccbbb73 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 7 May 2024 09:06:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xinelu/common/constant/Constants.java | 2 +- .../service/agency/impl/AgencyServiceImpl.java | 13 ++++++++----- .../impl/AgencyCategoryServiceImpl.java | 5 +++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java index e118190c..5a2a6d4e 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java @@ -195,7 +195,7 @@ public class Constants { public static final String TASK_STATUS_CODE = "TSC"; /** - * 任务状态编码 + * 机构代码编码 */ public static final String AGENCY_CODE = "AYC"; 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 4eb40e03..5b3b6384 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 @@ -27,10 +27,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; @@ -183,7 +180,13 @@ public class AgencyServiceImpl implements IAgencyService { agency.setValue(agency.getId().toString()); } List agenciesTree = buildDeptTree(agencies); - return agenciesTree.stream().map(AgencyTreeVO::new).collect(Collectors.toList()); + //排序 + List sortedAgenciesTree = agenciesTree.stream().sorted(Comparator.comparing(AgencyVO::getAgencySort)).collect(Collectors.toList()); + for (AgencyVO agencyVO : sortedAgenciesTree) { + List collect = agencyVO.getChildren().stream().sorted(Comparator.comparing(AgencyVO::getAgencySort)).collect(Collectors.toList()); + agencyVO.setChildren(collect); + } + return sortedAgenciesTree.stream().map(AgencyTreeVO::new).collect(Collectors.toList()); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java index c9fd7370..9300523c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java @@ -1,7 +1,9 @@ package com.xinelu.manage.service.agencycategory.impl; +import com.xinelu.common.constant.Constants; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.StringUtils; +import com.xinelu.common.utils.codes.GenerateSystemCodeUtil; import com.xinelu.manage.domain.agencycategory.AgencyCategory; import com.xinelu.manage.mapper.agencycategory.AgencyCategoryMapper; import com.xinelu.manage.service.agencycategory.IAgencyCategoryService; @@ -28,6 +30,8 @@ import java.util.stream.Collectors; public class AgencyCategoryServiceImpl implements IAgencyCategoryService { @Resource private AgencyCategoryMapper agencyCategoryMapper; + @Resource + private GenerateSystemCodeUtil generateSystemCodeUtil; /** * 查询机构类别 @@ -65,6 +69,7 @@ public class AgencyCategoryServiceImpl implements IAgencyCategoryService { } agencyCategory.setCreateTime(LocalDateTime.now()); agencyCategory.setCreateBy(SecurityUtils.getUsername()); + agencyCategory.setCategoryCode(Constants.CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.CATEGORY_CODE)); return agencyCategoryMapper.insertAgencyCategory(agencyCategory); } From d370f1d9b43c67c4b14c80c5d871f6232d3d7517 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 7 May 2024 09:39:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=BA=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/agency/impl/AgencyServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 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 5b3b6384..3542efc0 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 @@ -180,13 +180,7 @@ public class AgencyServiceImpl implements IAgencyService { agency.setValue(agency.getId().toString()); } List agenciesTree = buildDeptTree(agencies); - //排序 - List sortedAgenciesTree = agenciesTree.stream().sorted(Comparator.comparing(AgencyVO::getAgencySort)).collect(Collectors.toList()); - for (AgencyVO agencyVO : sortedAgenciesTree) { - List collect = agencyVO.getChildren().stream().sorted(Comparator.comparing(AgencyVO::getAgencySort)).collect(Collectors.toList()); - agencyVO.setChildren(collect); - } - return sortedAgenciesTree.stream().map(AgencyTreeVO::new).collect(Collectors.toList()); + return agenciesTree.stream().map(AgencyTreeVO::new).collect(Collectors.toList()); } /** From 3b4c4f2c40447c19d5a9bfb36bd6171349b79e57 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 7 May 2024 17:25:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=91=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/department/impl/DepartmentServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 f3de2b33..ee46c83e 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 @@ -124,6 +124,9 @@ public class DepartmentServiceImpl implements IDepartmentService { */ @Override public int updateDepartment(Department department) { + if (Objects.nonNull(department) && Objects.nonNull(department.getId()) && Objects.nonNull(department.getParentDepartmentId()) && department.getId().equals(department.getParentDepartmentId())) { + department.setParentDepartmentId(null); + } department.setUpdateBy(SecurityUtils.getUsername()); department.setUpdateTime(LocalDateTime.now()); return departmentMapper.updateDepartmentById(department);