项目成本汇集层总成本详情导出修改

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

@@ -40,4 +40,5 @@ public interface KzksProjectChbGlfMapper extends BaseMapper<ProjectChbGlf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbGlf> getGLFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -35,4 +35,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getGLFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectChbGlf.service;
 
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface IKzksProjectChbGlfService extends IService<ProjectChbGlf> {
     ModelAndView exportGLFDetail(List<ProjectChbGlf> exportList, Class<ProjectChbGlf> clazz, String title);
 
     List<ProjectChbGlf> getGLFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -5,6 +5,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import org.jeecg.modules.projectChbGlf.mapper.KzksProjectChbGlfMapper;
 import org.jeecg.modules.projectChbGlf.service.IKzksProjectChbGlfService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -71,4 +72,9 @@ public class KzksProjectChbGlfServiceImpl extends ServiceImpl<KzksProjectChbGlfM
     public List<ProjectChbGlf> getGLFDetailListByTasknos(List<String> tasknoList) {
         return glfMapper.getGLFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(List<String> tasknoList) {
+        return glfMapper.getGLFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -40,4 +40,5 @@ public interface KzksProjectChbRdfMapper extends BaseMapper<ProjectChbRdf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbRdf> getRDFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -35,4 +35,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getRDFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectChbRdf.service;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -24,4 +25,5 @@ public interface IKzksProjectChbRdfService extends IService<ProjectChbRdf> {
     ModelAndView exportRDFDetail(List<ProjectChbRdf> exportList, Class<ProjectChbRdf> clazz, String title);
 
     List<ProjectChbRdf> getRDFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -6,6 +6,7 @@ import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import org.jeecg.modules.projectChbRdf.mapper.KzksProjectChbRdfMapper;
 import org.jeecg.modules.projectChbRdf.service.IKzksProjectChbRdfService;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -71,4 +72,9 @@ public class KzksProjectChbRdfServiceImpl extends ServiceImpl<KzksProjectChbRdfM
     public List<ProjectChbRdf> getRDFDetailListByTasknos(List<String> tasknoList) {
         return rdfMapper.getRDFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(List<String> tasknoList) {
+        return rdfMapper.getRDFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -40,4 +40,5 @@ public interface KzksProjectChbRgfMapper extends BaseMapper<ProjectChbRgf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbRgf> getRGFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -35,4 +35,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getRGFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectChbRgf.service;
 
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface IKzksProjectChbRgfService extends IService<ProjectChbRgf> {
     ModelAndView exportRGFDetail(List<ProjectChbRgf> exportList, Class<ProjectChbRgf> clazz, String title);
 
     List<ProjectChbRgf> getRGFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -5,6 +5,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import org.jeecg.modules.projectChbRgf.mapper.KzksProjectChbRgfMapper;
 import org.jeecg.modules.projectChbRgf.service.IKzksProjectChbRgfService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -71,4 +72,9 @@ public class KzksProjectChbRgfServiceImpl extends ServiceImpl<KzksProjectChbRgfM
     public List<ProjectChbRgf> getRGFDetailListByTasknos(List<String> tasknoList) {
         return rgfMapper.getRGFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(List<String> tasknoList) {
+        return rgfMapper.getRGFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -55,4 +55,5 @@ public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbSwf> getSWFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -57,4 +57,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getSWFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -5,6 +5,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -60,4 +61,5 @@ public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
     int deleteSwfByNd(String nd);
 
     List<ProjectChbSwf> getSWFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -9,6 +9,7 @@ import org.jeecg.modules.dataSourceSwitch.annotation.UseMasterDataSource;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
 import org.jeecg.modules.projectChbSwf.mapper.ProjectChbSwfMapper;
 import org.jeecg.modules.projectChbSwf.service.IProjectChbSwfService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecg.modules.xmcbDetail.vo.ComContractInfoExchangeHTEVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -175,4 +176,9 @@ public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, P
     public List<ProjectChbSwf> getSWFDetailListByTasknos(List<String> tasknoList) {
         return swfMapper.getSWFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(List<String> tasknoList) {
+        return swfMapper.getSWFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -39,4 +39,5 @@ public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbSxf> getSXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -35,4 +35,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getSXFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectChbSxf.service;
 
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface IProjectChbSxfService extends IService<ProjectChbSxf> {
     ModelAndView exportSXFDetail(List<ProjectChbSxf> exportList, Class<ProjectChbSxf> clazz, String title);
 
     List<ProjectChbSxf> getSXFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -5,6 +5,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import org.jeecg.modules.projectChbSxf.mapper.ProjectChbSxfMapper;
 import org.jeecg.modules.projectChbSxf.service.IProjectChbSxfService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -70,4 +71,9 @@ public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, P
     public List<ProjectChbSxf> getSXFDetailListByTasknos(List<String> tasknoList) {
         return sxfMapper.getSXFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(List<String> tasknoList) {
+        return sxfMapper.getSXFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -57,4 +57,5 @@ public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbWxf> getWXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -58,4 +58,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getWXFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -3,6 +3,7 @@ package org.jeecg.modules.projectChbWxf.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -54,4 +55,5 @@ public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
     int deleteWxfByNd(String nd);
 
     List<ProjectChbWxf> getWXFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -10,6 +10,7 @@ import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbWxf.mapper.ProjectChbWxfMapper;
 import org.jeecg.modules.projectChbWxf.service.IProjectChbWxfService;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecg.modules.projectChbZyf.mapper.ProjectChbZyfMapper;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -170,4 +171,9 @@ public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, P
     public List<ProjectChbWxf> getWXFDetailListByTasknos(List<String> tasknoList) {
         return wxfMapper.getWXFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(List<String> tasknoList) {
+        return wxfMapper.getWXFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -39,4 +39,5 @@ public interface KzksProjectChbZjfMapper extends BaseMapper<ProjectChbZjf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbZjf> getZJFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

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

@@ -35,4 +35,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getZJFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -2,6 +2,7 @@ package org.jeecg.modules.projectChbZjf.service;
 
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface IKzksProjectChbZjfService extends IService<ProjectChbZjf> {
     ModelAndView exportZJFDetail(List<ProjectChbZjf> exportList, Class<ProjectChbZjf> clazz, String title);
 
     List<ProjectChbZjf> getZJFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -5,6 +5,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import org.jeecg.modules.projectChbZjf.mapper.KzksProjectChbZjfMapper;
 import org.jeecg.modules.projectChbZjf.service.IKzksProjectChbZjfService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -69,4 +70,9 @@ public class KzksProjectChbZjfServiceImpl extends ServiceImpl<KzksProjectChbZjfM
     public List<ProjectChbZjf> getZJFDetailListByTasknos(List<String> tasknoList) {
         return zjfMapper.getZJFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(List<String> tasknoList) {
+        return zjfMapper.getZJFDetailListByTasknos1(tasknoList);
+    }
 }

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

@@ -57,5 +57,6 @@ public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
     List<ProjectChbZyfExpoet> getDetailIfBoss1(@Param("nowMonth") String nowMonth);
 
     List<ProjectChbZyf> getZYFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 
 }

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

@@ -58,4 +58,12 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getZYFDetailListByTasknos1" resultType="org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet">
+        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

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -56,4 +57,5 @@ public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
     int deleteZyfByNd(String nd);
 
     List<ProjectChbZyf> getZYFDetailListByTasknos(List<String> tasknoList);
+    List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(List<String> tasknoList);
 }

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

@@ -7,6 +7,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
+import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
 import org.jeecg.modules.projectChbZyf.mapper.ProjectChbZyfMapper;
 import org.jeecg.modules.projectChbZyf.service.IProjectChbZyfService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -173,4 +174,9 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
     public List<ProjectChbZyf> getZYFDetailListByTasknos(List<String> tasknoList) {
         return zyfMapper.getZYFDetailListByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(List<String> tasknoList) {
+        return zyfMapper.getZYFDetailListByTasknos1(tasknoList);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -393,31 +393,31 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
     @Override
     public ModelAndView exportZcbDetail(List<String> tasknoList, HttpServletRequest request) {
         // 材料费
-        List<WzOutboundOrderBNew> wzList = wzOutboundOrderHService.getClfListByTasknos(tasknoList);
+        List<WzOutboundOrderBNewExport> wzList = wzOutboundOrderHService.getClfListByTasknos1(tasknoList);
         // 专用费
-        List<ProjectChbZyf> zyfList = zyfService.getZYFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> zyfList = zyfService.getZYFDetailListByTasknos1(tasknoList);
         // 事务费
-        List<ProjectChbSwf> swfList = swfService.getSWFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> swfList = swfService.getSWFDetailListByTasknos1(tasknoList);
         // 外协费
-        List<ProjectChbWxf> wxfList = wxfService.getWXFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> wxfList = wxfService.getWXFDetailListByTasknos1(tasknoList);
         // 燃料动力费
-        List<ProjectChbRdf> rdfList = rdfService.getRDFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> rdfList = rdfService.getRDFDetailListByTasknos1(tasknoList);
         // 折旧费
-        List<ProjectChbZjf> zjfList = zjfService.getZJFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> zjfList = zjfService.getZJFDetailListByTasknos1(tasknoList);
         // 工资及劳务费
-        List<ProjectChbRgf> rgfList = rgfService.getRGFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> rgfList = rgfService.getRGFDetailListByTasknos1(tasknoList);
         // 管理费
-        List<ProjectChbGlf> glfList = glfService.getGLFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> glfList = glfService.getGLFDetailListByTasknos1(tasknoList);
         // 筛选费
-        List<ProjectChbSxf> sxfList = sxfService.getSXFDetailListByTasknos(tasknoList);
+        List<ProjectChbZyfExpoet> sxfList = sxfService.getSXFDetailListByTasknos1(tasknoList);
 
         // 调用导出excel的方法 一个费用一个sheet
         return exportZcbExcel(wzList,zyfList,swfList,wxfList,rdfList,zjfList,rgfList,glfList,sxfList);
     }
 
-    private ModelAndView exportZcbExcel(List<WzOutboundOrderBNew> wzList, List<ProjectChbZyf> zyfList, List<ProjectChbSwf> swfList, List<ProjectChbWxf> wxfList, List<ProjectChbRdf> rdfList, List<ProjectChbZjf> zjfList, List<ProjectChbRgf> rgfList, List<ProjectChbGlf> glfList, List<ProjectChbSxf> sxfList) {
+    public ModelAndView exportZcbExcel(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) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        String title = "成本额明细";
+        String title = "总成本明细";
 
         Map<String, Object> sheet1Map = new HashMap<>();
         sheet1Map.put(NormalExcelConstants.CLASS, WzOutboundOrderBNewExport.class);
@@ -484,6 +484,7 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
 
         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);

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/IWzOutboundOrderHService.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO;
 import org.jeecg.modules.wzOutboundOrder.entity.WzOutboundOrderH;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
+import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.List;
@@ -38,4 +39,5 @@ public interface IWzOutboundOrderHService extends IService<WzOutboundOrderH> {
     ModelAndView compareCLFDetailListExportExcel(String tasknos);
 
     List<WzOutboundOrderBNew> getClfListByTasknos(List<String> tasknoList);
+    List<WzOutboundOrderBNewExport> getClfListByTasknos1(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderHServiceImpl.java

@@ -16,6 +16,7 @@ import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderHService;
 import org.jeecg.modules.wzOutboundOrder.vo.CLFCompareResultVO;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
+import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport;
 import org.jeecg.modules.wzOutboundOrderBNew.mapper.WzOutboundOrderBNewMapper;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -104,6 +105,11 @@ public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMap
     }
 
     @Override
+    public List<WzOutboundOrderBNewExport> getClfListByTasknos1(List<String> tasknoList) {
+        return orderBNewMapper.getClfListByTasknos1(tasknoList);
+    }
+
+    @Override
     public List<CLfCompareDO> getCLFCompareDoListByTaskNoListHasPcCode(String taskno,Boolean hasPcCode,Double proportion) {
         //return hMapper.getCLFCompareDoListByTaskNoListHasPcCode(taskno,hasPcCode,proportion);
         return orderBNewMapper.getCLFCompareDoListByTaskNoListHasPcCode(taskno,hasPcCode,proportion);

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/WzOutboundOrderBNewMapper.java

@@ -51,4 +51,5 @@ public interface WzOutboundOrderBNewMapper extends BaseMapper<WzOutboundOrderBNe
     List<WzOutboundOrderBNewExport> getClfDetailIfBoss1ByOffset(@Param("nowMonth") String nowMonth,@Param("index") Integer index,@Param("size") Integer size);
 
     List<WzOutboundOrderBNew> getClfListByTasknos(@Param("tasknoList") List<String> tasknoList);
+    List<WzOutboundOrderBNewExport> getClfListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/xml/WzOutboundOrderBNewMapper.xml

@@ -126,4 +126,13 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getClfListByTasknos1" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNewExport">
+        select *
+        from wz_outbound_order_b_new
+        where tcrwh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 </mapper>