bug修复:子项目名称不显示和子项目状态显示

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

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@@ -1205,18 +1205,19 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
         List<String> subProjectIds = getSubProjectIds(projectid);
         List<TaskLevelDetailVo> result = new ArrayList<>();
 
-        // 2.构造查询条件
+        // 2.封装子项目阶段详情信息
-        LambdaQueryWrapper<HuzhouPlaninfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(projectid), HuzhouPlaninfo::getProjectId, projectid)
-                .eq(StringUtils.isNotBlank(taskLevel), HuzhouPlaninfo::getTaskLevel, taskLevel);
-
-        // 3.封装子项目阶段详情信息
         if (CollectionUtil.isNotEmpty(subProjectIds)) {
             for (String subProjectId : subProjectIds) {
-                TaskLevelDetailVo subTaskLevelDetailVo = new TaskLevelDetailVo();
+                // 3.构造查询条件
-                HuzhouPlaninfo subPlanInfo = this.getOne(queryWrapper);
+                LambdaQueryWrapper<HuzhouPlaninfo> 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);