首页合同额导出+项目成本汇总级的事务费等九项费用查询详情、导出

module_kzks/src/main/java/org/jeecg/modules/Index/controller/IndexController.java

@@ -388,9 +388,9 @@ public class IndexController {
 
     @ApiOperation(value="首页一层导出成本额的详情excel")
     @RequestMapping(value = "/exportCneXls")
-    public void exportXls(@RequestParam(required = false) List<String> departNameList,HttpServletRequest request) {
+    public ModelAndView exportXls(@RequestParam(required = false) List<String> departNameList,HttpServletRequest request) {
         //return indexNewServer.exportCbeDetail(departNameList,request, WzOutboundOrderBNew.class, "成本额详情");
-        indexNewServer.exportCbeDetail(departNameList,request);
+        return indexNewServer.exportCbeDetail(departNameList,request);
     }
 
     @ApiOperation(value="首页三层指标排行——查询责任部门当期完成额")

module_kzks/src/main/java/org/jeecg/modules/Index/service/IndexNewServer.java

@@ -67,7 +67,7 @@ public interface IndexNewServer {
     /* 一层筛选费明细 */
     List<ProjectChbSxf> getSxfDetailList(Page<ProjectChbSxf> page, HttpServletRequest request, List<String> departNameList);
 
-    void exportCbeDetail(List<String> departNameList, HttpServletRequest request);
+    ModelAndView exportCbeDetail(List<String> departNameList, HttpServletRequest request);
 
     List<IndexKpiDetail> getZrbmDepartKpiDetailList(Page<IndexKpiDetail> page, HttpServletRequest request, IndexKpiParamDto indexKpiParamDto, String departName);
 

module_kzks/src/main/java/org/jeecg/modules/Index/service/impl/IndexNewServiceImpl.java

@@ -74,6 +74,8 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author dzc
@@ -886,7 +888,7 @@ public class IndexNewServiceImpl implements IndexNewServer {
 
 
     @Override
-    public void exportCbeDetail(List<String> departNameList, HttpServletRequest request) {
+    public ModelAndView exportCbeDetail(List<String> departNameList, HttpServletRequest request) {
         String userNameByToken = JwtUtil.getUserNameByToken(request);
         LoginUser sysUser = sysBaseApi.getUserByName(userNameByToken);
         String role = commonMethod.getRole(userNameByToken);
@@ -939,7 +941,6 @@ public class IndexNewServiceImpl implements IndexNewServer {
             glfList = glfMapper.getDetail1(tasknoList,nowMonth);
             sxfList = sxfMapper.getDetail1(tasknoList,nowMonth);
 
-            exprotExcel(wzList,zyfList,swfList,wxfList,rdfList,zjfList,rgfList,glfList,sxfList);
         }
         if (depart == null) {
             depart = "Boss";
@@ -953,9 +954,8 @@ public class IndexNewServiceImpl implements IndexNewServer {
             glfList = glfMapper.getDetailIfBoss1(nowMonth);
             sxfList = sxfMapper.getDetailIfBoss1(nowMonth);
 
-            exprotExcel(wzList,zyfList,swfList,wxfList,rdfList,zjfList,rgfList,glfList,sxfList);
         }
-
+        return exprotExcel1(wzList,zyfList,swfList,wxfList,rdfList,zjfList,rgfList,glfList,sxfList,nowMonth);
     }
 
     private void exprotExcel(List<WzOutboundOrderBNewExport> wzList, List<ProjectChbZyfExpoet> zyfList, List<ProjectChbZyfExpoet> swfList, List<ProjectChbZyfExpoet> wxfList, List<ProjectChbZyfExpoet> rdfList, List<ProjectChbZyfExpoet> zjfList, List<ProjectChbZyfExpoet> rgfList, List<ProjectChbZyfExpoet> glfList, List<ProjectChbZyfExpoet> sxfList) {
@@ -985,6 +985,82 @@ public class IndexNewServiceImpl implements IndexNewServer {
         writer.finish();
     }
 
+    public ModelAndView exprotExcel1(List<WzOutboundOrderBNewExport> wzList, List<ProjectChbZyfExpoet> zyfList, List<ProjectChbZyfExpoet> swfList, List<ProjectChbZyfExpoet> wxfList, List<ProjectChbZyfExpoet> rdfList, List<ProjectChbZyfExpoet> zjfList, List<ProjectChbZyfExpoet> rgfList, List<ProjectChbZyfExpoet> glfList, List<ProjectChbZyfExpoet> sxfList,String nowMonth) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String title = nowMonth + "月份成本额明细";
+
+        Map<String, Object> sheet1Map = new HashMap<>();
+        sheet1Map.put(NormalExcelConstants.CLASS,WzOutboundOrderBNewExport.class);
+        ExportParams exportParam1=new ExportParams(  "材料费报表", "导出人:" + sysUser.getRealname(), "材料费");
+        exportParam1.setImageBasePath(upLoadPath);
+        sheet1Map.put(NormalExcelConstants.PARAMS,exportParam1);
+        sheet1Map.put(NormalExcelConstants.DATA_LIST,wzList);
+
+        Map<String, Object> sheet2Map = new HashMap<>();
+        sheet2Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam2=new ExportParams(  "专用费报表", "导出人:" + sysUser.getRealname(), "专用费");
+        exportParam2.setImageBasePath(upLoadPath);
+        sheet2Map.put(NormalExcelConstants.PARAMS,exportParam2);
+        sheet2Map.put(NormalExcelConstants.DATA_LIST,zyfList);
+
+        Map<String, Object> sheet3Map = new HashMap<>();
+        sheet3Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam3=new ExportParams(  "事务费报表", "导出人:" + sysUser.getRealname(), "事务费");
+        exportParam3.setImageBasePath(upLoadPath);
+        sheet3Map.put(NormalExcelConstants.PARAMS,exportParam3);
+        sheet3Map.put(NormalExcelConstants.DATA_LIST,swfList);
+
+        Map<String, Object> sheet4Map = new HashMap<>();
+        sheet4Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam4=new ExportParams(  "外协费报表", "导出人:" + sysUser.getRealname(), "外协费");
+        exportParam4.setImageBasePath(upLoadPath);
+        sheet4Map.put(NormalExcelConstants.PARAMS,exportParam4);
+        sheet4Map.put(NormalExcelConstants.DATA_LIST,wxfList);
+
+        Map<String, Object> sheet5Map = new HashMap<>();
+        sheet5Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam5=new ExportParams(  "燃料动力费报表", "导出人:" + sysUser.getRealname(), "燃料动力费");
+        exportParam5.setImageBasePath(upLoadPath);
+        sheet5Map.put(NormalExcelConstants.PARAMS,exportParam5);
+        sheet5Map.put(NormalExcelConstants.DATA_LIST,rdfList);
+
+        Map<String, Object> sheet6Map = new HashMap<>();
+        sheet6Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam6=new ExportParams(  "固定资产折旧费报表", "导出人:" + sysUser.getRealname(), "固定资产折旧费");
+        exportParam6.setImageBasePath(upLoadPath);
+        sheet6Map.put(NormalExcelConstants.PARAMS,exportParam6);
+        sheet6Map.put(NormalExcelConstants.DATA_LIST,zjfList);
+
+        Map<String, Object> sheet7Map = new HashMap<>();
+        sheet7Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam7=new ExportParams(  "工资及劳务费报表", "导出人:" + sysUser.getRealname(), "工资及劳务费");
+        exportParam7.setImageBasePath(upLoadPath);
+        sheet7Map.put(NormalExcelConstants.PARAMS,exportParam7);
+        sheet7Map.put(NormalExcelConstants.DATA_LIST,rgfList);
+
+        Map<String, Object> sheet8Map = new HashMap<>();
+        sheet8Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam8=new ExportParams(  "管理费报表", "导出人:" + sysUser.getRealname(), "管理费");
+        exportParam8.setImageBasePath(upLoadPath);
+        sheet8Map.put(NormalExcelConstants.PARAMS,exportParam8);
+        sheet8Map.put(NormalExcelConstants.DATA_LIST,glfList);
+
+        Map<String, Object> sheet9Map = new HashMap<>();
+        sheet9Map.put(NormalExcelConstants.CLASS,ProjectChbZyfExpoet.class);
+        ExportParams exportParam9=new ExportParams(  "筛选费报表", "导出人:" + sysUser.getRealname(), "筛选费");
+        exportParam9.setImageBasePath(upLoadPath);
+        sheet9Map.put(NormalExcelConstants.PARAMS,exportParam9);
+        sheet9Map.put(NormalExcelConstants.DATA_LIST,sxfList);
+
+        List<Map<String, Object>> sheetList = Stream.of(sheet1Map, sheet2Map, sheet3Map, sheet4Map, sheet5Map, sheet6Map, sheet7Map, sheet8Map, sheet9Map).collect(Collectors.toList());
+
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME,title);
+        mv.addObject(NormalExcelConstants.MAP_LIST,sheetList);
+
+        return mv;
+    }
+
     @Override
     public List<IndexKpiDetail> getZrbmDepartKpiDetailList(Page<IndexKpiDetail> page, HttpServletRequest request, IndexKpiParamDto indexKpiParamDto, String departName) {
         List<IndexKpiDetail> detailList = new ArrayList<>();

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/entity/ComContractInfoExchangeNew.java

@@ -284,18 +284,18 @@ public class ComContractInfoExchangeNew implements Serializable {
     @ApiModelProperty(value = "部门")
     private java.lang.String bm;
     /**收款总金额*/
-    @Excel(name = "收款总金额", width = 15)
+    //@Excel(name = "收款总金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 14)
-    @ExcelProperty(converter = BigDecimalNumberConverter.class)
-//    @ExcelProperty(value = "收款总金额")
+//    @ExcelProperty(converter = BigDecimalNumberConverter.class)
+    @ExcelProperty(value = "收款总金额")
     @ApiModelProperty(value = "收款总金额")
     private java.math.BigDecimal skzje;
     /** 任务收款金额 */
-    @Excel(name = " 任务收款金额 ", width = 15)
+    //@Excel(name = "任务收款金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 15)
-    @ExcelProperty(converter = BigDecimalNumberConverter.class)
-//    @ExcelProperty(value = "任务收款金额")
-    @ApiModelProperty(value = " 任务收款金额 ")
+//    @ExcelProperty(converter = BigDecimalNumberConverter.class)
+    @ExcelProperty(value = "任务收款金额")
+    @ApiModelProperty(value = "任务收款金额")
     private java.math.BigDecimal rwskje;
     /**到款日期/汇票到期日期*/
 //	@Excel(name = "到款日期/汇票到期日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/entity/ComContractInfoExchangeNewYSKVO.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.comContractInfoExchangeNew.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
 import com.alibaba.excel.converters.date.DateStringConverter;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -103,11 +104,11 @@ public class ComContractInfoExchangeNewYSKVO implements Serializable {
     @ApiModelProperty(value = "收款总金额")
     private java.math.BigDecimal skzje;
     /** 任务收款金额 */
-	@Excel(name = " 任务收款金额 ", width = 15)
+	@Excel(name = "任务收款金额", width = 15)
 //    @ExcelProperty(converter = BigDecimalStringConverter.class, index = 15)
 //    @ExcelProperty(value = "任务收款金额", converter = BigDecimalNumberConverter.class)
 //    @ExcelProperty(value = "任务收款金额")
-    @ApiModelProperty(value = " 任务收款金额 ")
+    @ApiModelProperty(value = "任务收款金额")
     private java.math.BigDecimal rwskje;
     /**到款日期/汇票到期日期*/
 	@Excel(name = "到款日期/汇票到期日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")

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

@@ -41,7 +41,8 @@ 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 = getGLFDetailList(taskno);
+		 List<ProjectChbGlf> list = getGLFDetailListByTasknos(taskno);
 		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
 	 }
 
@@ -53,6 +54,13 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 		 return kzksProjectChbGlfService.getGLFDetailList(taskno);
 	 }
 
+	 /**项目成本——管理费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——管理费详情(汇总级)")
+	 @GetMapping("/getGLFDetailListByTasknos")
+	 public List<ProjectChbGlf> getGLFDetailListByTasknos(String tasknos){
+		 return kzksProjectChbGlfService.getGLFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
 
 	 /**
 	 * 分页列表查询

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/mapper/KzksProjectChbGlfMapper.java

@@ -38,4 +38,6 @@ public interface KzksProjectChbGlfMapper extends BaseMapper<ProjectChbGlf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbGlf> getGLFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/mapper/xml/KzksProjectChbGlfMapper.xml

@@ -27,4 +27,12 @@
         SELECT * FROM kzks_project_chb_glf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getGLFDetailListByTasknos" resultType="org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf">
+        SELECT * FROM kzks_project_chb_glf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/service/IKzksProjectChbGlfService.java

@@ -21,4 +21,6 @@ public interface IKzksProjectChbGlfService extends IService<ProjectChbGlf> {
     List<ProjectChbGlf> getGLFDetailList(String taskno);
 
     ModelAndView exportGLFDetail(List<ProjectChbGlf> exportList, Class<ProjectChbGlf> clazz, String title);
+
+    List<ProjectChbGlf> getGLFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbGlf/service/impl/KzksProjectChbGlfServiceImpl.java

@@ -66,4 +66,9 @@ public class KzksProjectChbGlfServiceImpl extends ServiceImpl<KzksProjectChbGlfM
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
+    @Override
+    public List<ProjectChbGlf> getGLFDetailListByTasknos(List<String> tasknoList) {
+        return glfMapper.getGLFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -40,7 +40,8 @@ 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 = getRDFDetailList(taskno);
+		 List<ProjectChbRdf> list = getRDFDetailListByTasknos(taskno);
 		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
 	 }
 
@@ -52,7 +53,14 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 		 return kzksProjectChbRdfService.getRDFDetailList(taskno);
 	 }
 
-	/**
+	 /**项目成本——燃动费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——燃动费详情(汇总级)")
+	 @GetMapping("/getRDFDetailListByTasknos")
+	 public List<ProjectChbRdf> getRDFDetailListByTasknos(String tasknos){
+		 return kzksProjectChbRdfService.getRDFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param projectChbRdf

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/mapper/KzksProjectChbRdfMapper.java

@@ -38,4 +38,6 @@ public interface KzksProjectChbRdfMapper extends BaseMapper<ProjectChbRdf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbRdf> getRDFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/mapper/xml/KzksProjectChbRdfMapper.xml

@@ -27,4 +27,12 @@
         SELECT * FROM kzks_project_chb_rdf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getRDFDetailListByTasknos" resultType="org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf">
+        SELECT * FROM kzks_project_chb_rdf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/service/IKzksProjectChbRdfService.java

@@ -22,4 +22,6 @@ public interface IKzksProjectChbRdfService extends IService<ProjectChbRdf> {
     List<ProjectChbRdf> getRDFDetailList(String taskno);
 
     ModelAndView exportRDFDetail(List<ProjectChbRdf> exportList, Class<ProjectChbRdf> clazz, String title);
+
+    List<ProjectChbRdf> getRDFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRdf/service/impl/KzksProjectChbRdfServiceImpl.java

@@ -66,4 +66,9 @@ public class KzksProjectChbRdfServiceImpl extends ServiceImpl<KzksProjectChbRdfM
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
+    @Override
+    public List<ProjectChbRdf> getRDFDetailListByTasknos(List<String> tasknoList) {
+        return rdfMapper.getRDFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRgf.controller;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
@@ -40,7 +41,8 @@ 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 = getRGFDetailList(taskno);
+		 List<ProjectChbRgf> list = getRGFDetailListByTasknos(taskno);
 		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
 	 }
 
@@ -52,6 +54,13 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 		 return kzksProjectChbRgfService.getRGFDetailList(taskno);
 	 }
 
+	 /**项目成本——人工费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——人工费详情(汇总级)")
+	 @GetMapping("/getRGFDetailListByTasknos")
+	 public List<ProjectChbRgf> getRGFDetailListByTasknos(String tasknos){
+		 return kzksProjectChbRgfService.getRGFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
 	/**
 	 * 分页列表查询
 	 *

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/mapper/KzksProjectChbRgfMapper.java

@@ -38,4 +38,6 @@ public interface KzksProjectChbRgfMapper extends BaseMapper<ProjectChbRgf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbRgf> getRGFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/mapper/xml/KzksProjectChbRgfMapper.xml

@@ -27,4 +27,12 @@
         SELECT * FROM kzks_project_chb_rgf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getRGFDetailListByTasknos" resultType="org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf">
+        SELECT * FROM kzks_project_chb_rgf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/service/IKzksProjectChbRgfService.java

@@ -21,4 +21,6 @@ public interface IKzksProjectChbRgfService extends IService<ProjectChbRgf> {
     List<ProjectChbRgf> getRGFDetailList(String taskno);
 
     ModelAndView exportRGFDetail(List<ProjectChbRgf> exportList, Class<ProjectChbRgf> clazz, String title);
+
+    List<ProjectChbRgf> getRGFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbRgf/service/impl/KzksProjectChbRgfServiceImpl.java

@@ -66,4 +66,9 @@ public class KzksProjectChbRgfServiceImpl extends ServiceImpl<KzksProjectChbRgfM
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
+    @Override
+    public List<ProjectChbRgf> getRGFDetailListByTasknos(List<String> tasknoList) {
+        return rgfMapper.getRGFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -44,7 +44,8 @@ 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 = getSWFDetailList(taskno);
+		 List<ProjectChbSwf> list = getSWFDetailListByTasknos(taskno);
 		 return projectChbSwfService.exportSWFDetail(list,ProjectChbSwf.class, "事务费详情");
 	 }
 
@@ -55,7 +56,14 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 		return projectChbSwfService.getSWFDetailList(taskno);
 	}
 
-	/**
+	 /**项目成本——事务费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——事务费详情(汇总级)")
+	 @GetMapping("/getSWFDetailListByTasknos")
+	 public List<ProjectChbSwf> getSWFDetailListByTasknos(String tasknos){
+		 return projectChbSwfService.getSWFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param projectChbSwf

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/ProjectChbSwfMapper.java

@@ -53,4 +53,6 @@ public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbSwf> getSWFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/xml/ProjectChbSwfMapper.xml

@@ -49,4 +49,12 @@
         SELECT * FROM kzks_project_chb_swf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getSWFDetailListByTasknos" resultType="org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf">
+        SELECT * FROM kzks_project_chb_swf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/IProjectChbSwfService.java

@@ -58,4 +58,6 @@ public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
     *   date: 2024/1/4
     */
     int deleteSwfByNd(String nd);
+
+    List<ProjectChbSwf> getSWFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/impl/ProjectChbSwfServiceImpl.java

@@ -170,4 +170,9 @@ public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, P
     public int deleteSwfByNd(String nd) {
         return swfMapper.deleteSwfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbSwf> getSWFDetailListByTasknos(List<String> tasknoList) {
+        return swfMapper.getSWFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -55,7 +55,8 @@ 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 = getSXFDetailList(taskno);
+		 List<ProjectChbSxf> list = getSXFDetailListByTasknos(taskno);
 		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
 	 }
 
@@ -68,7 +69,14 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 	 }
 
 
-	/**
+	 /**项目成本——管理费详情——根据任务号查询*/
+	 @ApiOperation("项目成本——筛选费详情(汇总级)")
+	 @GetMapping("/getSXFDetailListByTasknos")
+	 public List<ProjectChbSxf> getSXFDetailListByTasknos(String tasknos){
+		 return projectChbSxfService.getSXFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
+	 /**
 	 * 分页列表查询
 	 *
 	 * @param projectChbSxf

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/mapper/ProjectChbSxfMapper.java

@@ -37,4 +37,6 @@ public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbSxf> getSXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/mapper/xml/ProjectChbSxfMapper.xml

@@ -27,4 +27,12 @@
         SELECT * FROM kzks_project_chb_sxf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getSXFDetailListByTasknos" resultType="org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf">
+        SELECT * FROM kzks_project_chb_sxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/service/IProjectChbSxfService.java

@@ -21,4 +21,6 @@ public interface IProjectChbSxfService extends IService<ProjectChbSxf> {
     List<ProjectChbSxf> getSXFDetailList(String taskno);
 
     ModelAndView exportSXFDetail(List<ProjectChbSxf> exportList, Class<ProjectChbSxf> clazz, String title);
+
+    List<ProjectChbSxf> getSXFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSxf/service/impl/ProjectChbSxfServiceImpl.java

@@ -65,4 +65,9 @@ public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, P
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
+    @Override
+    public List<ProjectChbSxf> getSXFDetailListByTasknos(List<String> tasknoList) {
+        return sxfMapper.getSXFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -43,7 +43,8 @@ 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 = getWXFDetailList(taskno);
+		List<ProjectChbWxf> list = getWXFDetailListByTasknos(taskno);
 		return projectChbWxfService.exportWXFDetail(list,ProjectChbWxf.class, "外协费详情");
 	}
 
@@ -54,6 +55,13 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 		 return projectChbWxfService.getWXFDetailList(taskno);
 	 }
 
+	/**项目成本——外协费详情——根据任务号查询*/
+	@ApiOperation("项目成本——外协费详情(汇总级)")
+	@GetMapping("/getWXFDetailListByTasknos")
+	public List<ProjectChbWxf> getWXFDetailListByTasknos(String tasknos){
+		return projectChbWxfService.getWXFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	}
+
 
 	/**
 	 * 分页列表查询

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/ProjectChbWxfMapper.java

@@ -55,4 +55,6 @@ public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbWxf> getWXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/xml/ProjectChbWxfMapper.xml

@@ -50,4 +50,12 @@
         SELECT * FROM kzks_project_chb_wxf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getWXFDetailListByTasknos" resultType="org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf">
+        SELECT * FROM kzks_project_chb_wxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/IProjectChbWxfService.java

@@ -52,4 +52,6 @@ public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
      *   date: 2024/1/4
      */
     int deleteWxfByNd(String nd);
+
+    List<ProjectChbWxf> getWXFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/impl/ProjectChbWxfServiceImpl.java

@@ -165,4 +165,9 @@ public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, P
     public int deleteWxfByNd(String nd) {
         return wxfMapper.deleteWxfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbWxf> getWXFDetailListByTasknos(List<String> tasknoList) {
+        return wxfMapper.getWXFDetailListByTasknos(tasknoList);
+    }
 }

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

@@ -40,7 +40,8 @@ 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 = getZJFDetailList(taskno);
+		 List<ProjectChbZjf> list = getZJFDetailListByTasknos(taskno);
 		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
 	 }
 
@@ -51,6 +52,13 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 		 return kzksProjectChbZjfService.getZJFDetailList(taskno);
 	 }
 
+	 /**项目成本——专用费详情——根据汇总级下的所有任务号查询*/
+	 @ApiOperation("项目成本——折旧费详情(汇总级)")
+	 @GetMapping("/getZJFDetailListByTasknos")
+	 public List<ProjectChbZjf> getZJFDetailListByTasknos(String tasknos){
+		 return kzksProjectChbZjfService.getZJFDetailListByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
 
 	 /**
 	 * 分页列表查询

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/mapper/KzksProjectChbZjfMapper.java

@@ -37,4 +37,6 @@ public interface KzksProjectChbZjfMapper extends BaseMapper<ProjectChbZjf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZjf> getZJFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/mapper/xml/KzksProjectChbZjfMapper.xml

@@ -27,4 +27,12 @@
         SELECT * FROM kzks_project_chb_zjf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getZJFDetailListByTasknos" resultType="org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf">
+        SELECT * FROM kzks_project_chb_zjf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/service/IKzksProjectChbZjfService.java

@@ -21,4 +21,6 @@ public interface IKzksProjectChbZjfService extends IService<ProjectChbZjf> {
     List<ProjectChbZjf> getZJFDetailList(String taskno);
 
     ModelAndView exportZJFDetail(List<ProjectChbZjf> exportList, Class<ProjectChbZjf> clazz, String title);
+
+    List<ProjectChbZjf> getZJFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZjf/service/impl/KzksProjectChbZjfServiceImpl.java

@@ -64,4 +64,9 @@ public class KzksProjectChbZjfServiceImpl extends ServiceImpl<KzksProjectChbZjfM
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
         return mv;
     }
+
+    @Override
+    public List<ProjectChbZjf> getZJFDetailListByTasknos(List<String> tasknoList) {
+        return zjfMapper.getZJFDetailListByTasknos(tasknoList);
+    }
 }

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

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

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/entity/ProjectChbZyfExpoet.java

@@ -31,114 +31,108 @@ import java.util.Date;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="kzks_project_chb_zyf对象", description="专用费")
-// 头字体设置成20
-@HeadFontStyle(fontHeightInPoints = 10)
-// 行高
-@HeadRowHeight(20)
-// 列宽
-@ColumnWidth(20)
+//// 头字体设置成20
+//@HeadFontStyle(fontHeightInPoints = 10)
+//// 行高
+//@HeadRowHeight(20)
+//// 列宽
+//@ColumnWidth(20)
 public class ProjectChbZyfExpoet implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
-    @ExcelIgnore
     @ApiModelProperty(value = "主键")
     private String id;
 	/**创建人*/
-    @ExcelIgnore
     @ApiModelProperty(value = "创建人")
     private String createBy;
 	/**创建日期*/
-    @ExcelIgnore
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
 	/**更新人*/
-    @ExcelIgnore
     @ApiModelProperty(value = "更新人")
     private String updateBy;
 	/**更新日期*/
-    @ExcelIgnore
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
 	/**所属部门*/
-    @ExcelIgnore
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
 	/**年度*/
-	@ExcelProperty(value = "年度")
+	@Excel(name = "年度",width = 20)
     @ApiModelProperty(value = "年度")
     private String nd;
 	/**凭证日期*/
-	@ExcelProperty(value = "凭证日期")
+	@Excel(name = "凭证日期",width = 20)
     @ApiModelProperty(value = "凭证日期")
     private String pzrq;
 	/**凭证号*/
-	@ExcelProperty(value = "凭证号")
+	@Excel(name = "凭证号",width = 20)
     @ApiModelProperty(value = "凭证号")
     private String pzh;
 	/**摘要*/
-	@ExcelProperty(value = "摘要")
+	@Excel(name = "摘要",width = 20)
     @ApiModelProperty(value = "摘要")
     private String zy;
 	/**科目编号*/
-	@ExcelProperty(value = "科目编号")
+	@Excel(name = "科目编号",width = 20)
     @ApiModelProperty(value = "科目编号")
     private String kmbh;
 	/**科目名称*/
-	@ExcelProperty(value = "科目名称")
+	@Excel(name = "科目名称",width = 20)
     @ApiModelProperty(value = "科目名称")
     private String km;
 	/**方向*/
-	@ExcelProperty(value = "方向")
+	@Excel(name = "方向",width = 20)
     @ApiModelProperty(value = "方向")
     private String fx;
 	/**金额*/
-	@ExcelProperty(value = "金额")
+	@Excel(name = "金额",width = 20)
     @ApiModelProperty(value = "金额")
     private String je;
 	/**部门*/
-	@ExcelProperty(value = "部门")
+	@Excel(name = "部门",width = 20)
     @ApiModelProperty(value = "部门")
     private String bm;
 	/**往来单位*/
-	@ExcelProperty(value = "往来单位")
+	@Excel(name = "往来单位",width = 20)
     @ApiModelProperty(value = "往来单位")
     private String wldw;
 	/**辅助金额*/
-	@ExcelProperty(value = "辅助金额")
+	@Excel(name = "辅助金额",width = 20)
     @ApiModelProperty(value = "辅助金额")
     private String fzje;
 	/**制单人*/
-	@ExcelProperty(value = "制单人")
+	@Excel(name = "制单人",width = 20)
     @ApiModelProperty(value = "制单人")
     private String zdr;
 	/**会计期间*/
-	@ExcelProperty(value = "会计期间")
+	@Excel(name = "会计期间",width = 20)
     @ApiModelProperty(value = "会计期间")
     private String kjqj;
 	/**凭证内码*/
-	@ExcelProperty(value = "凭证内码")
+	@Excel(name = "凭证内码",width = 20)
     @ApiModelProperty(value = "凭证内码")
     private String pznm;
 	/**项目编号*/
-	@ExcelProperty(value = "项目编号")
+	@Excel(name = "项目编号",width = 20)
     @ApiModelProperty(value = "项目编号")
     private String xmbh;
 	/**项目名称*/
-	@ExcelProperty(value = "项目名称")
+	@Excel(name = "项目名称",width = 20)
     @ApiModelProperty(value = "项目名称")
     private String xmmc;
 	/**项目类别*/
-	@ExcelProperty(value = "项目类别")
+	@Excel(name = "项目类别",width = 20)
     @ApiModelProperty(value = "项目类别")
     private String xmlb;
 	/**任务号*/
-	@ExcelProperty(value = "任务号")
+	@Excel(name = "任务号",width = 20)
     @ApiModelProperty(value = "任务号")
     private String taskno;
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/ProjectChbZyfMapper.java

@@ -55,4 +55,7 @@ public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
     List<ProjectChbZyfExpoet> getDetail1(@Param("tasknoList") ArrayList<String> tasknoList, @Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
+
+    List<ProjectChbZyf> getZYFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/xml/ProjectChbZyfMapper.xml

@@ -50,4 +50,12 @@
         SELECT * FROM kzks_project_chb_zyf
         where DATE_FORMAT(pzrq,'%Y-%m') = #{nowMonth}
     </select>
+
+    <select id="getZYFDetailListByTasknos" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf">
+        SELECT * FROM kzks_project_chb_zyf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/IProjectChbZyfService.java

@@ -54,4 +54,6 @@ public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
      *   date: 2024/1/4
      */
     int deleteZyfByNd(String nd);
+
+    List<ProjectChbZyf> getZYFDetailListByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/impl/ProjectChbZyfServiceImpl.java

@@ -168,4 +168,9 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
     public int deleteZyfByNd(String nd) {
         return zyfMapper.deleteZyfByNd(nd);
     }
+
+    @Override
+    public List<ProjectChbZyf> getZYFDetailListByTasknos(List<String> tasknoList) {
+        return zyfMapper.getZYFDetailListByTasknos(tasknoList);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/entity/WzOutboundOrderBNewExport.java

@@ -36,276 +36,270 @@ import java.util.Date;
 @Accessors(chain = false)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="wz_outbound_order_b_new对象", description="wz_outbound_order_b_new")
-// 头字体设置成20
-@HeadFontStyle(fontHeightInPoints = 10)
-// 行高
-@HeadRowHeight(20)
-// 列宽
-@ColumnWidth(20)
+//// 头字体设置成20
+//@HeadFontStyle(fontHeightInPoints = 10)
+//// 行高
+//@HeadRowHeight(20)
+//// 列宽
+//@ColumnWidth(20)
 public class WzOutboundOrderBNewExport implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-    @ExcelIgnore
     @ApiModelProperty(value = "id")
     private String id;
 	/**来源(日期)*/
-    @ExcelIgnore
     @ApiModelProperty(value = "来源(日期)")
     private String ly;
 	/**库存组织*/
-	@ExcelProperty(value = "库存组织")
+	@Excel(name = "库存组织",width = 20)
     @ApiModelProperty(value = "库存组织")
     private String kczz;
 	/**仓库*/
-	@ExcelProperty(value = "仓库")
+	@Excel(name = "仓库",width = 20)
     @ApiModelProperty(value = "仓库")
     private String ck;
 	/**制单人*/
-	@ExcelProperty(value = "制单人")
+	@Excel(name = "制单人",width = 20)
     @ApiModelProperty(value = "制单人")
     private String zdr;
 	/**制单日期*/
-	@ExcelProperty(value = "制单日期")
+	@Excel(name = "制单日期",width = 20)
     @ApiModelProperty(value = "制单日期")
     private String zdrq;
 	/**出库单号*/
-	@ExcelProperty(value = "出库单号")
+	@Excel(name = "出库单号",width = 20)
     @ApiModelProperty(value = "出库单号")
     private String ckdh;
 	/**行号*/
-	@ExcelProperty(value = "行号")
+	@Excel(name = "行号",width = 20)
     @ApiModelProperty(value = "行号")
     private String hh;
 	/**出库类型*/
-	@ExcelProperty(value = "出库类型")
+	@Excel(name = "出库类型",width = 20)
     @ApiModelProperty(value = "出库类型")
     private String cklx;
 	/**原图纸编码*/
-	@ExcelProperty(value = "原图纸编码")
+	@Excel(name = "原图纸编码",width = 20)
     @ApiModelProperty(value = "原图纸编码")
     private String ytzbm;
 	/**原图纸规格*/
-	@ExcelProperty(value = "原图纸规格")
+	@Excel(name = "原图纸规格",width = 20)
     @ApiModelProperty(value = "原图纸规格")
     private String ytzgg;
 	/**物料分类*/
-	@ExcelProperty(value = "物料分类")
+	@Excel(name = "物料分类",width = 20)
     @ApiModelProperty(value = "物料分类")
     private String wlfl;
 	/**物料编码*/
-	@ExcelProperty(value = "物料编码")
+	@Excel(name = "物料编码",width = 20)
     @ApiModelProperty(value = "物料编码")
     private String wlbm;
 	/**是否积压物资*/
-	@ExcelProperty(value = "是否积压物资")
+	@Excel(name = "是否积压物资",width = 20)
     @ApiModelProperty(value = "是否积压物资")
     private String sfjywz;
 	/**国产/进口*/
-	@ExcelProperty(value = "国产/进口")
+	@Excel(name = "国产/进口",width = 20)
     @ApiModelProperty(value = "国产/进口")
     private String gcjk;
 	/**物资名称*/
-	@ExcelProperty(value = "物资名称")
+	@Excel(name = "物资名称",width = 20)
     @ApiModelProperty(value = "物资名称")
     private String wzmc;
 	/**规格型号*/
-	@ExcelProperty(value = "规格型号")
+	@Excel(name = "规格型号",width = 20)
     @ApiModelProperty(value = "规格型号")
     private String ggxh;
 	/**外观标识*/
-	@ExcelProperty(value = "外观标识")
+	@Excel(name = "外观标识",width = 20)
     @ApiModelProperty(value = "外观标识")
     private String wgbs;
 	/**供应商批次号*/
-	@ExcelProperty(value = "供应商批次号")
+	@Excel(name = "供应商批次号",width = 20)
     @ApiModelProperty(value = "供应商批次号")
     private String gyspch;
 	/**质量等级*/
-	@ExcelProperty(value = "质量等级")
+	@Excel(name = "质量等级",width = 20)
     @ApiModelProperty(value = "质量等级")
     private String zldj;
 	/**封装形式*/
-	@ExcelProperty(value = "封装形式")
+	@Excel(name = "封装形式",width = 20)
     @ApiModelProperty(value = "封装形式")
     private String fzxs;
 	/**生产厂商*/
-	@ExcelProperty(value = "生产厂商")
+	@Excel(name = "生产厂商",width = 20)
     @ApiModelProperty(value = "生产厂商")
     private String sccs;
 	/**应发数量*/
-	@ExcelProperty(value = "应发数量",converter = BigDecimalNumberConverter.class)
+	@Excel(name = "应发数量",width = 20)
     @ApiModelProperty(value = "应发数量")
     private BigDecimal yfsl;
 	/**实发数量*/
-	@ExcelProperty(value = "实发数量",converter = BigDecimalNumberConverter.class)
+	@Excel(name = "实发数量",width = 20)
     @ApiModelProperty(value = "实发数量")
     private BigDecimal sfsl;
 	/**质保有效期*/
-//	@Excel(value = "质保有效期", format = "yyyy-MM-dd HH:mm:ss")
-    @ExcelProperty(value = "质保有效期", converter = DateStringConverter.class)
+	@Excel(name = "质保有效期", format = "yyyy-MM-dd HH:mm:ss",width = 20)
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "质保有效期")
     private Date zbyxq;
 	/**质保单位*/
-	@ExcelProperty(value = "质保单位")
+	@Excel(name = "质保单位",width = 20)
     @ApiModelProperty(value = "质保单位")
     private String zbdw;
 	/**质保依据*/
-	@ExcelProperty(value = "质保依据")
+	@Excel(name = "质保依据",width = 20)
     @ApiModelProperty(value = "质保依据")
     private String zbyj;
 	/**配套指令号*/
-	@ExcelProperty(value = "配套指令号")
+	@Excel(name = "配套指令号",width = 20)
     @ApiModelProperty(value = "配套指令号")
     private String ptzlh;
 	/**投产任务号*/
-	@ExcelProperty(value = "投产任务号")
+	@Excel(name = "投产任务号",width = 20)
     @ApiModelProperty(value = "投产任务号")
     private String tcrwh;
 	/**研制阶段*/
-	@ExcelProperty(value = "研制阶段")
+	@Excel(name = "研制阶段",width = 20)
     @ApiModelProperty(value = "研制阶段")
     private String yzjd;
 	/**设备名称*/
-	@ExcelProperty(value = "设备名称")
+	@Excel(name = "设备名称",width = 20)
     @ApiModelProperty(value = "设备名称")
     private String sbmc;
 	/**单板号*/
-	@ExcelProperty(value = "单板号")
+	@Excel(name = "单板号",width = 20)
     @ApiModelProperty(value = "单板号")
     private String dbh;
 	/**合格证号*/
-	@ExcelProperty(value = "合格证号")
+	@Excel(name = "合格证号",width = 20)
     @ApiModelProperty(value = "合格证号")
     private String hgzh;
 	/**合格证是否已上传*/
-	@ExcelProperty(value = "合格证是否已上传")
+	@Excel(name = "合格证是否已上传",width = 20)
     @ApiModelProperty(value = "合格证是否已上传")
     private String hgzysc;
 	/**DPA号*/
-	@ExcelProperty(value = "DPA号")
+	@Excel(name = "DPA号",width = 20)
     @ApiModelProperty(value = "DPA号")
     private String dpah;
 	/**领用单位*/
-	@ExcelProperty(value = "领用单位")
+	@Excel(name = "领用单位",width = 20)
     @ApiModelProperty(value = "领用单位")
     private String lydw;
 	/**领用人*/
-	@ExcelProperty(value = "领用人")
+	@Excel(name = "领用人",width = 20)
     @ApiModelProperty(value = "领用人")
     private String lyr;
 	/**仓库名称*/
-	@ExcelProperty(value = "仓库名称")
+	@Excel(name = "仓库名称",width = 20)
     @ApiModelProperty(value = "仓库名称")
     private String ckmc;
 	/**单据状态*/
-	@ExcelProperty(value = "单据状态")
+	@Excel(name = "单据状态",width = 20)
     @ApiModelProperty(value = "单据状态")
     private String djztone;
 	/**单位*/
-	@ExcelProperty(value = "单位")
+	@Excel(name = "单位",width = 20)
     @ApiModelProperty(value = "单位")
     private String dw;
 	/**内转移价*/
-	@ExcelProperty(value = "内转移价")
+	@Excel(name = "内转移价",width = 20)
     @ApiModelProperty(value = "内转移价")
     private String nzyj;
 	/**单价*/
-	@ExcelProperty(value = "单价",converter = BigDecimalStringConverter.class)
+	@Excel(name = "单价",width = 20)
     @ApiModelProperty(value = "单价")
     private BigDecimal nbdj;
 	/**采购单价*/
-	@ExcelProperty(value = "采购单价",converter = BigDecimalStringConverter.class)
+	@Excel(name = "采购单价",width = 20)
     @ApiModelProperty(value = "采购单价")
     private BigDecimal cgdj;
 	/**金额*/
-	@ExcelProperty(value = "金额",converter = BigDecimalNumberConverter.class)
+	@Excel(name = "金额",width = 20)
     @ApiModelProperty(value = "金额")
     private BigDecimal je;
 	/**储位号*/
-	@ExcelProperty(value = "储位号")
+	@Excel(name = "储位号",width = 20)
     @ApiModelProperty(value = "储位号")
     private String cwh;
 	/**当前保管员*/
-	@ExcelProperty(value = "当前保管员")
+	@Excel(name = "当前保管员",width = 20)
     @ApiModelProperty(value = "当前保管员")
     private String dqbgy;
 	/**出库状态*/
-	@ExcelProperty(value = "出库状态")
+	@Excel(name = "出库状态",width = 20)
     @ApiModelProperty(value = "出库状态")
     private String ckzt;
 	/**单据状态*/
-	@ExcelProperty(value = "单据状态")
+	@Excel(name = "单据状态",width = 20)
     @ApiModelProperty(value = "单据状态")
     private String djzttwo;
 	/**配套单号*/
-	@ExcelProperty(value = "配套单号")
+	@Excel(name = "配套单号",width = 20)
     @ApiModelProperty(value = "配套单号")
     private String ptdh;
 	/**备料计划单号*/
-	@ExcelProperty(value = "备料计划单号")
+	@Excel(name = "备料计划单号",width = 20)
     @ApiModelProperty(value = "备料计划单号")
     private String bljhdh;
 	/**批次号*/
-	@ExcelProperty(value = "批次号")
+	@Excel(name = "批次号",width = 20)
     @ApiModelProperty(value = "批次号")
     private String pch;
 	/**首次入库时间*/
 //	@Excel(value = "首次入库时间", format = "yyyy-MM-dd")
-    @ExcelProperty(value = "首次入库时间", converter = DateStringConverter.class)
+    @Excel(name = "首次入库时间",width = 20)
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "首次入库时间")
     private Date scrksj;
 	/**任务号*/
-	@ExcelProperty(value = "任务号")
+	@Excel(name = "任务号",width = 20)
     @ApiModelProperty(value = "任务号")
     private String rwh;
 	/**型号分类*/
-	@ExcelProperty(value = "型号分类")
+	@Excel(name = "型号分类",width = 20)
     @ApiModelProperty(value = "型号分类")
     private String xhfl;
 	/**军品管理员*/
-	@ExcelProperty(value = "军品管理员")
+	@Excel(name = "军品管理员",width = 20)
     @ApiModelProperty(value = "军品管理员")
     private String jpgly;
 	/**民品管理员*/
-	@ExcelProperty(value = "民品管理员")
+	@Excel(name = "民品管理员",width = 20)
     @ApiModelProperty(value = "民品管理员")
     private String mpgly;
 	/**箱号*/
-	@ExcelProperty(value = "箱号")
+	@Excel(name = "箱号",width = 20)
     @ApiModelProperty(value = "箱号")
     private String xh;
 	/**智能仓储标识*/
-	@ExcelProperty(value = "智能仓储标识")
+	@Excel(name = "智能仓储标识",width = 20)
     @ApiModelProperty(value = "智能仓储标识")
     private String znccbs;
 	/**打印次数*/
-	@ExcelProperty(value = "打印次数")
+	@Excel(name = "打印次数",width = 20)
     @ApiModelProperty(value = "打印次数")
     private String dycs;
 	/**A*/
-	@ExcelProperty(value = "A")
+	@Excel(name = "A",width = 20)
     @ApiModelProperty(value = "A")
     private String a;
 	/**优先级*/
-    @ExcelProperty(value = "优先级")
+    @Excel(name = "优先级",width = 20)
     @ApiModelProperty(value = "优先级")
     private String yxj;
 	/**年*/
-	@ExcelIgnore
     @ApiModelProperty(value = "年")
     private Integer year;
 	/**月*/
-    @ExcelIgnore
     @ApiModelProperty(value = "月")
     private Integer month;
 	/**年月*/
-    @ExcelIgnore
     @ApiModelProperty(value = "年月")
     private String yearmonth;
 }