From 8775d6fe01daa56c0b250d86954bcb16e916b37a Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 3 Jul 2024 15:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LabelFieldInfoController.java | 6 +++- .../TaskPartitionDictMapper.java | 3 ++ .../tasktypedict/TaskTypeDictMapper.java | 8 +++++ .../ILabelFieldInfoService.java | 8 ++++- .../impl/LabelFieldInfoServiceImpl.java | 28 +++++++++++++++-- .../SpecialDiseaseNodeVO.java | 2 ++ .../vo/tasktypedict/TaskTypeDictVO.java | 30 +++++++++++++++++++ .../SpecialDiseaseNodeMapper.xml | 16 +++++----- .../TaskPartitionDictMapper.xml | 8 +++++ .../tasktypedict/TaskTypeDictMapper.xml | 6 ++++ 10 files changed, 103 insertions(+), 12 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java index cd525f84..a83e7042 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java @@ -10,7 +10,6 @@ import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; import com.xinelu.manage.dto.labelfieldinfo.LabelFieldInfoAddDTO; import com.xinelu.manage.service.labelfieldinfo.ILabelFieldInfoService; import com.xinelu.manage.vo.labelfieldinfo.LabelFieldTreeVO; -import com.xinelu.manage.vo.labelfieldinfo.LabelFieldVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -116,4 +115,9 @@ public class LabelFieldInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(labelFieldInfoService.deleteLabelFieldInfoByIds(ids)); } + + @GetMapping("/taskTypeGrouping") + public AjaxResult taskTypeGrouping() { + return labelFieldInfoService.taskTypeGrouping(); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java index 413096b9..4ec120fa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/taskpartitiondict/TaskPartitionDictMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.taskpartitiondict; import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -59,4 +60,6 @@ public interface TaskPartitionDictMapper { * @return 结果 */ int deleteTaskPartitionDictByIds(Long[] ids); + + List selectTaskPartitionList( List ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/tasktypedict/TaskTypeDictMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/tasktypedict/TaskTypeDictMapper.java index 36374dfb..365b1b94 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/tasktypedict/TaskTypeDictMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/tasktypedict/TaskTypeDictMapper.java @@ -1,6 +1,7 @@ package com.xinelu.manage.mapper.tasktypedict; import com.xinelu.manage.domain.tasktypedict.TaskTypeDict; +import com.xinelu.manage.vo.tasktypedict.TaskTypeDictVO; import java.util.List; @@ -59,4 +60,11 @@ public interface TaskTypeDictMapper { * @return 结果 */ public int deleteTaskTypeDictByIds(Long[] ids); + + /** + * 查询任务类型字典列表 + * + * @return 任务类型字典集合 + */ + List selectTaskTypeDicts(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java index 22e55ea6..161964c5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/ILabelFieldInfoService.java @@ -4,7 +4,6 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; import com.xinelu.manage.dto.labelfieldinfo.LabelFieldInfoAddDTO; import com.xinelu.manage.vo.labelfieldinfo.LabelFieldTreeVO; -import com.xinelu.manage.vo.labelfieldinfo.LabelFieldVO; import java.util.List; @@ -75,4 +74,11 @@ public interface ILabelFieldInfoService { * 批量新增标签字段信息 */ int insertLabelFieldInfoList(LabelFieldInfoAddDTO labelFieldInfoAddDTO); + + /** + * 查询任务类型 + * + * @return AjaxResult + */ + AjaxResult taskTypeGrouping(); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index 8ee8f694..4a21119a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -1,14 +1,18 @@ package com.xinelu.manage.service.labelfieldinfo.impl; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.manage.domain.labelfieldinfo.LabelFieldInfo; +import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict; import com.xinelu.manage.dto.labelfieldinfo.LabelFieldInfoAddDTO; -import com.xinelu.manage.mapper.labelfieldcontent.LabelFieldContentMapper; import com.xinelu.manage.mapper.labelfieldinfo.LabelFieldInfoMapper; +import com.xinelu.manage.mapper.taskpartitiondict.TaskPartitionDictMapper; +import com.xinelu.manage.mapper.tasktypedict.TaskTypeDictMapper; import com.xinelu.manage.service.labelfieldinfo.ILabelFieldInfoService; import com.xinelu.manage.vo.labelfieldinfo.LabelFieldTreeVO; import com.xinelu.manage.vo.labelfieldinfo.LabelFieldVO; +import com.xinelu.manage.vo.tasktypedict.TaskTypeDictVO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -32,9 +36,10 @@ import java.util.stream.Collectors; public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { @Resource private LabelFieldInfoMapper labelFieldInfoMapper; - @Resource - private LabelFieldContentMapper labelFieldContentMapper; + private TaskTypeDictMapper taskTypeDictMapper; + @Resource + private TaskPartitionDictMapper taskPartitionDictMapper; /** * 查询标签字段信息 @@ -172,4 +177,21 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { } return 1; } + + @Override + public AjaxResult taskTypeGrouping() { + List taskTypeDictList = taskTypeDictMapper.selectTaskTypeDicts(); + List ids = taskTypeDictList.stream().filter(Objects::nonNull).map(TaskTypeDictVO::getTaskTypeId).filter(Objects::nonNull).collect(Collectors.toList()); + List taskPartitionDicts = taskPartitionDictMapper.selectTaskPartitionList(ids); + if (CollectionUtils.isEmpty(taskPartitionDicts)) { + return AjaxResult.success(taskPartitionDicts); + } + for (TaskTypeDictVO taskTypeDictVO : taskTypeDictList) { + List collect = taskPartitionDicts.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskTypeId()) && taskTypeDictVO.getTaskTypeId().equals(item.getTaskTypeId())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + taskTypeDictVO.setTaskPartitionDictList(collect); + } + } + return AjaxResult.success(taskTypeDictList); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java index 08374d1f..b12537b1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java @@ -27,4 +27,6 @@ public class SpecialDiseaseNodeVO extends SpecialDiseaseNode { private String taskStatusName; private String taskSubdivisiontemplateType; + + private String flowScheme; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java new file mode 100644 index 00000000..150d5c9d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java @@ -0,0 +1,30 @@ +package com.xinelu.manage.vo.tasktypedict; + +import com.xinelu.manage.domain.taskpartitiondict.TaskPartitionDict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 任务类型字典对象 task_type_dict + * + * @author xinelu + * @date 2024-03-11 + */ +@Data +public class TaskTypeDictVO { + + /** + * 主键id + */ + private Long taskTypeId; + + /** + * 任务类型名称 + */ + @ApiModelProperty(value = "任务类型名称") + private String taskTypeName; + + private List taskPartitionDictList; +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index 92b8d2cc..337cf90f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -125,6 +125,7 @@ + @@ -807,7 +808,7 @@ + select * from task_partition_dict where task_type_id in + + #{ids} + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/tasktypedict/TaskTypeDictMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/tasktypedict/TaskTypeDictMapper.xml index cb78a349..ac764fb3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/tasktypedict/TaskTypeDictMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/tasktypedict/TaskTypeDictMapper.xml @@ -137,4 +137,10 @@ #{id} + + \ No newline at end of file