fix项目成本——装机成本、项目成本——工时详情

module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/KyBgInfoMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface KyBgInfoMapper extends BaseMapper<KyBgInfo> {
 
     /**项目成本——工时详情*/
-    @Select("select key,userdept,taskno,workhour from ky_bg_info where taskno = #{taskno}")
+    @Select("select `key`,userdept,taskno,workhour from ky_bg_info where taskno = #{taskno}")
     public List<KyBgInfoDetailListVO> getGSDeatilList(@Param("taskno") String taskno);
 
 }

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

@@ -10,6 +10,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.mesInfoInstallationcost.entity.MesInfoInstallationcost;
+import org.jeecg.modules.mesInfoInstallationcost.service.IMesInfoInstallationcostService;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
 import org.jeecg.modules.projectCostHuiji.convert.ProjectCostHuijiConvert;
@@ -39,10 +41,14 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji, IProjectCostHuijiService> {
 	@Autowired
+	@SuppressWarnings("all")
 	private IProjectCostHuijiService projectCostHuijiService;
 	@Autowired
 	@SuppressWarnings("all")
 	private IProjectCostService costService;
+	@Autowired
+	@SuppressWarnings("all")
+	private IMesInfoInstallationcostService mesInfoInstallationcostService;
 
 	/**
 	 * 分页列表查询
@@ -70,6 +76,15 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 				queryWrapper1.eq("status",'1');//1汇集计算之后（批产任务）
 				queryWrapper1.isNotNull("pcCode");//批产号不为空
 				List<ProjectCost> children1 = costService.list(queryWrapper1); //批产的主任务
+				for (ProjectCost cost :children1){
+					String taskno = cost.getTaskno();
+					if(!taskno.equals("") && taskno!=null){
+						QueryWrapper<MesInfoInstallationcost> wrapper = new QueryWrapper<>();
+						wrapper.eq("taskno",taskno);
+						List<MesInfoInstallationcost> mesList = mesInfoInstallationcostService.list(wrapper);
+						if(mesList!=null && !mesList.isEmpty()) cost.setZjcb(mesList.get(0).getValue());
+					}
+				}
 
 				queryWrapper1 = new QueryWrapper<>();
 				queryWrapper1.eq("taskno",i.getTaskno());
@@ -81,13 +96,22 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 				queryWrapper2.eq("reftaskno",i.getTaskno());
 				queryWrapper2.eq("status",'1');//1汇集计算之后的（批产任务）
 				queryWrapper2.isNotNull("pcCode");//批产号不为空
-				List<ProjectCost> children3 = costService.list(queryWrapper2); //子任务中的批产任务
+				List<ProjectCost> children3 = costService.list(queryWrapper2); //批产的子任务
+				for (ProjectCost cost :children3){
+					String taskno = cost.getTaskno();
+					if(!taskno.equals("") && taskno!=null){
+						QueryWrapper<MesInfoInstallationcost> wrapper = new QueryWrapper<>();
+						wrapper.eq("taskno",taskno);
+						List<MesInfoInstallationcost> mesList = mesInfoInstallationcostService.list(wrapper);
+						if(mesList!=null && !mesList.isEmpty()) cost.setZjcb(mesList.get(0).getValue());
+					}
+				}
 
 				queryWrapper2 = new QueryWrapper<>();
 				queryWrapper2.eq("reftaskno",i.getTaskno());
 				queryWrapper2.eq("status",'0');//0汇集计算之前（非批产任务）
 				queryWrapper2.isNull("pcCode");//批产号为空
-				List<ProjectCost> children4 = costService.list(queryWrapper2); //子任务中的非批产任务
+				List<ProjectCost> children4 = costService.list(queryWrapper2); //非批产的子任务
 
 				List<ProjectCost> children =new ArrayList<>();
 				children.addAll(children1);