项目成本合同额已收款汇总级详情+导出/八项成本汇总级导出

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

@@ -206,6 +206,34 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	 }
 
 	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: 导出合同明细 （汇总级）
+	  *   date: 2024/4/12
+	  */
+	 @ApiOperation(value="项目成本——导出合同额的详情excel(汇总级)")
+	 @RequestMapping(value = "/exportNewHteDetailByTasknos")
+	 public ModelAndView exportNewHteDetailByTasknos(String tasknos) {
+		 List<ComContractInfoExchangeNewHTEVO> list = getNewCrmHteDetailByTasknos(tasknos);
+		 return comContractInfoExchangeNewService.exportHteDetail(list,ComContractInfoExchangeNewHTEVO.class, "合同额详情");
+	 }
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: 合同额的详情 （汇总级）
+	  *   date: 2024/4/12
+	  */
+	 @ApiOperation(value="项目成本——合同额的详情列表(汇总级)", notes="项目成本——合同额的详情列表(汇总级)")
+	 @GetMapping(value = "/getNewCrmHteDetailByTasknos")
+	 public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(String tasknos){
+		 List<ComContractInfoExchangeNewHTEVO> crmHteDetail = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknos(Arrays.asList(tasknos.split(",")));
+		 return crmHteDetail;
+	 }
+
+
+
+	 /**
 	 *   author: dzc
 	 *   version: 1.0
 	 *   des: 导出已收款明细
@@ -230,4 +258,30 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 		 return comContractInfoExchangeNewService.getCrmYskDetail(taskno);
 	 }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: 导出已收款明细 （汇总级）
+	  *   date: 2024/4/12
+	  */
+	 @ApiOperation(value="项目成本——导出已收款的详情excel(汇总级)")
+	 @RequestMapping(value = "/exportNewYskDetailByTasknos")
+	 public ModelAndView exportNewYskDetailByTasknos(String tasknos) {
+		 List<ComContractInfoExchangeNewYSKVO> list = getNewCrmYskDetailByTasknos(tasknos);
+		 return comContractInfoExchangeNewService.exportYskDetail(list,ComContractInfoExchangeNewYSKVO.class, "已收款详情");
+	 }
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: 已收款详情 （汇总级）
+	  *   date: 2024/4/12
+	  */
+	 @ApiOperation(value="项目成本——已收款的详情列表(汇总级)", notes="项目成本——已收款的详情列表(汇总级)")
+	 @GetMapping(value = "/getNewCrmYskDetailByTasknos")
+	 public List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetailByTasknos(String tasknos){
+		 return comContractInfoExchangeNewService.getCrmYskDetailByTasknos(Arrays.asList(tasknos.split(",")));
+	 }
+
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/mapper/ComContractInfoExchangeNewMapper.java

@@ -128,4 +128,7 @@ public interface ComContractInfoExchangeNewMapper extends BaseMapper<ComContract
     List<ComContractInfoExchangeNewHTEVO> getXdbmHteDetailAll(@Param("selectDate") String selectDate,@Param("departName") String departName);
     List<ComContractInfoExchangeNewYSKVO> getXdbmYskDetailAll(@Param("selectDate") String selectDate,@Param("departName") String departName);
 
+    List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(@Param("tasknoList") List<String> tasknoList);
+
+    List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(@Param("tasknoList") List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/mapper/xml/ComContractInfoExchangeNewMapper.xml

@@ -506,5 +506,23 @@
             c.sjly = '40'
           AND dkhpdqrq LIKE  CONCAT(#{selectDate},'%')
     </select>
+    <select id="getNewCrmHteDetailByTasknos" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewHTEVO">
+        select id,serialno,htid,zhtbh,htbh,htname,qsrq,jf,jfjc,htje,zc,htdk,htdsk,htykp,htdkp,rwbh,rwname,cpxh,jd,
+               yzbm,rwyingsk,rwyisk,fptypeone,fpjeone,ykpeone,fptypetwo,fpjetwo,ykpetwo,htzgbm,ywy,htlxqk,htztsm
+        from com_contract_info_exchange_new
+        where sjly = 20 and rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
+    <select id="getCrmYskDetailByTasknos" resultType="org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO">
+        select id,skdh,zxzt,fkfmc,yhjc,htbh,htname,httype,xh,jd,sl,bm,rwbh,rwname,skzje,rwskje,dkhpdqrq,sktype,skkmdm,
+               pzh,ywy,ywbm,lrr,lrrq,jylsh,jyid,hph,hpid,skdw
+        from com_contract_info_exchange_new
+        where sjly = 40 and DATE_FORMAT(`dkhpdqrq`,'%Y') > '2015' and rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+    </select>
 
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/service/IComContractInfoExchangeNewService.java

@@ -59,4 +59,8 @@ public interface IComContractInfoExchangeNewService extends IService<ComContract
     BigDecimal getHteByTaskno(String taskno);
 
     BigDecimal getYskByTaskno(String taskno);
+
+    List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(List<String> tasknoList);
+
+    List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(List<String> tasknoList);
 }

module_kzks/src/main/java/org/jeecg/modules/comContractInfoExchangeNew/service/impl/ComContractInfoExchangeNewServiceImpl.java

@@ -120,4 +120,14 @@ public class ComContractInfoExchangeNewServiceImpl extends ServiceImpl<ComContra
     public BigDecimal getYskByTaskno(String taskno) {
         return exchangeNewMapper.getYskByTaskno(taskno);
     }
+
+    @Override
+    public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(List<String> tasknoList) {
+        return exchangeNewMapper.getNewCrmHteDetailByTasknos(tasknoList);
+    }
+
+    @Override
+    public List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(List<String> tasknoList) {
+        return exchangeNewMapper.getCrmYskDetailByTasknos(tasknoList);
+    }
 }

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

@@ -41,8 +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 = getGLFDetailListByTasknos(taskno);
+		 List<ProjectChbGlf> list = getGLFDetailList(taskno);
+		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
+	 }
+
+	 @ApiOperation(value="项目成本——导出管理费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportGLFDetailByTasknos")
+	 public ModelAndView exportSWFDetailByTasknos(String tasknos) {
+		 List<ProjectChbGlf> list = getGLFDetailListByTasknos(tasknos);
 		 return kzksProjectChbGlfService.exportGLFDetail(list,ProjectChbGlf.class, "管理费详情");
 	 }
 

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

@@ -40,8 +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 = getRDFDetailListByTasknos(taskno);
+		 List<ProjectChbRdf> list = getRDFDetailList(taskno);
+		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
+	 }
+
+
+	 @ApiOperation(value="项目成本——导出燃动费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportRDFDetailByTasknos")
+	 public ModelAndView exportRDFDetailByTasknos(String tasknos) {
+		 List<ProjectChbRdf> list = getRDFDetailListByTasknos(tasknos);
 		 return kzksProjectChbRdfService.exportRDFDetail(list,ProjectChbRdf.class, "燃动费详情");
 	 }
 

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

@@ -41,8 +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 = getRGFDetailListByTasknos(taskno);
+		 List<ProjectChbRgf> list = getRGFDetailList(taskno);
+		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
+	 }
+
+	 @ApiOperation(value="项目成本——导出人工费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportRGFDetailByTasknos")
+	 public ModelAndView exportRGFDetailByTasknos(String tasknos) {
+		 List<ProjectChbRgf> list = getRGFDetailListByTasknos(tasknos);
 		 return kzksProjectChbRgfService.exportRGFDetail(list,ProjectChbRgf.class, "人工费详情");
 	 }
 

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

@@ -44,8 +44,15 @@ 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 = getSWFDetailListByTasknos(taskno);
+		 List<ProjectChbSwf> list = getSWFDetailList(taskno);
+		 return projectChbSwfService.exportSWFDetail(list,ProjectChbSwf.class, "事务费详情");
+	 }
+
+
+	 @ApiOperation(value="项目成本——导出事务费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportSWFDetailByTasknos")
+	 public ModelAndView exportSWFDetailByTasknos(String tasknos) {
+		 List<ProjectChbSwf> list = getSWFDetailListByTasknos(tasknos);
 		 return projectChbSwfService.exportSWFDetail(list,ProjectChbSwf.class, "事务费详情");
 	 }
 

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

@@ -55,11 +55,18 @@ 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 = getSXFDetailListByTasknos(taskno);
+		 List<ProjectChbSxf> list = getSXFDetailList(taskno);
 		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
 	 }
 
+	 @ApiOperation(value="项目成本——导出筛选费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportSXFDetailByTasknos")
+	 public ModelAndView exportSXFDetailByTasknos(String tasknos) {
+		 List<ProjectChbSxf> list = getSXFDetailListByTasknos(tasknos);
+		 return projectChbSxfService.exportSXFDetail(list,ProjectChbSxf.class, "筛选费详情");
+	 }
+
+
 
 	 /**项目成本——管理费详情——根据任务号查询*/
 	 @ApiOperation("项目成本——筛选费详情")

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

@@ -43,8 +43,15 @@ 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 = getWXFDetailListByTasknos(taskno);
+		List<ProjectChbWxf> list = getWXFDetailList(taskno);
+		return projectChbWxfService.exportWXFDetail(list,ProjectChbWxf.class, "外协费详情");
+	}
+
+
+	@ApiOperation(value="项目成本——导出外协费详情excel(汇总级)")
+	@RequestMapping(value = "/exportWXFDetailByTasknos")
+	public ModelAndView exportWXFDetailByTasknos(String tasknos) {
+		List<ProjectChbWxf> list = getWXFDetailListByTasknos(tasknos);
 		return projectChbWxfService.exportWXFDetail(list,ProjectChbWxf.class, "外协费详情");
 	}
 

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

@@ -40,8 +40,15 @@ 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 = getZJFDetailListByTasknos(taskno);
+		 List<ProjectChbZjf> list = getZJFDetailList(taskno);
+		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
+	 }
+
+
+	 @ApiOperation(value="项目成本——导出折旧费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportZJFDetailByTasknos")
+	 public ModelAndView exportZJFDetailByTasknos(String tasknos) {
+		 List<ProjectChbZjf> list = getZJFDetailListByTasknos(tasknos);
 		 return kzksProjectChbZjfService.exportZJFDetail(list,ProjectChbZjf.class, "折旧费详情");
 	 }
 

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

@@ -60,7 +60,14 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 	 @ApiOperation(value="项目成本——导出专用费详情excel")
 	 @RequestMapping(value = "/exportZYFDetail")
 	 public ModelAndView exportZYFDetail(String tasknos) {
-		 //List<ProjectChbZyf> list = getZYFDetailList(taskno);
+		 List<ProjectChbZyf> list = getZYFDetailList(tasknos);
+		 return projectChbZyfService.exportZYFDetail(list,ProjectChbZyf.class, "专用费详情");
+	 }
+
+
+	 @ApiOperation(value="项目成本——导出专用费详情excel(汇总级)")
+	 @RequestMapping(value = "/exportZYFDetailByTasknos")
+	 public ModelAndView exportZYFDetailByTasknos(String tasknos) {
 		 List<ProjectChbZyf> list = getZYFDetailListBYTasknos(tasknos);
 		 return projectChbZyfService.exportZYFDetail(list,ProjectChbZyf.class, "专用费详情");
 	 }