11

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetStatsController.java

@@ -58,7 +58,7 @@ public class ProjectCostBudgetStatsController {
             @ApiImplicitParam(name = "id", value = "成本预算统计id", required = true),
     })
     public R<ProjectCostBudgetStatsVO> getBudgetStatsById(Long id) {
-        return R.data(budgetStatsService.getBudgetStatsById(id));
+        return R.data(budgetStatsService.getBudgetStatsById(id,2));
     }
 
     /**

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetService.java

@@ -30,6 +30,8 @@ public interface IProjectCostBudgetService extends BaseService<ProjectCostBudget
 
     List<ProjectCostBudget> budgetListByProjectId(Long projectId);
 
+    List<ProjectCostBudget> budgetListByProjectId2(Long projectId);
+
     void deleteByProjectId(Long projectId);
     //分页获取列表
     List<ControlProjectInfoVO> page(ControlProjectInfoDTO dto, Query query);

blade-service/blade-control/src/main/java/org/springblade/control/service/IProjectCostBudgetStatsService.java

@@ -20,7 +20,7 @@ public interface IProjectCostBudgetStatsService extends BaseService<ProjectCostB
 
     void AddOrUpdate(ProjectCostBudgetStatsDTO dto);
 
-    ProjectCostBudgetStatsVO getBudgetStatsById(Long id);
+    ProjectCostBudgetStatsVO getBudgetStatsById(Long id,Integer type);
 
     void deleteByProjectId(Long id);
 

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetServiceImpl.java

@@ -158,6 +158,19 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
 
     }
 
+    /**
+     * 查询项目下所有预算明细
+     * @param projectId
+     * @return
+     */
+    @Override
+    public List<ProjectCostBudget> budgetListByProjectId2(Long projectId) {
+        return this.list(new LambdaQueryWrapper<ProjectCostBudget>()
+                .eq(ProjectCostBudget::getProjectId,projectId)
+                .eq(ProjectCostBudget::getParentId,0)
+                .eq(ProjectCostBudget::getApprove,0));
+    }
+
 
     /**
      * 根据项目id删除项目
@@ -286,9 +299,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                             endDate = budgetVO2.getPlanEndTime();
                         }
                         //拼接子计划的任务描述
-                        descStr.append(j + "."+budgetVO2.getPlanTaskDesc()+"。");
+                        descStr.append(j + "."+budgetVO2.getPlanTaskDesc()+"、");
                         //拼接子计划的完成指标
-                        targetStr.append(j+"."+budgetVO2.getPlanTarget()+"。");
+                        targetStr.append(j+"."+budgetVO2.getPlanTarget()+"、");
                         j++;
                     }
                     //所有子计划完成，设置父计划为绿色
@@ -1071,9 +1084,9 @@ public class ProjectCostBudgetServiceImpl extends BaseServiceImpl<ProjectCostBud
                     endDate = l.getPlanEndTime();
                 }
                 //拼接子计划的任务描述
-                descStr.append(j + "."+l.getPlanTaskDesc()+"。");
+                descStr.append(j + "."+l.getPlanTaskDesc()+"、");
                 //拼接子计划的完成指标
-                targetStr.append(j+"."+l.getPlanTarget()+"。");
+                targetStr.append(j+"."+l.getPlanTarget()+"、");
                 j++;
             }
 

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/ProjectCostBudgetStatsServiceImpl.java

@@ -65,12 +65,16 @@ public class ProjectCostBudgetStatsServiceImpl extends BaseServiceImpl<ProjectCo
      * @return
      */
     @Override
-    public ProjectCostBudgetStatsVO getBudgetStatsById(Long id) {
+    public ProjectCostBudgetStatsVO getBudgetStatsById(Long id, Integer type) {
         //查询项目成本统计
         ProjectCostBudgetStatsVO vo = baseMapper.getBudgetStatsById(id);
-
-        //查询具体明细并分组存入
-        List<ProjectCostBudget> list = budgetService.budgetListByProjectId(vo.getProjectId());
+        List<ProjectCostBudget> list = new ArrayList<>();
+        if (type == 1){
+            list = budgetService.budgetListByProjectId2(vo.getProjectId());
+        }else {
+            //查询具体明细并分组存入
+            list = budgetService.budgetListByProjectId(vo.getProjectId());
+        }
         if (list != null && list.size() > 0) {
             Map<Integer, List<ProjectCostBudget>> map = list.parallelStream().collect(Collectors.groupingBy(ProjectCostBudget::getUnitType));
             vo.setBuildUnit(map.get(1));