diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationTravelAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationTravelAuditController.java index 37c0abe..b587eca 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationTravelAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationTravelAuditController.java @@ -65,11 +65,11 @@ public class TheRapyRecuperationTravelAuditController { @At @ViReturn public Object pageData(PageForm pageForm, - @Param(value = "agencyId", required = false) String agencyId, - @Param(value = "year", required = false) String year, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "unitId", required = false) String unitId, - @Param(value = "isAudit", required = false) String isAudit){ + @Param(value = "agencyId") String agencyId, + @Param(value = "year") String year, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "isAudit") String isAudit){ Sql sql = Sqls.create(""" SELECT enroll.*, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationXghAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationXghAuditController.java index e6f5577..c7142b2 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationXghAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationXghAuditController.java @@ -309,11 +309,11 @@ public class TheRapyRecuperationXghAuditController { @ViReturn @SaCheckLogin public Object getLinePlayTimeByLineId(String lineId, - @Param(value = "signUpMode",required = false) Integer signUpMode, - @Param(value = "year",required = false) Integer year, - @Param(value = "startYear",required = false)Integer startYear, - @Param(value = "endYear",required = false)Integer endYear, - @Param(value = "flag",required = false) Boolean flag) { + @Param(value = "signUpMode") Integer signUpMode, + @Param(value = "year") Integer year, + @Param(value = "startYear")Integer startYear, + @Param(value = "endYear")Integer endYear, + @Param(value = "flag") Boolean flag) { Cnd cnd = Cnd.NEW(); cnd.and("lineId", "=", lineId); if (flag == null || !flag){ diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationLineSelectionOverviewController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationLineSelectionOverviewController.java index 8955155..06a3976 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationLineSelectionOverviewController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationLineSelectionOverviewController.java @@ -88,12 +88,12 @@ public class TheRapyRecuperationLineSelectionOverviewController { @ViReturn @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") public Object pageData(PageForm pageForm, - @Param(value = "year", required = false) Integer year, - @Param(value = "keywords", required = false) String keywords, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "travelAgencyId", required = false) String travelAgencyId, - @Param(value = "regionalNature", required = false) String regionalNature) { + @Param(value = "year") Integer year, + @Param(value = "keywords") String keywords, + @Param(value = "unionId") String unionId, + @Param(value = "lotId") String lotId, + @Param(value = "travelAgencyId") String travelAgencyId, + @Param(value = "regionalNature") String regionalNature) { Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature); Pagination pagination = lineUnionSelectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), listSql); List rowList = pagination.getList(); @@ -136,12 +136,12 @@ public class TheRapyRecuperationLineSelectionOverviewController { @Ok("void") @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") public void doExportExcel(PageForm pageForm, - @Param(value = "year", required = false) Integer year, - @Param(value = "keywords", required = false) String keywords, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "travelAgencyId", required = false) String travelAgencyId, - @Param(value = "regionalNature", required = false) String regionalNature, + @Param(value = "year") Integer year, + @Param(value = "keywords") String keywords, + @Param(value = "unionId") String unionId, + @Param(value = "lotId") String lotId, + @Param(value = "travelAgencyId") String travelAgencyId, + @Param(value = "regionalNature") String regionalNature, HttpServletResponse response) throws IOException { Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature); List list = queryMapList(listSql); @@ -175,7 +175,7 @@ public class TheRapyRecuperationLineSelectionOverviewController { @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") public Object timeSlots(@Param("lineId") String lineId, @Param("unionId") String unionId, - @Param(value = "year", required = false) Integer year) { + @Param(value = "year") Integer year) { Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(unionId, "请选择分工会"); Sql sql = Sqls.create(""" @@ -255,7 +255,7 @@ public class TheRapyRecuperationLineSelectionOverviewController { public Object saveTimeSlots(@Param("lineUnionSelects") TheRapyRecuperationLineUnionSelect[] lineUnionSelects, @Param("lineId") String lineId, @Param("unionId") String unionId, - @Param(value = "year", required = false) Integer year) { + @Param(value = "year") Integer year) { Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(unionId, "请选择分工会"); lineUnionSelectService.adminSaveLineTimes(lineUnionSelects, lineId, unionId, year); @@ -277,7 +277,7 @@ public class TheRapyRecuperationLineSelectionOverviewController { @Aop(TransAop.READ_COMMITTED) public Object cancelLine(@Param("lineId") String lineId, @Param("unionId") String unionId, - @Param(value = "year", required = false) Integer year) { + @Param(value = "year") Integer year) { Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(unionId, "请选择分工会"); Integer queryYear = year == null ? DateUtil.thisYear() : year; @@ -336,7 +336,7 @@ public class TheRapyRecuperationLineSelectionOverviewController { @At @ViReturn @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") - public Object travelAgencyOptions(@Param(value = "year", required = false) Integer year) { + public Object travelAgencyOptions(@Param(value = "year") Integer year) { // 旅行社按年度维护,管理员查看页切换年度时下拉框只展示该年度可选旅行社。 return dao.query(TheRapyRecuperationTravelAgency.class, Cnd.where("year", "=", year == null ? DateUtil.thisYear() : year).asc("serialNumber")); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java index 4d2e31e..be0ba5b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java @@ -488,20 +488,20 @@ public class TheRapyRecuperationUserQueryController { @Ok("void") @ViReturn @SaCheckLogin - public void doExportViewExcel(@Param(value = "regionalNature", required = false) String regionalNature, - @Param(value = "state", required = false) Integer state, - @Param(value = "searchName", required = false) String searchName, - @Param(value = "searchKeyword", required = false) String searchKeyword, - @Param(value = "startYear", required = false) Integer startYear, - @Param(value = "endYear", required = false) Integer endYear, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "unitId", required = false) String unitId, - @Param(value = "takePartInLineId", required = false) String takePartInLineId, - @Param(value = "agencyId", required = false) String agencyId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, - @Param(value = "signUpMode", required = false) String signUpMode, - @Param(value = "isTakePartIn", required = false) Integer isTakePartIn, + public void doExportViewExcel(@Param(value = "regionalNature") String regionalNature, + @Param(value = "state") Integer state, + @Param(value = "searchName") String searchName, + @Param(value = "searchKeyword") String searchKeyword, + @Param(value = "startYear") Integer startYear, + @Param(value = "endYear") Integer endYear, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "takePartInLineId") String takePartInLineId, + @Param(value = "agencyId") String agencyId, + @Param(value = "lotId") String lotId, + @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId, + @Param(value = "signUpMode") String signUpMode, + @Param(value = "isTakePartIn") Integer isTakePartIn, HttpServletResponse response) throws IOException { Cnd cnd = Cnd.NEW(); @@ -720,21 +720,21 @@ public class TheRapyRecuperationUserQueryController { @Ok("void") @ViReturn @SaCheckLogin - public void doExportExcel(@Param(value = "regionalNature", required = false) String regionalNature, - @Param(value = "state", required = false) Integer state, - @Param(value = "searchName", required = false) String searchName, - @Param(value = "searchKeyword", required = false) String searchKeyword, - @Param(value = "startYear", required = false) Integer startYear, - @Param(value = "endYear", required = false) Integer endYear, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "unitId", required = false) String unitId, - @Param(value = "takePartInLineId", required = false) String takePartInLineId, - @Param(value = "agencyId", required = false) String agencyId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, - @Param(value = "signUpMode", required = false) String signUpMode, - @Param(value = "types", required = false) String[] types, - @Param(value = "satisfyPeople", required = false) Boolean satisfyPeople, + public void doExportExcel(@Param(value = "regionalNature") String regionalNature, + @Param(value = "state") Integer state, + @Param(value = "searchName") String searchName, + @Param(value = "searchKeyword") String searchKeyword, + @Param(value = "startYear") Integer startYear, + @Param(value = "endYear") Integer endYear, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "takePartInLineId") String takePartInLineId, + @Param(value = "agencyId") String agencyId, + @Param(value = "lotId") String lotId, + @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId, + @Param(value = "signUpMode") String signUpMode, + @Param(value = "types") String[] types, + @Param(value = "satisfyPeople") Boolean satisfyPeople, HttpServletResponse response) throws IOException { Cnd commonCnd = Cnd.NEW(); @@ -891,22 +891,22 @@ public class TheRapyRecuperationUserQueryController { @Ok("void") @ViReturn @SaCheckLogin - public void doExport(@Param(value = "regionalNature", required = false) String regionalNature, - @Param(value = "state", required = false) Integer state, - @Param(value = "searchName", required = false) String searchName, - @Param(value = "searchKeyword", required = false) String searchKeyword, - @Param(value = "startYear", required = false) Integer startYear, - @Param(value = "endYear", required = false) Integer endYear, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "unitId", required = false) String unitId, - @Param(value = "takePartInLineId", required = false) String takePartInLineId, - @Param(value = "agencyId", required = false) String agencyId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, - @Param(value = "signUpMode", required = false) String signUpMode, - @Param(value = "isTakePartIn", required = false) Integer isTakePartIn, - @Param(value = "types", required = false) String[] types, - @Param(value = "satisfyPeople", required = false) Boolean satisfyPeople, + public void doExport(@Param(value = "regionalNature") String regionalNature, + @Param(value = "state") Integer state, + @Param(value = "searchName") String searchName, + @Param(value = "searchKeyword") String searchKeyword, + @Param(value = "startYear") Integer startYear, + @Param(value = "endYear") Integer endYear, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "takePartInLineId") String takePartInLineId, + @Param(value = "agencyId") String agencyId, + @Param(value = "lotId") String lotId, + @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId, + @Param(value = "signUpMode") String signUpMode, + @Param(value = "isTakePartIn") Integer isTakePartIn, + @Param(value = "types") String[] types, + @Param(value = "satisfyPeople") Boolean satisfyPeople, HttpServletResponse response) throws IOException { response.setContentType("application/octet-stream"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java index 11e39c2..3f403ea 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java @@ -86,7 +86,7 @@ public class TheRapyRecuperationLineStatisticsController { @At("/unionLineNumberStatistics/pageData") @ViReturn @SaCheckPermission("inclusiveTherapyV3.unionLineNumberStatistics") - public Object unionLineNumberStatisticsPageData(@Param(value = "unionId", required = false) String unionId) { + public Object unionLineNumberStatisticsPageData(@Param(value = "unionId") String unionId) { TheRapyRecuperationConfig config = dao.fetch(TheRapyRecuperationConfig.class, Cnd.NEW()); List lineNumberConfigs = Optional.ofNullable(config) .map(TheRapyRecuperationConfig::getUnionLineNumberConfigs) @@ -177,16 +177,16 @@ public class TheRapyRecuperationLineStatisticsController { @ViReturn @SaCheckPermission("inclusiveTherapyV3.statistics") public Object pageData(PageForm pageForm, - @Param(value = "startYear", required = false) Integer startYear, - @Param(value = "endYear", required = false) Integer endYear, - @Param(value = "unionId", required = false) String unionId, + @Param(value = "startYear") Integer startYear, + @Param(value = "endYear") Integer endYear, + @Param(value = "unionId") String unionId, @Param("takePartInLineId") String takePartInLineId, - @Param(value = "lotId", required = false) String lotId, - @Param(value = "signUpMode", required = false) String signUpMode, - @Param(value = "selectId", required = false) String selectId, - @Param(value = "playMonth", required = false) String playMonth, - @Param(value = "regionalNature", required = false) String regionalNature, - @Param(value = "travelAgencyId", required = false) String travelAgencyId) { + @Param(value = "lotId") String lotId, + @Param(value = "signUpMode") String signUpMode, + @Param(value = "selectId") String selectId, + @Param(value = "playMonth") String playMonth, + @Param(value = "regionalNature") String regionalNature, + @Param(value = "travelAgencyId") String travelAgencyId) { Sql sql = Sqls.create(""" SELECT line.id, @@ -317,10 +317,10 @@ public class TheRapyRecuperationLineStatisticsController { @ViReturn @SaCheckPermission("inclusiveTherapyV3.statistics") public Object getUserDateByLine(PageForm pageForm, - @Param(value = "takePartLineId", required = false) String takePartLineId, - @Param(value = "searchKeyword", required = false) String searchKeyword, - @Param(value = "unionId", required = false) String unionId, - @Param(value = "unitId", required = false) String unitId) { + @Param(value = "takePartLineId") String takePartLineId, + @Param(value = "searchKeyword") String searchKeyword, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId) { Sql sql = Sqls.create(""" SELECT enroll.*, diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationTravelAgencyMonthlyStatisticsController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationTravelAgencyMonthlyStatisticsController.java index 32c082e..65ca90a 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationTravelAgencyMonthlyStatisticsController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationTravelAgencyMonthlyStatisticsController.java @@ -52,7 +52,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController { @At("/getChartData") @ViReturn @SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") - public Object getChartData(@Param(value = "year", required = false) Integer year) { + public Object getChartData(@Param(value = "year") Integer year) { Integer queryYear = year == null ? DateUtil.thisYear() : year; return enrollService.getTravelAgencyMonthlyEnrollStatistics(queryYear); } @@ -68,7 +68,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController { @At("/getUnionChartData") @ViReturn @SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") - public Object getUnionChartData(@Param(value = "year", required = false) Integer year) { + public Object getUnionChartData(@Param(value = "year") Integer year) { Integer queryYear = year == null ? DateUtil.thisYear() : year; List list = enrollService.getUnionEnrollStatistics(queryYear); return list; @@ -85,7 +85,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController { @At("/doExportExcel") @Ok("void") @SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") - public void doExportExcel(@Param(value = "year", required = false) Integer year, + public void doExportExcel(@Param(value = "year") Integer year, HttpServletResponse response) throws IOException { Integer queryYear = year == null ? DateUtil.thisYear() : year; NutMap exportData = enrollService.getTravelAgencyMonthlyEnrollExportData(queryYear); @@ -113,7 +113,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController { @At("/doExportUnionExcel") @Ok("void") @SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") - public void doExportUnionExcel(@Param(value = "year", required = false) Integer year, + public void doExportUnionExcel(@Param(value = "year") Integer year, HttpServletResponse response) throws IOException { Integer queryYear = year == null ? DateUtil.thisYear() : year; NutMap exportData = enrollService.getUnionEnrollExportData(queryYear);