预算执行时间范围改成非必填

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

@@ -297,8 +297,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 																					   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																					   HttpServletRequest req,
 																					   @RequestParam(name = "taskno") String tasknos,
-																					   @RequestParam(name = "beginDate") String beginDate,
-																					   @RequestParam(name = "endDate") String endDate){
+																					   @RequestParam(name = "beginDate",required=false) String beginDate,
+																					   @RequestParam(name = "endDate",required=false) String endDate){
 
 		 Page<ComContractInfoExchangeNewHTEVO> page = new Page<ComContractInfoExchangeNewHTEVO>(pageNo, pageSize);
 		 List<ComContractInfoExchangeNewHTEVO> list = comContractInfoExchangeNewService.getNewCrmHteDetailByTasknoYs(page, Arrays.asList(tasknos.split(",")), beginDate,endDate);
@@ -319,8 +319,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 																						@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																						HttpServletRequest req,
 																						@RequestParam(name = "taskno") String tasknos,
-																						@RequestParam(name = "beginDate") String beginDate,
-																						@RequestParam(name = "endDate") String endDate){
+																						@RequestParam(name = "beginDate",required=false) String beginDate,
+																						@RequestParam(name = "endDate",required=false) String endDate){
 
 		 Page<ComContractInfoExchangeNewYSKVO> page = new Page<ComContractInfoExchangeNewYSKVO>(pageNo, pageSize);
 		 List<ComContractInfoExchangeNewYSKVO> list = comContractInfoExchangeNewService.getNewCrmYskDetailByTasknoYs(page, Arrays.asList(tasknos.split(",")), beginDate,endDate);
@@ -337,8 +337,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	 @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){
+													 @RequestParam(name = "beginDate",required=false) String beginDate,
+													 @RequestParam(name = "endDate",required=false) String endDate){
 		 String total = comContractInfoExchangeNewService.getNewCrmSumHteByTasknoYs(Arrays.asList(tasknos.split(",")), beginDate,endDate);
 		 return Result.OK(total);
 	 }
@@ -353,8 +353,8 @@ public class ComContractInfoExchangeNewController extends JeecgController<ComCon
 	 @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){
+													 @RequestParam(name = "beginDate",required=false) String beginDate,
+													 @RequestParam(name = "endDate",required=false) String endDate){
 		 String total = comContractInfoExchangeNewService.getNewCrmSumYskByTasknoYs(Arrays.asList(tasknos.split(",")), beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -205,8 +205,8 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -223,8 +223,8 @@ public class KzksProjectChbGlfController extends JeecgController<ProjectChbGlf,
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = kzksProjectChbGlfService.getTotalGLFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -204,8 +204,8 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -222,8 +222,8 @@ public class KzksProjectChbRdfController extends JeecgController<ProjectChbRdf,
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = kzksProjectChbRdfService.getTotalRDFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -204,8 +204,8 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -221,8 +221,8 @@ public class KzksProjectChbRgfController extends JeecgController<ProjectChbRgf,
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = kzksProjectChbRgfService.getTotalRGFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -207,8 +207,8 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -224,8 +224,8 @@ public class ProjectChbSwfController extends JeecgController<ProjectChbSwf, IPro
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = projectChbSwfService.getTotalSWFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -220,8 +220,8 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -237,8 +237,8 @@ public class ProjectChbSxfController extends JeecgController<ProjectChbSxf, IPro
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = projectChbSxfService.getTotalSXFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -207,8 +207,8 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															HttpServletRequest req,
 															@RequestParam(name = "taskno") String tasknos,
-															@RequestParam(name = "beginDate") String beginDate,
-															@RequestParam(name = "endDate") String endDate) {
+															@RequestParam(name = "beginDate",required=false) String beginDate,
+															@RequestParam(name = "endDate",required=false) 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);
@@ -225,8 +225,8 @@ public class ProjectChbWxfController extends JeecgController<ProjectChbWxf, IPro
 	@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) {
+												 @RequestParam(name = "beginDate",required=false) String beginDate,
+												 @RequestParam(name = "endDate",required=false) String endDate) {
 		String total = projectChbWxfService.getTotalWXFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		return Result.OK(total);
 	}

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

@@ -203,8 +203,8 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															 HttpServletRequest req,
 															 @RequestParam(name = "taskno") String tasknos,
-															 @RequestParam(name = "beginDate") String beginDate,
-															 @RequestParam(name = "endDate") String endDate) {
+															 @RequestParam(name = "beginDate",required=false) String beginDate,
+															 @RequestParam(name = "endDate",required=false) 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);
@@ -221,8 +221,8 @@ public class KzksProjectChbZjfController extends JeecgController<ProjectChbZjf,
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = kzksProjectChbZjfService.getTotalZJFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -223,8 +223,8 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 															HttpServletRequest req,
 															@RequestParam(name = "taskno") String tasknos,
-															@RequestParam(name = "beginDate") String beginDate,
-															@RequestParam(name = "endDate") String endDate) {
+															@RequestParam(name = "beginDate",required=false) String beginDate,
+															@RequestParam(name = "endDate",required=false) 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);
@@ -241,8 +241,8 @@ public class ProjectChbZyfController extends JeecgController<ProjectChbZyf, IPro
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 		 String total = projectChbZyfService.getTotalZYFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);
 	 }

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

@@ -187,8 +187,8 @@ public class WzOutboundOrderBNewController extends JeecgController<WzOutboundOrd
                                                                    @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                                    HttpServletRequest req,
                                                                    @RequestParam(name = "taskno") String tasknos,
-                                                                   @RequestParam(name = "beginDate") String beginDate,
-                                                                   @RequestParam(name = "endDate") String endDate) {
+                                                                   @RequestParam(name = "beginDate",required=false) String beginDate,
+                                                                   @RequestParam(name = "endDate",required=false) String endDate) {
 
          Page<WzOutboundOrderBNew> page = new Page<WzOutboundOrderBNew>(pageNo, pageSize);
          List<WzOutboundOrderBNew> list = wzOutboundOrderBNewService.getClfListByTasknosYs(page,Arrays.asList(tasknos.split(",")),beginDate,endDate);
@@ -206,8 +206,8 @@ public class WzOutboundOrderBNewController extends JeecgController<WzOutboundOrd
 	 @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) {
+												  @RequestParam(name = "beginDate",required=false) String beginDate,
+												  @RequestParam(name = "endDate",required=false) String endDate) {
 
 		 String total = wzOutboundOrderBNewService.getTotalCLFByTasknosYs(Arrays.asList(tasknos.split(",")),beginDate,endDate);
 		 return Result.OK(total);