项目成本预算执行加上费用详情

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

@@ -284,4 +284,80 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 		 return Result.OK(comContractInfoExchangeNewService.getCrmYskDetailByTasknos(Arrays.asList(taskno.split(","))));
 	 }
 
+
+	 /**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: "预算执行"时 的 合同额详情  根据时间范围查询(签署日期)
+	 *   date: 2024/7/18
+	 */
+	 @ApiOperation(value="预算执行——合同额的详情列表", notes="预算执行——合同额的详情列表")
+	 @GetMapping(value = "/getNewCrmHteDetailByTasknoYs")
+	 public Result<IPage<ComContractInfoExchangeNewHTEVO>> getNewCrmHteDetailByTasknoYs(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																					   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																					   HttpServletRequest req,
+																					   @RequestParam(name = "taskno") String tasknos,
+																					   @RequestParam(name = "beginDate") String beginDate,
+																					   @RequestParam(name = "endDate") String endDate){
+
+		 Page<ComContractInfoExchangeNewHTEVO> page = new Page<ComContractInfoExchangeNewHTEVO>(pageNo, pageSize);
+		 List<ComContractInfoExchangeNewHTEVO> list = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknoYs(page, Arrays.asList(tasknos.split(",")), beginDate,endDate);
+		 page.setRecords(list);
+		 return Result.OK(page);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 已收款详情  根据时间范围查询(到款日期/汇票到期日期)
+	  *   date: 2024/7/18
+	  */
+	 @ApiOperation(value="预算执行——已收款的详情列表", notes="预算执行——已收款的详情列表")
+	 @GetMapping(value = "/getNewCrmYskDetailByTasknoYs")
+	 public Result<IPage<ComContractInfoExchangeNewYSKVO>> getNewCrmYskDetailByTasknoYs(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																						@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																						HttpServletRequest req,
+																						@RequestParam(name = "taskno") String tasknos,
+																						@RequestParam(name = "beginDate") String beginDate,
+																						@RequestParam(name = "endDate") String endDate){
+
+		 Page<ComContractInfoExchangeNewYSKVO> page = new Page<ComContractInfoExchangeNewYSKVO>(pageNo, pageSize);
+		 List<ComContractInfoExchangeNewYSKVO> list = comContractInfoExchangeNewService.getNewCrmYskDetailByTasknoYs(page, Arrays.asList(tasknos.split(",")), beginDate,endDate);
+		 page.setRecords(list);
+		 return Result.OK(page);
+	 }
+
+	 /**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: "预算执行"时 的 合同额总金额  根据时间范围查询(签署日期)
+	 *   date: 2024/7/22
+	 */
+	 @ApiOperation(value="预算执行——合同额总金额", notes="预算执行——合同额总金额")
+	 @GetMapping(value = "/getNewCrmSumHteByTasknoYs")
+	 public Result<String> getNewCrmSumHteByTasknoYs(@RequestParam(name = "taskno") String tasknos,
+													 @RequestParam(name = "beginDate") String beginDate,
+													 @RequestParam(name = "endDate") String endDate){
+		 String total = comContractInfoExchangeNewService.getNewCrmSumHteByTasknoYs(Arrays.asList(tasknos.split(",")), beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 已收款总金额  根据时间范围查询(签署日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行——已收款总金额", notes="预算执行——已收款总金额")
+	 @GetMapping(value = "/getNewCrmSumYskByTasknoYs")
+	 public Result<String> getNewCrmSumYskByTasknoYs(@RequestParam(name = "taskno") String tasknos,
+													 @RequestParam(name = "beginDate") String beginDate,
+													 @RequestParam(name = "endDate") String endDate){
+		 String total = comContractInfoExchangeNewService.getNewCrmSumYskByTasknoYs(Arrays.asList(tasknos.split(",")), beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
+
 }

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

@@ -131,4 +131,12 @@ public interface ComContractInfoExchangeNewMapper extends BaseMapper<ComContract
     List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(@Param("tasknoList") List<String> tasknoList);
 
     List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(@Param("tasknoList") List<String> tasknoList);
+
+    List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknoYs(Page<ComContractInfoExchangeNewHTEVO> page,@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetailByTasknoYs(Page<ComContractInfoExchangeNewYSKVO> page,@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getNewCrmSumHteByTasknoYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getNewCrmSumYskByTasknoYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -525,4 +525,53 @@
         </foreach>
     </select>
 
+
+    <select id="getNewCrmHteDetailByTasknoYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and qsrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and qsrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+
+    <select id="getNewCrmYskDetailByTasknoYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and dkhpdqrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and dkhpdqrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getNewCrmSumHteByTasknoYs" resultType="java.lang.String">
+        select IFNULL(sum(rwyingsk),0)
+        from com_contract_info_exchange_new
+        where sjly = 20 and rwbh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and qsrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and qsrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getNewCrmSumYskByTasknoYs" resultType="java.lang.String">
+        select IFNULL(sum(rwskje),0)
+        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>
+        <if test="beginDate != null  and beginDate != ''">and dkhpdqrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and dkhpdqrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.comContractInfoExchangeNew.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNew;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -63,4 +64,12 @@ public interface IComContractInfoExchangeNewService extends IService<ComContract
     List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknos(List<String> tasknoList);
 
     List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(List<String> tasknoList);
+
+    List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknoYs(Page<ComContractInfoExchangeNewHTEVO> page,List<String> tasknoList, String beginDate, String endDate);
+
+    List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetailByTasknoYs(Page<ComContractInfoExchangeNewYSKVO> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getNewCrmSumHteByTasknoYs(List<String> tasknoList, String beginDate, String endDate);
+
+    String getNewCrmSumYskByTasknoYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -130,4 +131,24 @@ public class ComContractInfoExchangeNewServiceImpl extends ServiceImpl<ComContra
     public List<ComContractInfoExchangeNewYSKVO> getCrmYskDetailByTasknos(List<String> tasknoList) {
         return exchangeNewMapper.getCrmYskDetailByTasknos(tasknoList);
     }
+
+    @Override
+    public List<ComContractInfoExchangeNewHTEVO> getNewCrmHteDetailByTasknoYs(Page<ComContractInfoExchangeNewHTEVO> page,List<String> tasknoList, String beginDate, String endDate) {
+        return exchangeNewMapper.getNewCrmHteDetailByTasknoYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public List<ComContractInfoExchangeNewYSKVO> getNewCrmYskDetailByTasknoYs(Page<ComContractInfoExchangeNewYSKVO> page,List<String> tasknoList, String beginDate, String endDate) {
+        return exchangeNewMapper.getNewCrmYskDetailByTasknoYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getNewCrmSumHteByTasknoYs(List<String> tasknoList, String beginDate, String endDate) {
+        return exchangeNewMapper.getNewCrmSumHteByTasknoYs(tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getNewCrmSumYskByTasknoYs(List<String> tasknoList, String beginDate, String endDate) {
+        return exchangeNewMapper.getNewCrmSumYskByTasknoYs(tasknoList, beginDate, endDate);
+    }
 }

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

@@ -192,4 +192,41 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
         return super.importExcel(request, response, ProjectChbGlf.class);
     }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 管理费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-管理费详情", notes="预算执行-管理费详情")
+	 @GetMapping(value = "/getGLFListByTasknosYs")
+	 public Result<IPage<ProjectChbGlf>> getGLFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbGlf> page = new Page<ProjectChbGlf>(pageNo, pageSize);
+		 List<ProjectChbGlf> pageList = kzksProjectChbGlfService.getGLFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 管理费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-管理费总金额", notes="预算执行-管理费总金额")
+	 @GetMapping(value = "/getTotalGLFByTasknosYs")
+	 public Result<String> getTotalGLFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = kzksProjectChbGlfService.getTotalGLFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -41,4 +41,8 @@ public interface KzksProjectChbGlfMapper extends BaseMapper<ProjectChbGlf> {
 
     List<ProjectChbGlf> getGLFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbGlf> getGLFListByTasknosYs(Page<ProjectChbGlf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalGLFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -43,4 +43,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getGLFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalGLFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_glf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbGlf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
@@ -25,4 +26,8 @@ public interface IKzksProjectChbGlfService extends IService<ProjectChbGlf> {
 
     List<ProjectChbGlf> getGLFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbGlf> getGLFListByTasknosYs(Page<ProjectChbGlf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalGLFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbGlf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbGlf.entity.ProjectChbGlf;
@@ -77,4 +78,14 @@ public class KzksProjectChbGlfServiceImpl extends ServiceImpl<KzksProjectChbGlfM
     public List<ProjectChbZyfExpoet> getGLFDetailListByTasknos1(List<String> tasknoList) {
         return glfMapper.getGLFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbGlf> getGLFListByTasknosYs(Page<ProjectChbGlf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return glfMapper.getGLFListByTasknosYs(page,tasknoList,beginDate,endDate);
+    }
+
+    @Override
+    public String getTotalGLFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return glfMapper.getTotalGLFByTasknosYs(tasknoList,beginDate,endDate);
+    }
 }

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

@@ -191,4 +191,40 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
         return super.importExcel(request, response, ProjectChbRdf.class);
     }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 燃动费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-燃动费详情", notes="预算执行-燃动费详情")
+	 @GetMapping(value = "/getRDFListByTasknosYs")
+	 public Result<IPage<ProjectChbRdf>> getRDFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbRdf> page = new Page<ProjectChbRdf>(pageNo, pageSize);
+		 List<ProjectChbRdf> pageList = kzksProjectChbRdfService.getRDFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 燃动费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-燃动费总金额", notes="预算执行-燃动费总金额")
+	 @GetMapping(value = "/getTotalRDFByTasknosYs")
+	 public Result<String> getTotalRDFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = kzksProjectChbRdfService.getTotalRDFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
 }

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

@@ -41,4 +41,8 @@ public interface KzksProjectChbRdfMapper extends BaseMapper<ProjectChbRdf> {
 
     List<ProjectChbRdf> getRDFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbRdf> getRDFListByTasknosYs(Page<ProjectChbRdf> page,@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalRDFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -43,4 +43,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getRDFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalRDFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_rdf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRdf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbSwf.entity.ProjectChbSwf;
@@ -26,4 +27,8 @@ public interface IKzksProjectChbRdfService extends IService<ProjectChbRdf> {
 
     List<ProjectChbRdf> getRDFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbRdf> getRDFListByTasknosYs(Page<ProjectChbRdf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalRDFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRdf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbRdf.entity.ProjectChbRdf;
@@ -77,4 +78,14 @@ public class KzksProjectChbRdfServiceImpl extends ServiceImpl<KzksProjectChbRdfM
     public List<ProjectChbZyfExpoet> getRDFDetailListByTasknos1(List<String> tasknoList) {
         return rdfMapper.getRDFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbRdf> getRDFListByTasknosYs(Page<ProjectChbRdf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return rdfMapper.getRDFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalRDFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return rdfMapper.getTotalRDFByTasknosYs(tasknoList, beginDate,endDate);
+    }
 }

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

@@ -191,4 +191,40 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
         return super.importExcel(request, response, ProjectChbRgf.class);
     }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 人工费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-人工费详情", notes="预算执行-人工费详情")
+	 @GetMapping(value = "/getRGFListByTasknosYs")
+	 public Result<IPage<ProjectChbRgf>> getRGFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbRgf> page = new Page<ProjectChbRgf>(pageNo, pageSize);
+		 List<ProjectChbRgf> pageList = kzksProjectChbRgfService.getRGFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 人工费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-人工费总金额", notes="预算执行-人工费总金额")
+	 @GetMapping(value = "/getTotalRGFByTasknosYs")
+	 public Result<String> getTotalRGFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = kzksProjectChbRgfService.getTotalRGFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -41,4 +41,8 @@ public interface KzksProjectChbRgfMapper extends BaseMapper<ProjectChbRgf> {
 
     List<ProjectChbRgf> getRGFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbRgf> getRGFListByTasknosYs(Page<ProjectChbRgf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalRGFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -43,4 +43,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getRGFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalRGFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_rgf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRgf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
@@ -25,4 +26,8 @@ public interface IKzksProjectChbRgfService extends IService<ProjectChbRgf> {
 
     List<ProjectChbRgf> getRGFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbRgf> getRGFListByTasknosYs(Page<ProjectChbRgf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalRGFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbRgf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbRgf.entity.ProjectChbRgf;
@@ -77,4 +78,14 @@ public class KzksProjectChbRgfServiceImpl extends ServiceImpl<KzksProjectChbRgfM
     public List<ProjectChbZyfExpoet> getRGFDetailListByTasknos1(List<String> tasknoList) {
         return rgfMapper.getRGFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbRgf> getRGFListByTasknosYs(Page<ProjectChbRgf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return rgfMapper.getRGFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalRGFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return rgfMapper.getTotalRGFByTasknosYs(tasknoList, beginDate, endDate);
+    }
 }

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

@@ -194,4 +194,40 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
         return super.importExcel(request, response, ProjectChbSwf.class);
     }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 事务费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-事务费详情", notes="预算执行-事务费详情")
+	 @GetMapping(value = "/getSWFListByTasknosYs")
+	 public Result<IPage<ProjectChbSwf>> getSWFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbSwf> page = new Page<ProjectChbSwf>(pageNo, pageSize);
+		 List<ProjectChbSwf> pageList = projectChbSwfService.getSWFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 事务费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-事务费总金额", notes="预算执行-事务费总金额")
+	 @GetMapping(value = "/getTotalSWFByTasknosYs")
+	 public Result<String> getTotalSWFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = projectChbSwfService.getTotalSWFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -56,4 +56,8 @@ public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
 
     List<ProjectChbSwf> getSWFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbSwf> getSWFListByTasknosYs(Page<ProjectChbSwf> page,@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalSWFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -65,4 +65,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getSWFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalSWFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_swf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbSwf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -62,4 +63,9 @@ public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
 
     List<ProjectChbSwf> getSWFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbSwf> getSWFListByTasknosYs(Page<ProjectChbSwf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalSWFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
+
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbSwf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -181,4 +182,14 @@ public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, P
     public List<ProjectChbZyfExpoet> getSWFDetailListByTasknos1(List<String> tasknoList) {
         return swfMapper.getSWFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbSwf> getSWFListByTasknosYs(Page<ProjectChbSwf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return swfMapper.getSWFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalSWFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return swfMapper.getTotalSWFByTasknosYs(tasknoList, beginDate, endDate);
+    }
 }

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

@@ -207,4 +207,40 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
         return super.importExcel(request, response, ProjectChbSxf.class);
     }
 
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 筛选费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-筛选费详情", notes="预算执行-筛选费详情")
+	 @GetMapping(value = "/getSXFListByTasknosYs")
+	 public Result<IPage<ProjectChbSxf>> getSXFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbSxf> page = new Page<ProjectChbSxf>(pageNo, pageSize);
+		 List<ProjectChbSxf> pageList = projectChbSxfService.getSXFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 筛选费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-筛选费总金额", notes="预算执行-筛选费总金额")
+	 @GetMapping(value = "/getTotalSXFByTasknosYs")
+	 public Result<String> getTotalSXFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = projectChbSxfService.getTotalSXFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -40,4 +40,8 @@ public interface ProjectChbSxfMapper extends BaseMapper<ProjectChbSxf> {
 
     List<ProjectChbSxf> getSXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbSxf> getSXFListByTasknosYs(Page<ProjectChbSxf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalSXFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -43,4 +43,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getSXFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalSXFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_sxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbSxf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
@@ -25,4 +26,8 @@ public interface IProjectChbSxfService extends IService<ProjectChbSxf> {
 
     List<ProjectChbSxf> getSXFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbSxf> getSXFListByTasknosYs(Page<ProjectChbSxf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalSXFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbSxf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbSxf.entity.ProjectChbSxf;
@@ -76,4 +77,14 @@ public class ProjectChbSxfServiceImpl extends ServiceImpl<ProjectChbSxfMapper, P
     public List<ProjectChbZyfExpoet> getSXFDetailListByTasknos1(List<String> tasknoList) {
         return sxfMapper.getSXFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbSxf> getSXFListByTasknosYs(Page<ProjectChbSxf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return sxfMapper.getSXFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalSXFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return sxfMapper.getTotalSXFByTasknosYs(tasknoList,beginDate, endDate);
+    }
 }

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

@@ -194,4 +194,40 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
         return super.importExcel(request, response, ProjectChbWxf.class);
     }
 
+
+	/**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: "预算执行"时 的 外协费详情  根据时间范围查询(凭证日期)
+	 *   date: 2024/7/22
+	 */
+	@ApiOperation(value="预算执行-外协费详情", notes="预算执行-外协费详情")
+	@GetMapping(value = "/getWXFListByTasknosYs")
+	public Result<IPage<ProjectChbWxf>> getWXFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															HttpServletRequest req,
+															@RequestParam(name = "taskno") String tasknos,
+															@RequestParam(name = "beginDate") String beginDate,
+															@RequestParam(name = "endDate") String endDate) {
+		Page<ProjectChbWxf> page = new Page<ProjectChbWxf>(pageNo, pageSize);
+		List<ProjectChbWxf> pageList = projectChbWxfService.getWXFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		page.setRecords(pageList);
+		return Result.OK(page);
+	}
+
+
+	/**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: "预算执行"时 的 外协费总金额  根据时间范围查询(凭证日期)
+	 *   date: 2024/7/22
+	 */
+	@ApiOperation(value="预算执行-外协费总金额", notes="预算执行-外协费总金额")
+	@GetMapping(value = "/getTotalWXFByTasknosYs")
+	public Result<String> getTotalWXFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												 @RequestParam(name = "beginDate") String beginDate,
+												 @RequestParam(name = "endDate") String endDate) {
+		String total = projectChbWxfService.getTotalWXFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		return Result.OK(total);
+	}
 }

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

@@ -58,4 +58,8 @@ public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
 
     List<ProjectChbWxf> getWXFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbWxf> getWXFListByTasknosYs(Page<ProjectChbWxf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalWXFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -66,4 +66,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getWXFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalWXFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_wxf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbWxf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbWxf.entity.ProjectChbWxf;
@@ -56,4 +57,8 @@ public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
 
     List<ProjectChbWxf> getWXFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbWxf> getWXFListByTasknosYs(Page<ProjectChbWxf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalWXFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbWxf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -176,4 +177,14 @@ public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, P
     public List<ProjectChbZyfExpoet> getWXFDetailListByTasknos1(List<String> tasknoList) {
         return wxfMapper.getWXFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbWxf> getWXFListByTasknosYs(Page<ProjectChbWxf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return wxfMapper.getWXFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalWXFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return wxfMapper.getTotalWXFByTasknosYs(tasknoList, beginDate, endDate);
+    }
 }

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

@@ -191,4 +191,40 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
         return super.importExcel(request, response, ProjectChbZjf.class);
     }
 
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 折旧费详情  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-折旧费详情", notes="预算执行-折旧费详情")
+	 @GetMapping(value = "/getZJFListByTasknosYs")
+	 public Result<IPage<ProjectChbZjf>> getZJFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															 HttpServletRequest req,
+															 @RequestParam(name = "taskno") String tasknos,
+															 @RequestParam(name = "beginDate") String beginDate,
+															 @RequestParam(name = "endDate") String endDate) {
+		 Page<ProjectChbZjf> page = new Page<ProjectChbZjf>(pageNo, pageSize);
+		 List<ProjectChbZjf> pageList = kzksProjectChbZjfService.getZJFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 折旧费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-折旧费总金额", notes="预算执行-折旧费总金额")
+	 @GetMapping(value = "/getTotalZJFByTasknosYs")
+	 public Result<String> getTotalZJFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = kzksProjectChbZjfService.getTotalZJFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -40,4 +40,8 @@ public interface KzksProjectChbZjfMapper extends BaseMapper<ProjectChbZjf> {
 
     List<ProjectChbZjf> getZJFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<ProjectChbZjf> getZJFListByTasknosYs(Page<ProjectChbZjf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalZJFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -43,4 +43,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getZJFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalZJFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_zjf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbZjf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyfExpoet;
@@ -25,4 +26,8 @@ public interface IKzksProjectChbZjfService extends IService<ProjectChbZjf> {
 
     List<ProjectChbZjf> getZJFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbZjf> getZJFListByTasknosYs(Page<ProjectChbZjf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalZJFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbZjf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.projectChbZjf.entity.ProjectChbZjf;
@@ -75,4 +76,14 @@ public class KzksProjectChbZjfServiceImpl extends ServiceImpl<KzksProjectChbZjfM
     public List<ProjectChbZyfExpoet> getZJFDetailListByTasknos1(List<String> tasknoList) {
         return zjfMapper.getZJFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZjf> getZJFListByTasknosYs(Page<ProjectChbZjf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return zjfMapper.getZJFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalZJFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return zjfMapper.getTotalZJFByTasknosYs(tasknoList, beginDate, endDate);
+    }
 }

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

@@ -211,4 +211,39 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
         return super.importExcel(request, response, ProjectChbZyf.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: "预算执行"时 的 专用费详情  根据时间范围查询(凭证日期)
+    *   date: 2024/7/22
+    */
+	@ApiOperation(value="预算执行-专用费详情", notes="预算执行-专用费详情")
+	@GetMapping(value = "/getZYFListByTasknosYs")
+	public Result<IPage<ProjectChbZyf>> getZYFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															HttpServletRequest req,
+															@RequestParam(name = "taskno") String tasknos,
+															@RequestParam(name = "beginDate") String beginDate,
+															@RequestParam(name = "endDate") String endDate) {
+		Page<ProjectChbZyf> page = new Page<ProjectChbZyf>(pageNo, pageSize);
+		List<ProjectChbZyf> pageList = projectChbZyfService.getZYFListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		page.setRecords(pageList);
+		return Result.OK(page);
+	}
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 专用费总金额  根据时间范围查询(凭证日期)
+	  *   date: 2024/7/22
+	  */
+	 @ApiOperation(value="预算执行-专用费总金额", notes="预算执行-专用费总金额")
+	 @GetMapping(value = "/getTotalZYFByTasknosYs")
+	 public Result<String> getTotalZYFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+		 String total = projectChbZyfService.getTotalZYFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
 }

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

@@ -59,4 +59,7 @@ public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
     List<ProjectChbZyf> getZYFDetailListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(@Param("tasknoList") List<String> tasknoList);
 
+    List<ProjectChbZyf> getZYFListByTasknosYs(Page<ProjectChbZyf> page, @Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalZYFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -66,4 +66,24 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getZYFListByTasknosYs" 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>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalZYFByTasknosYs" resultType="java.lang.String">
+        SELECT IFNULL(sum(fzje),0) FROM kzks_project_chb_zyf
+        where taskno in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and pzrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and pzrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbZyf.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.projectChbZyf.entity.ProjectChbZyf;
@@ -58,4 +59,8 @@ public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
 
     List<ProjectChbZyf> getZYFDetailListByTasknos(List<String> tasknoList);
     List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(List<String> tasknoList);
+
+    List<ProjectChbZyf> getZYFListByTasknosYs(Page<ProjectChbZyf> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalZYFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectChbZyf.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Select;
 import org.apache.shiro.SecurityUtils;
@@ -179,4 +180,14 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
     public List<ProjectChbZyfExpoet> getZYFDetailListByTasknos1(List<String> tasknoList) {
         return zyfMapper.getZYFDetailListByTasknos1(tasknoList);
     }
+
+    @Override
+    public List<ProjectChbZyf> getZYFListByTasknosYs(Page<ProjectChbZyf> page, List<String> tasknoList, String beginDate, String endDate) {
+        return zyfMapper.getZYFListByTasknosYs(page, tasknoList, beginDate, endDate);
+    }
+
+    @Override
+    public String getTotalZYFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return zyfMapper.getTotalZYFByTasknosYs(tasknoList, beginDate, endDate);
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/controller/WzOutboundOrderBNewController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.comContractInfoExchangeNew.entity.ComContractInfoExchangeNewYSKVO;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
 import org.jeecg.modules.wzOutboundOrderBNew.service.IWzOutboundOrderBNewService;
 
@@ -174,4 +175,42 @@ public class WzOutboundOrderBNewController extends JeecgController<WzOutboundOrd
         return super.importExcel(request, response, WzOutboundOrderBNew.class);
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: "预算执行"时 的 材料费详情  根据时间范围查询(制单日期)
+    *   date: 2024/7/19
+    */
+	 @ApiOperation(value = "预算执行——材料费详情", notes = "预算执行——材料费详情")
+	 @GetMapping(value = "/getCLFListByTasknosYs")
+	 public Result<IPage<WzOutboundOrderBNew>> getCLFListByTasknos(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                   HttpServletRequest req,
+                                                                   @RequestParam(name = "taskno") String tasknos,
+                                                                   @RequestParam(name = "beginDate") String beginDate,
+                                                                   @RequestParam(name = "endDate") String endDate) {
+
+         Page<WzOutboundOrderBNew> page = new Page<WzOutboundOrderBNew>(pageNo, pageSize);
+         List<WzOutboundOrderBNew> list = wzOutboundOrderBNewService.getClfListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
+         page.setRecords(list);
+	     return Result.OK(page);
+	 }
+
+
+	 /**
+	  *   author: dzc
+	  *   version: 1.0
+	  *   des: "预算执行"时 的 材料费总金额  根据时间范围查询(制单日期)
+	  *   date: 2024/7/19
+	  */
+	 @ApiOperation(value = "预算执行——材料费总金额", notes = "预算执行——材料费总金额")
+	 @GetMapping(value = "/getTotalCLFByTasknosYs")
+	 public Result<String> getTotalCLFByTasknosYs(@RequestParam(name = "taskno") String tasknos,
+												  @RequestParam(name = "beginDate") String beginDate,
+												  @RequestParam(name = "endDate") String endDate) {
+
+		 String total = wzOutboundOrderBNewService.getTotalCLFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
+		 return Result.OK(total);
+	 }
+
 }

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

@@ -52,4 +52,8 @@ public interface WzOutboundOrderBNewMapper extends BaseMapper<WzOutboundOrderBNe
 
     List<WzOutboundOrderBNew> getClfListByTasknos(@Param("tasknoList") List<String> tasknoList);
     List<WzOutboundOrderBNewExport> getClfListByTasknos1(@Param("tasknoList") List<String> tasknoList);
+
+    List<WzOutboundOrderBNew> getClfListByTasknosYs(Page<WzOutboundOrderBNew> page,@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
+
+    String getTotalCLFByTasknosYs(@Param("tasknoList") List<String> tasknoList,@Param("beginDate") String beginDate,@Param("endDate") String endDate);
 }

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

@@ -135,4 +135,26 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getClfListByTasknosYs" resultType="org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew">
+        select *
+        from wz_outbound_order_b_new
+        where tcrwh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and zdrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and zdrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
+
+    <select id="getTotalCLFByTasknosYs" resultType="java.lang.String">
+        select IFNULL(sum(je),0)
+        from wz_outbound_order_b_new
+        where tcrwh in
+        <foreach item='item' index='index' collection='tasknoList' open='(' separator=',' close=')'>
+            #{item}
+        </foreach>
+        <if test="beginDate != null  and beginDate != ''">and zdrq >= #{beginDate}</if>
+        <if test="endDate != null  and endDate != ''">and zdrq <![CDATA[ <= ]]> #{endDate}</if>
+    </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/service/IWzOutboundOrderBNewService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wzOutboundOrderBNew.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -26,4 +27,7 @@ public interface IWzOutboundOrderBNewService extends IService<WzOutboundOrderBNe
 
     ModelAndView exportZcbDetail(List<String> tasknoList, HttpServletRequest request);
 
+    List<WzOutboundOrderBNew> getClfListByTasknosYs(Page<WzOutboundOrderBNew> page, List<String> tasknoList, String beginDate, String endDate);
+
+    String getTotalCLFByTasknosYs(List<String> tasknoList, String beginDate, String endDate);
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/service/impl/WzOutboundOrderBNewServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.cache.MapCache;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -350,4 +351,15 @@ public class WzOutboundOrderBNewServiceImpl extends ServiceImpl<WzOutboundOrderB
 
         return mv;
     }
+
+
+    @Override
+    public List<WzOutboundOrderBNew> getClfListByTasknosYs(Page<WzOutboundOrderBNew> page, List<String> tasknoList, String beginDate, String endDate) {
+        return orderBNewMapper.getClfListByTasknosYs(page,tasknoList,beginDate,endDate);
+    }
+
+    @Override
+    public String getTotalCLFByTasknosYs(List<String> tasknoList, String beginDate, String endDate) {
+        return orderBNewMapper.getTotalCLFByTasknosYs(tasknoList,beginDate,endDate);
+    }
 }