diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml index 015806d..fe50a28 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml @@ -25,6 +25,8 @@ null,create_date,null from huzhou_fieldchangehistory f WHERE id = #{projectId} union all SELECT project_Name,reform_name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = #{projectId} + UNION ALL + SELECT project_Name,reform_name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id =( SELECT DISTINCT project_id from huzhou_planinfo WHERE id = #{projectId}) union all SELECT project_Name,reform_name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = (select DISTINCT projectid from huzhou_fieldchangehistory where group_id = #{projectId}) union all diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 1318114..0829c78 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -1205,18 +1205,19 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl subProjectIds = getSubProjectIds(projectid); List result = new ArrayList<>(); - // 2.构造查询条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotBlank(projectid), HuzhouPlaninfo::getProjectId, projectid) - .eq(StringUtils.isNotBlank(taskLevel), HuzhouPlaninfo::getTaskLevel, taskLevel); - - // 3.封装子项目阶段详情信息 + // 2.封装子项目阶段详情信息 if (CollectionUtil.isNotEmpty(subProjectIds)) { for (String subProjectId : subProjectIds) { - TaskLevelDetailVo subTaskLevelDetailVo = new TaskLevelDetailVo(); - HuzhouPlaninfo subPlanInfo = this.getOne(queryWrapper); + // 3.构造查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouPlaninfo::getProjectId, subProjectId) + .eq(HuzhouPlaninfo::getTaskLevel, taskLevel); + HuzhouPlaninfo subPlanInfo = this.list(queryWrapper).get(0); + HuzhouProjectinfo subProjectInfo = subProjectinfoService.getById(subProjectId); + // 4.不为空则封装返回 + TaskLevelDetailVo subTaskLevelDetailVo = new TaskLevelDetailVo(); if (subPlanInfo != null) { String projectName = subProjectInfo.getProjectName(); subTaskLevelDetailVo.setProjectName(projectName);