fix 项目成本——装机成本

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -76,7 +76,13 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 				queryWrapper1.eq("status",'1');//1汇集计算之后（批产任务）
 				queryWrapper1.isNotNull("pcCode");//批产号不为空
 				List<ProjectCost> children1 = costService.list(queryWrapper1); //批产的主任务
-				for (ProjectCost cost :children1){
+
+				queryWrapper1 = new QueryWrapper<>();
+				queryWrapper1.eq("taskno",i.getTaskno());
+				queryWrapper1.eq("status",'0');//0汇集计算之前（非批产任务）
+				queryWrapper1.isNull("pcCode");//批产号为空
+				List<ProjectCost> children2 = costService.list(queryWrapper1); //非批产的主任务
+				for (ProjectCost cost :children2){
 					String taskno = cost.getTaskno();
 					if(!taskno.equals("") && taskno!=null){
 						QueryWrapper<MesInfoInstallationcost> wrapper = new QueryWrapper<>();
@@ -86,18 +92,18 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 					}
 				}
 
-				queryWrapper1 = new QueryWrapper<>();
-				queryWrapper1.eq("taskno",i.getTaskno());
-				queryWrapper1.eq("status",'0');//0汇集计算之前（非批产任务）
-				queryWrapper1.isNull("pcCode");//批产号为空
-				List<ProjectCost> children2 = costService.list(queryWrapper1); //非批产的主任务
-
 				QueryWrapper<ProjectCost> queryWrapper2 = new QueryWrapper<>();
 				queryWrapper2.eq("reftaskno",i.getTaskno());
 				queryWrapper2.eq("status",'1');//1汇集计算之后的（批产任务）
 				queryWrapper2.isNotNull("pcCode");//批产号不为空
 				List<ProjectCost> children3 = costService.list(queryWrapper2); //批产的子任务
-				for (ProjectCost cost :children3){
+
+				queryWrapper2 = new QueryWrapper<>();
+				queryWrapper2.eq("reftaskno",i.getTaskno());
+				queryWrapper2.eq("status",'0');//0汇集计算之前（非批产任务）
+				queryWrapper2.isNull("pcCode");//批产号为空
+				List<ProjectCost> children4 = costService.list(queryWrapper2); //非批产的子任务
+				for (ProjectCost cost :children4){
 					String taskno = cost.getTaskno();
 					if(!taskno.equals("") && taskno!=null){
 						QueryWrapper<MesInfoInstallationcost> wrapper = new QueryWrapper<>();
@@ -107,12 +113,6 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 					}
 				}
 
-				queryWrapper2 = new QueryWrapper<>();
-				queryWrapper2.eq("reftaskno",i.getTaskno());
-				queryWrapper2.eq("status",'0');//0汇集计算之前（非批产任务）
-				queryWrapper2.isNull("pcCode");//批产号为空
-				List<ProjectCost> children4 = costService.list(queryWrapper2); //非批产的子任务
-
 				List<ProjectCost> children =new ArrayList<>();
 				children.addAll(children1);
 				children.addAll(children2);