项目成本汇集+子级详情返回格式修改

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/controller/ComContractInfoExchangeNewController.java

@@ -200,9 +200,9 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
     */
 	 @ApiOperation(value="项目成本——合同额的详情列表", notes="项目成本——合同额的详情列表")
 	 @GetMapping(value = "/getNewCrmHteDetail")
-	 public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetail(String taskno){
+	 public Result<List<ComContractInfoExchangeNewHTEVO>> getNewCrmHteDetail(String taskno){
 		 List<ComContractInfoExchangeNewHTEVO> crmHteDetail = comContractInfoExchangeNewService.getCrmHteDetail(taskno);
-		 return crmHteDetail;
+		 return Result.OK(crmHteDetail);
 	 }
 
 	 /**
@@ -213,8 +213,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	  */
 	 @ApiOperation(value="项目成本——导出合同额的详情excel(汇总级)")
 	 @RequestMapping(value = "/exportNewHteDetailByTasknos")
-	 public ModelAndView exportNewHteDetailByTasknos(String tasknos) {
-		 List<ComContractInfoExchangeNewHTEVO> list = getNewCrmHteDetailByTasknos(tasknos);
+	 public ModelAndView exportNewHteDetailByTasknos(String taskno) {
+		 List<ComContractInfoExchangeNewHTEVO> list = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknos(Arrays.asList(taskno.split(",")));
 		 return comContractInfoExchangeNewService.exportHteDetail(list,ComContractInfoExchangeNewHTEVO.class, "合同额详情");
 	 }
 
@@ -226,9 +226,9 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	  */
 	 @ApiOperation(value="项目成本——合同额的详情列表(汇总级)", notes="项目成本——合同额的详情列表(汇总级)")
 	 @GetMapping(value = "/getNewCrmHteDetailByTasknos")
-	 public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(String tasknos){
-		 List<ComContractInfoExchangeNewHTEVO> crmHteDetail = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknos(Arrays.asList(tasknos.split(",")));
-		 return crmHteDetail;
+	 public Result<List<ComContractInfoExchangeNewHTEVO>> getNewCrmHteDetailByTasknos(String taskno){
+		 List<ComContractInfoExchangeNewHTEVO> crmHteDetail = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknos(Arrays.asList(taskno.split(",")));
+		 return Result.ok(crmHteDetail);
 	 }
 
 
@@ -254,8 +254,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	 */
 	 @ApiOperation(value="项目成本——已收款的详情列表", notes="项目成本——已收款的详情列表")
 	 @GetMapping(value = "/getNewCrmYskDetail")
-	 public List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetail(String taskno){
-		 return comContractInfoExchangeNewService.getCrmYskDetail(taskno);
+	 public Result<List<ComContractInfoExchangeNewYSKVO>> getNewCrmYskDetail(String taskno){
+		 return Result.OK(comContractInfoExchangeNewService.getCrmYskDetail(taskno));
 	 }
 
 
@@ -267,8 +267,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	  */
 	 @ApiOperation(value="项目成本——导出已收款的详情excel(汇总级)")
 	 @RequestMapping(value = "/exportNewYskDetailByTasknos")
-	 public ModelAndView exportNewYskDetailByTasknos(String tasknos) {
-		 List<ComContractInfoExchangeNewYSKVO> list = getNewCrmYskDetailByTasknos(tasknos);
+	 public ModelAndView exportNewYskDetailByTasknos(String taskno) {
+		 List<ComContractInfoExchangeNewYSKVO> list = comContractInfoExchangeNewService.getCrmYskDetailByTasknos(Arrays.asList(taskno.split(",")));
 		 return comContractInfoExchangeNewService.exportYskDetail(list,ComContractInfoExchangeNewYSKVO.class, "已收款详情");
 	 }
 
@@ -280,8 +280,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	  */
 	 @ApiOperation(value="项目成本——已收款的详情列表(汇总级)", notes="项目成本——已收款的详情列表(汇总级)")
 	 @GetMapping(value = "/getNewCrmYskDetailByTasknos")
-	 public List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetailByTasknos(String tasknos){
-		 return comContractInfoExchangeNewService.getCrmYskDetailByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ComContractInfoExchangeNewYSKVO>> getNewCrmYskDetailByTasknos(String taskno){
+		 return Result.OK(comContractInfoExchangeNewService.getCrmYskDetailByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/controller/KzksProjectChbGlfController.java

@@ -41,14 +41,14 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 @ApiOperation(value="项目成本——导出管理费详情excel")
 	 @RequestMapping(value = "/exportGLFDetail")
 	 public ModelAndView exportSWFDetail(String taskno) {
-		 List<ProjectChbGlf> list = getGLFDetailList(taskno);
+		 List<ProjectChbGlf> list = kzksProjectChbGlfService.getGLFDetailList(taskno);
 		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
 	 }
 
 	 @ApiOperation(value="项目成本——导出管理费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportGLFDetailByTasknos")
-	 public ModelAndView exportSWFDetailByTasknos(String tasknos) {
-		 List<ProjectChbGlf> list = getGLFDetailListByTasknos(tasknos);
+	 public ModelAndView exportSWFDetailByTasknos(String taskno) {
+		 List<ProjectChbGlf> list = kzksProjectChbGlfService.getGLFDetailListByTasknos(Arrays.asList(taskno.split(",")));;
 		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
 	 }
 
@@ -56,15 +56,15 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 /**项目成本——管理费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——管理费详情")
 	 @GetMapping("/getGLFDetailList")
-	 public List<ProjectChbGlf> getGLFDetailList(String taskno){
-		 return kzksProjectChbGlfService.getGLFDetailList(taskno);
+	 public Result<List<ProjectChbGlf>> getGLFDetailList(String taskno){
+		 return Result.OK(kzksProjectChbGlfService.getGLFDetailList(taskno));
 	 }
 
 	 /**项目成本——管理费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——管理费详情(汇总级)")
 	 @GetMapping("/getGLFDetailListByTasknos")
-	 public List<ProjectChbGlf> getGLFDetailListByTasknos(String tasknos){
-		 return kzksProjectChbGlfService.getGLFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbGlf>> getGLFDetailListByTasknos(String taskno){
+		 return Result.OK(kzksProjectChbGlfService.getGLFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/controller/KzksProjectChbRdfController.java

@@ -40,15 +40,15 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 	 @ApiOperation(value="项目成本——导出燃动费详情excel")
 	 @RequestMapping(value = "/exportRDFDetail")
 	 public ModelAndView exportRDFDetail(String taskno) {
-		 List<ProjectChbRdf> list = getRDFDetailList(taskno);
+		 List<ProjectChbRdf> list = kzksProjectChbRdfService.getRDFDetailList(taskno);
 		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
 	 }
 
 
 	 @ApiOperation(value="项目成本——导出燃动费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportRDFDetailByTasknos")
-	 public ModelAndView exportRDFDetailByTasknos(String tasknos) {
-		 List<ProjectChbRdf> list = getRDFDetailListByTasknos(tasknos);
+	 public ModelAndView exportRDFDetailByTasknos(String taskno) {
+		 List<ProjectChbRdf> list = kzksProjectChbRdfService.getRDFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
 	 }
 
@@ -56,15 +56,15 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 	 /**项目成本——燃动费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——燃动费详情")
 	 @GetMapping("/getRDFDetailList")
-	 public List<ProjectChbRdf> getRDFDetailList(String taskno){
-		 return kzksProjectChbRdfService.getRDFDetailList(taskno);
+	 public Result<List<ProjectChbRdf>> getRDFDetailList(String taskno){
+		 return Result.OK(kzksProjectChbRdfService.getRDFDetailList(taskno));
 	 }
 
 	 /**项目成本——燃动费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——燃动费详情(汇总级)")
 	 @GetMapping("/getRDFDetailListByTasknos")
-	 public List<ProjectChbRdf> getRDFDetailListByTasknos(String tasknos){
-		 return kzksProjectChbRdfService.getRDFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbRdf>> getRDFDetailListByTasknos(String taskno){
+		 return Result.OK(kzksProjectChbRdfService.getRDFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 	 /**

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/controller/KzksProjectChbRgfController.java

@@ -41,14 +41,14 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 @ApiOperation(value="项目成本——导出人工费详情excel")
 	 @RequestMapping(value = "/exportRGFDetail")
 	 public ModelAndView exportRGFDetail(String taskno) {
-		 List<ProjectChbRgf> list = getRGFDetailList(taskno);
+		 List<ProjectChbRgf> list = kzksProjectChbRgfService.getRGFDetailList(taskno);
 		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
 	 }
 
 	 @ApiOperation(value="项目成本——导出人工费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportRGFDetailByTasknos")
-	 public ModelAndView exportRGFDetailByTasknos(String tasknos) {
-		 List<ProjectChbRgf> list = getRGFDetailListByTasknos(tasknos);
+	 public ModelAndView exportRGFDetailByTasknos(String taskno) {
+		 List<ProjectChbRgf> list = kzksProjectChbRgfService.getRGFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
 	 }
 
@@ -56,15 +56,15 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 /**项目成本——人工费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——人工费详情")
 	 @GetMapping("/getRGFDetailList")
-	 public List<ProjectChbRgf> getRGFDetailList(String taskno){
-		 return kzksProjectChbRgfService.getRGFDetailList(taskno);
+	 public Result<List<ProjectChbRgf>> getRGFDetailList(String taskno){
+		 return Result.OK(kzksProjectChbRgfService.getRGFDetailList(taskno));
 	 }
 
 	 /**项目成本——人工费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——人工费详情(汇总级)")
 	 @GetMapping("/getRGFDetailListByTasknos")
-	 public List<ProjectChbRgf> getRGFDetailListByTasknos(String tasknos){
-		 return kzksProjectChbRgfService.getRGFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbRgf>> getRGFDetailListByTasknos(String taskno){
+		 return Result.OK(kzksProjectChbRgfService.getRGFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 	/**

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/controller/ProjectChbSwfController.java

@@ -44,30 +44,30 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 	 @ApiOperation(value="项目成本——导出事务费详情excel")
 	 @RequestMapping(value = "/exportSWFDetail")
 	 public ModelAndView exportSWFDetail(String taskno) {
-		 List<ProjectChbSwf> list = getSWFDetailList(taskno);
+		 List<ProjectChbSwf> list = projectChbSwfService.getSWFDetailList(taskno);
 		 return projectChbSwfService.exportSWFDetail(list,ProjectChbSwf.class, "事务费详情");
 	 }
 
 
 	 @ApiOperation(value="项目成本——导出事务费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportSWFDetailByTasknos")
-	 public ModelAndView exportSWFDetailByTasknos(String tasknos) {
-		 List<ProjectChbSwf> list = getSWFDetailListByTasknos(tasknos);
+	 public ModelAndView exportSWFDetailByTasknos(String taskno) {
+		 List<ProjectChbSwf> list = projectChbSwfService.getSWFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return projectChbSwfService.exportSWFDetail(list,ProjectChbSwf.class, "事务费详情");
 	 }
 
 	/**项目成本——事务费详情——根据任务号查询*/
 	@ApiOperation("项目成本——事务费详情")
 	@GetMapping("/getSWFDetailList")
-	public List<ProjectChbSwf> getSWFDetailList(String taskno){
-		return projectChbSwfService.getSWFDetailList(taskno);
+	public Result<List<ProjectChbSwf>> getSWFDetailList(String taskno){
+		return Result.OK(projectChbSwfService.getSWFDetailList(taskno));
 	}
 
 	 /**项目成本——事务费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——事务费详情(汇总级)")
 	 @GetMapping("/getSWFDetailListByTasknos")
-	 public List<ProjectChbSwf> getSWFDetailListByTasknos(String tasknos){
-		 return projectChbSwfService.getSWFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbSwf>> getSWFDetailListByTasknos(String taskno){
+		 return Result.OK(projectChbSwfService.getSWFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 	 /**

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/controller/ProjectChbSxfController.java

@@ -55,14 +55,14 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 	 @ApiOperation(value="项目成本——导出筛选费详情excel")
 	 @RequestMapping(value = "/exportSXFDetail")
 	 public ModelAndView exportSXFDetail(String taskno) {
-		 List<ProjectChbSxf> list = getSXFDetailList(taskno);
+		 List<ProjectChbSxf> list = projectChbSxfService.getSXFDetailList(taskno);
 		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
 	 }
 
 	 @ApiOperation(value="项目成本——导出筛选费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportSXFDetailByTasknos")
-	 public ModelAndView exportSXFDetailByTasknos(String tasknos) {
-		 List<ProjectChbSxf> list = getSXFDetailListByTasknos(tasknos);
+	 public ModelAndView exportSXFDetailByTasknos(String taskno) {
+		 List<ProjectChbSxf> list = projectChbSxfService.getSXFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
 	 }
 
@@ -71,16 +71,16 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 	 /**项目成本——管理费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——筛选费详情")
 	 @GetMapping("/getSXFDetailList")
-	 public List<ProjectChbSxf> getSXFDetailList(String taskno){
-		 return projectChbSxfService.getSXFDetailList(taskno);
+	 public Result<List<ProjectChbSxf>> getSXFDetailList(String taskno){
+		 return Result.OK(projectChbSxfService.getSXFDetailList(taskno));
 	 }
 
 
 	 /**项目成本——管理费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——筛选费详情(汇总级)")
 	 @GetMapping("/getSXFDetailListByTasknos")
-	 public List<ProjectChbSxf> getSXFDetailListByTasknos(String tasknos){
-		 return projectChbSxfService.getSXFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbSxf>> getSXFDetailListByTasknos(String taskno){
+		 return Result.OK(projectChbSxfService.getSXFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 	 /**

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/controller/ProjectChbWxfController.java

@@ -43,30 +43,30 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 	@ApiOperation(value="项目成本——导出外协费详情excel")
 	@RequestMapping(value = "/exportWXFDetail")
 	public ModelAndView exportWXFDetail(String taskno) {
-		List<ProjectChbWxf> list = getWXFDetailList(taskno);
+		List<ProjectChbWxf> list = projectChbWxfService.getWXFDetailList(taskno);
 		return projectChbWxfService.exportWXFDetail(list,ProjectChbWxf.class, "外协费详情");
 	}
 
 
 	@ApiOperation(value="项目成本——导出外协费详情excel(汇总级)")
 	@RequestMapping(value = "/exportWXFDetailByTasknos")
-	public ModelAndView exportWXFDetailByTasknos(String tasknos) {
-		List<ProjectChbWxf> list = getWXFDetailListByTasknos(tasknos);
+	public ModelAndView exportWXFDetailByTasknos(String taskno) {
+		List<ProjectChbWxf> list = projectChbWxfService.getWXFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		return projectChbWxfService.exportWXFDetail(list,ProjectChbWxf.class, "外协费详情");
 	}
 
 	 /**项目成本——外协费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——外协费详情")
 	 @GetMapping("/getWXFDetailList")
-	 public List<ProjectChbWxf> getWXFDetailList(String taskno){
-		 return projectChbWxfService.getWXFDetailList(taskno);
+	 public Result<List<ProjectChbWxf>> getWXFDetailList(String taskno){
+		 return Result.OK(projectChbWxfService.getWXFDetailList(taskno));
 	 }
 
 	/**项目成本——外协费详情——根据任务号查询*/
 	@ApiOperation("项目成本——外协费详情(汇总级)")
 	@GetMapping("/getWXFDetailListByTasknos")
-	public List<ProjectChbWxf> getWXFDetailListByTasknos(String tasknos){
-		return projectChbWxfService.getWXFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	public Result<List<ProjectChbWxf>> getWXFDetailListByTasknos(String taskno){
+		return Result.OK(projectChbWxfService.getWXFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	}
 
 

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/controller/KzksProjectChbZjfController.java

@@ -40,30 +40,30 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 @ApiOperation(value="项目成本——导出折旧费详情excel")
 	 @RequestMapping(value = "/exportZJFDetail")
 	 public ModelAndView exportZJFDetail(String taskno) {
-		 List<ProjectChbZjf> list = getZJFDetailList(taskno);
+		 List<ProjectChbZjf> list = kzksProjectChbZjfService.getZJFDetailList(taskno);
 		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
 	 }
 
 
 	 @ApiOperation(value="项目成本——导出折旧费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportZJFDetailByTasknos")
-	 public ModelAndView exportZJFDetailByTasknos(String tasknos) {
-		 List<ProjectChbZjf> list = getZJFDetailListByTasknos(tasknos);
+	 public ModelAndView exportZJFDetailByTasknos(String taskno) {
+		 List<ProjectChbZjf> list = kzksProjectChbZjfService.getZJFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
 	 }
 
 	 /**项目成本——专用费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——折旧费详情")
 	 @GetMapping("/getZJFDetailList")
-	 public List<ProjectChbZjf> getZJFDetailList(String taskno){
-		 return kzksProjectChbZjfService.getZJFDetailList(taskno);
+	 public Result<List<ProjectChbZjf>> getZJFDetailList(String taskno){
+		 return Result.OK(kzksProjectChbZjfService.getZJFDetailList(taskno));
 	 }
 
 	 /**项目成本——专用费详情——根据汇总级下的所有任务号查询*/
 	 @ApiOperation("项目成本——折旧费详情(汇总级)")
 	 @GetMapping("/getZJFDetailListByTasknos")
-	 public List<ProjectChbZjf> getZJFDetailListByTasknos(String tasknos){
-		 return kzksProjectChbZjfService.getZJFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbZjf>> getZJFDetailListByTasknos(String taskno){
+		 return Result.OK(kzksProjectChbZjfService.getZJFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/controller/ProjectChbZyfController.java

@@ -59,31 +59,31 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 	  */
 	 @ApiOperation(value="项目成本——导出专用费详情excel")
 	 @RequestMapping(value = "/exportZYFDetail")
-	 public ModelAndView exportZYFDetail(String tasknos) {
-		 List<ProjectChbZyf> list = getZYFDetailList(tasknos);
+	 public ModelAndView exportZYFDetail(String taskno) {
+		 List<ProjectChbZyf> list = projectChbZyfService.getZYFDetailList(taskno);
 		 return projectChbZyfService.exportZYFDetail(list,ProjectChbZyf.class, "专用费详情");
 	 }
 
 
 	 @ApiOperation(value="项目成本——导出专用费详情excel(汇总级)")
 	 @RequestMapping(value = "/exportZYFDetailByTasknos")
-	 public ModelAndView exportZYFDetailByTasknos(String tasknos) {
-		 List<ProjectChbZyf> list = getZYFDetailListBYTasknos(tasknos);
+	 public ModelAndView exportZYFDetailByTasknos(String taskno) {
+		 List<ProjectChbZyf> list = projectChbZyfService.getZYFDetailListByTasknos(Arrays.asList(taskno.split(",")));
 		 return projectChbZyfService.exportZYFDetail(list,ProjectChbZyf.class, "专用费详情");
 	 }
 
 	 /**项目成本——专用费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——专用费详情")
 	 @GetMapping("/getZYFDetailList")
-	 public List<ProjectChbZyf> getZYFDetailList(String taskno){
-		 return projectChbZyfService.getZYFDetailList(taskno);
+	 public Result<List<ProjectChbZyf>> getZYFDetailList(String taskno){
+		 return Result.OK(projectChbZyfService.getZYFDetailList(taskno));
 	 }
 
 	 /**项目成本——专用费详情——根据汇总级下的所有任务号查询*/
 	 @ApiOperation("项目成本——专用费详情(汇总级)")
 	 @GetMapping("/getZYFDetailListByTasknos")
-	 public List<ProjectChbZyf> getZYFDetailListBYTasknos(String tasknos){
-		 return projectChbZyfService.getZYFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 public Result<List<ProjectChbZyf>> getZYFDetailListBYTasknos(String taskno){
+		 return Result.OK(projectChbZyfService.getZYFDetailListByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
 

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -69,7 +69,7 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
     @ApiOperation(value = "项目成本——导出材料费详情excel")
     @RequestMapping(value = "/exportCLFDetail")
     public ModelAndView exportCLFDetail(String taskno) {
-        List<WzOutboundOrderBDetailListVO> list = getCLFList(taskno);
+        List<WzOutboundOrderBDetailListVO> list = wzOutboundOrderHService.getClfList(taskno);
         return wzOutboundOrderHService.exportHteDetail(list, WzOutboundOrderBDetailListVO.class, "材料费详情");
     }
 
@@ -78,8 +78,8 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
      */
     @ApiOperation(value = "项目成本——导出材料费详情excel汇总级()")
     @RequestMapping(value = "/exportCLFDetailByTasknos")
-    public ModelAndView exportCLFDetailByTasknos(String tasknos) {
-        List<WzOutboundOrderBDetailListVO> list = getCLFListByTasknos(tasknos);
+    public ModelAndView exportCLFDetailByTasknos(String taskno) {
+        List<WzOutboundOrderBDetailListVO> list = wzOutboundOrderHService.getClfListByTasknos(Arrays.asList(taskno.split(",")));
         return wzOutboundOrderHService.exportHteDetail(list, WzOutboundOrderBDetailListVO.class, "材料费详情");
     }
 
@@ -410,8 +410,8 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
      */
     @ApiOperation(value = "项目成本——材料费详情", notes = "项目成本——材料费详情")
     @GetMapping(value = "/getCLFList")
-    public List<WzOutboundOrderBDetailListVO> getCLFList(String taskno) {
-        return wzOutboundOrderHService.getClfList(taskno);
+    public Result<List<WzOutboundOrderBDetailListVO>> getCLFList(String taskno) {
+        return Result.OK(wzOutboundOrderHService.getClfList(taskno));
     }
 
     /**
@@ -419,8 +419,8 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
      */
     @ApiOperation(value = "项目成本——材料费详情(汇总级)", notes = "项目成本——材料费详情(汇总级)")
     @GetMapping(value = "/getCLFListByTasknos")
-    public List<WzOutboundOrderBDetailListVO> getCLFListByTasknos(String tasknos) {
-        return wzOutboundOrderHService.getClfListByTasknos(Arrays.asList(tasknos.split(",")));
+    public Result<List<WzOutboundOrderBDetailListVO>> getCLFListByTasknos(String taskno) {
+        return Result.OK(wzOutboundOrderHService.getClfListByTasknos(Arrays.asList(taskno.split(","))));
     }
 
     /**