c-chenxs1/zhgh_zjnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: v3版疗休养优化2

Browse Source
This commit is contained in:
c-chenxs1
2026-10-26 09:49:06 +08:00
parent 1a1946b1f8
commit 2d20959355
6 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationTravelAuditController.java
+5 -5
View File
@@ -65,11 +65,11 @@ public class TheRapyRecuperationTravelAuditController {
@At @At
@ViReturn @ViReturn
public Object pageData(PageForm pageForm, public Object pageData(PageForm pageForm,
@Param(value = "agencyId", required = false) String agencyId, @Param(value = "agencyId") String agencyId,
@Param(value = "year", required = false) String year, @Param(value = "year") String year,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId", required = false) String unitId, @Param(value = "unitId") String unitId,
@Param(value = "isAudit", required = false) String isAudit){ @Param(value = "isAudit") String isAudit){
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
enroll.*, enroll.*,
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/audit/TheRapyRecuperationXghAuditController.java
+5 -5
View File
@@ -309,11 +309,11 @@ public class TheRapyRecuperationXghAuditController {
@ViReturn @ViReturn
@SaCheckLogin @SaCheckLogin
public Object getLinePlayTimeByLineId(String lineId, public Object getLinePlayTimeByLineId(String lineId,
@Param(value = "signUpMode",required = false) Integer signUpMode, @Param(value = "signUpMode") Integer signUpMode,
@Param(value = "year",required = false) Integer year, @Param(value = "year") Integer year,
@Param(value = "startYear",required = false)Integer startYear, @Param(value = "startYear")Integer startYear,
@Param(value = "endYear",required = false)Integer endYear, @Param(value = "endYear")Integer endYear,
@Param(value = "flag",required = false) Boolean flag) { @Param(value = "flag") Boolean flag) {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.and("lineId", "=", lineId); cnd.and("lineId", "=", lineId);
if (flag == null || !flag){ if (flag == null || !flag){
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationLineSelectionOverviewController.java
+16 -16
View File
@@ -88,12 +88,12 @@ public class TheRapyRecuperationLineSelectionOverviewController {
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview")
public Object pageData(PageForm pageForm, public Object pageData(PageForm pageForm,
@Param(value = "year", required = false) Integer year, @Param(value = "year") Integer year,
@Param(value = "keywords", required = false) String keywords, @Param(value = "keywords") String keywords,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "travelAgencyId", required = false) String travelAgencyId, @Param(value = "travelAgencyId") String travelAgencyId,
@Param(value = "regionalNature", required = false) String regionalNature) { @Param(value = "regionalNature") String regionalNature) {
Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature); Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature);
Pagination pagination = lineUnionSelectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), listSql); Pagination pagination = lineUnionSelectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), listSql);
List<NutMap> rowList = pagination.getList(); List<NutMap> rowList = pagination.getList();
@@ -136,12 +136,12 @@ public class TheRapyRecuperationLineSelectionOverviewController {
@Ok("void") @Ok("void")
@SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview")
public void doExportExcel(PageForm pageForm, public void doExportExcel(PageForm pageForm,
@Param(value = "year", required = false) Integer year, @Param(value = "year") Integer year,
@Param(value = "keywords", required = false) String keywords, @Param(value = "keywords") String keywords,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "travelAgencyId", required = false) String travelAgencyId, @Param(value = "travelAgencyId") String travelAgencyId,
@Param(value = "regionalNature", required = false) String regionalNature, @Param(value = "regionalNature") String regionalNature,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature); Sql listSql = buildSelectionOverviewSql(pageForm, year, keywords, unionId, lotId, travelAgencyId, regionalNature);
List<NutMap> list = queryMapList(listSql); List<NutMap> list = queryMapList(listSql);
@@ -175,7 +175,7 @@ public class TheRapyRecuperationLineSelectionOverviewController {
@SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") @SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview")
public Object timeSlots(@Param("lineId") String lineId, public Object timeSlots(@Param("lineId") String lineId,
@Param("unionId") String unionId, @Param("unionId") String unionId,
@Param(value = "year", required = false) Integer year) { @Param(value = "year") Integer year) {
Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(lineId, "请选择线路");
Assert.notBlank(unionId, "请选择分工会"); Assert.notBlank(unionId, "请选择分工会");
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
@@ -255,7 +255,7 @@ public class TheRapyRecuperationLineSelectionOverviewController {
public Object saveTimeSlots(@Param("lineUnionSelects") TheRapyRecuperationLineUnionSelect[] lineUnionSelects, public Object saveTimeSlots(@Param("lineUnionSelects") TheRapyRecuperationLineUnionSelect[] lineUnionSelects,
@Param("lineId") String lineId, @Param("lineId") String lineId,
@Param("unionId") String unionId, @Param("unionId") String unionId,
@Param(value = "year", required = false) Integer year) { @Param(value = "year") Integer year) {
Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(lineId, "请选择线路");
Assert.notBlank(unionId, "请选择分工会"); Assert.notBlank(unionId, "请选择分工会");
lineUnionSelectService.adminSaveLineTimes(lineUnionSelects, lineId, unionId, year); lineUnionSelectService.adminSaveLineTimes(lineUnionSelects, lineId, unionId, year);
@@ -277,7 +277,7 @@ public class TheRapyRecuperationLineSelectionOverviewController {
@Aop(TransAop.READ_COMMITTED) @Aop(TransAop.READ_COMMITTED)
public Object cancelLine(@Param("lineId") String lineId, public Object cancelLine(@Param("lineId") String lineId,
@Param("unionId") String unionId, @Param("unionId") String unionId,
@Param(value = "year", required = false) Integer year) { @Param(value = "year") Integer year) {
Assert.notBlank(lineId, "请选择线路"); Assert.notBlank(lineId, "请选择线路");
Assert.notBlank(unionId, "请选择分工会"); Assert.notBlank(unionId, "请选择分工会");
Integer queryYear = year == null ? DateUtil.thisYear() : year; Integer queryYear = year == null ? DateUtil.thisYear() : year;
@@ -336,7 +336,7 @@ public class TheRapyRecuperationLineSelectionOverviewController {
@At @At
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.lineSelectionOverview") @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, return dao.query(TheRapyRecuperationTravelAgency.class,
Cnd.where("year", "=", year == null ? DateUtil.thisYear() : year).asc("serialNumber")); Cnd.where("year", "=", year == null ? DateUtil.thisYear() : year).asc("serialNumber"));
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java
+45 -45
View File
@@ -488,20 +488,20 @@ public class TheRapyRecuperationUserQueryController {
@Ok("void") @Ok("void")
@ViReturn @ViReturn
@SaCheckLogin @SaCheckLogin
public void doExportViewExcel(@Param(value = "regionalNature", required = false) String regionalNature, public void doExportViewExcel(@Param(value = "regionalNature") String regionalNature,
@Param(value = "state", required = false) Integer state, @Param(value = "state") Integer state,
@Param(value = "searchName", required = false) String searchName, @Param(value = "searchName") String searchName,
@Param(value = "searchKeyword", required = false) String searchKeyword, @Param(value = "searchKeyword") String searchKeyword,
@Param(value = "startYear", required = false) Integer startYear, @Param(value = "startYear") Integer startYear,
@Param(value = "endYear", required = false) Integer endYear, @Param(value = "endYear") Integer endYear,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId", required = false) String unitId, @Param(value = "unitId") String unitId,
@Param(value = "takePartInLineId", required = false) String takePartInLineId, @Param(value = "takePartInLineId") String takePartInLineId,
@Param(value = "agencyId", required = false) String agencyId, @Param(value = "agencyId") String agencyId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId,
@Param(value = "signUpMode", required = false) String signUpMode, @Param(value = "signUpMode") String signUpMode,
@Param(value = "isTakePartIn", required = false) Integer isTakePartIn, @Param(value = "isTakePartIn") Integer isTakePartIn,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
@@ -720,21 +720,21 @@ public class TheRapyRecuperationUserQueryController {
@Ok("void") @Ok("void")
@ViReturn @ViReturn
@SaCheckLogin @SaCheckLogin
public void doExportExcel(@Param(value = "regionalNature", required = false) String regionalNature, public void doExportExcel(@Param(value = "regionalNature") String regionalNature,
@Param(value = "state", required = false) Integer state, @Param(value = "state") Integer state,
@Param(value = "searchName", required = false) String searchName, @Param(value = "searchName") String searchName,
@Param(value = "searchKeyword", required = false) String searchKeyword, @Param(value = "searchKeyword") String searchKeyword,
@Param(value = "startYear", required = false) Integer startYear, @Param(value = "startYear") Integer startYear,
@Param(value = "endYear", required = false) Integer endYear, @Param(value = "endYear") Integer endYear,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId", required = false) String unitId, @Param(value = "unitId") String unitId,
@Param(value = "takePartInLineId", required = false) String takePartInLineId, @Param(value = "takePartInLineId") String takePartInLineId,
@Param(value = "agencyId", required = false) String agencyId, @Param(value = "agencyId") String agencyId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId,
@Param(value = "signUpMode", required = false) String signUpMode, @Param(value = "signUpMode") String signUpMode,
@Param(value = "types", required = false) String[] types, @Param(value = "types") String[] types,
@Param(value = "satisfyPeople", required = false) Boolean satisfyPeople, @Param(value = "satisfyPeople") Boolean satisfyPeople,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
Cnd commonCnd = Cnd.NEW(); Cnd commonCnd = Cnd.NEW();
@@ -891,22 +891,22 @@ public class TheRapyRecuperationUserQueryController {
@Ok("void") @Ok("void")
@ViReturn @ViReturn
@SaCheckLogin @SaCheckLogin
public void doExport(@Param(value = "regionalNature", required = false) String regionalNature, public void doExport(@Param(value = "regionalNature") String regionalNature,
@Param(value = "state", required = false) Integer state, @Param(value = "state") Integer state,
@Param(value = "searchName", required = false) String searchName, @Param(value = "searchName") String searchName,
@Param(value = "searchKeyword", required = false) String searchKeyword, @Param(value = "searchKeyword") String searchKeyword,
@Param(value = "startYear", required = false) Integer startYear, @Param(value = "startYear") Integer startYear,
@Param(value = "endYear", required = false) Integer endYear, @Param(value = "endYear") Integer endYear,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId", required = false) String unitId, @Param(value = "unitId") String unitId,
@Param(value = "takePartInLineId", required = false) String takePartInLineId, @Param(value = "takePartInLineId") String takePartInLineId,
@Param(value = "agencyId", required = false) String agencyId, @Param(value = "agencyId") String agencyId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, @Param(value = "takePartInBaseManagementId") String takePartInBaseManagementId,
@Param(value = "signUpMode", required = false) String signUpMode, @Param(value = "signUpMode") String signUpMode,
@Param(value = "isTakePartIn", required = false) Integer isTakePartIn, @Param(value = "isTakePartIn") Integer isTakePartIn,
@Param(value = "types", required = false) String[] types, @Param(value = "types") String[] types,
@Param(value = "satisfyPeople", required = false) Boolean satisfyPeople, @Param(value = "satisfyPeople") Boolean satisfyPeople,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
response.setContentType("application/octet-stream"); response.setContentType("application/octet-stream");
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationLineStatisticsController.java
+14 -14
View File
@@ -86,7 +86,7 @@ public class TheRapyRecuperationLineStatisticsController {
@At("/unionLineNumberStatistics/pageData") @At("/unionLineNumberStatistics/pageData")
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.unionLineNumberStatistics") @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()); TheRapyRecuperationConfig config = dao.fetch(TheRapyRecuperationConfig.class, Cnd.NEW());
List<NutMap> lineNumberConfigs = Optional.ofNullable(config) List<NutMap> lineNumberConfigs = Optional.ofNullable(config)
.map(TheRapyRecuperationConfig::getUnionLineNumberConfigs) .map(TheRapyRecuperationConfig::getUnionLineNumberConfigs)
@@ -177,16 +177,16 @@ public class TheRapyRecuperationLineStatisticsController {
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.statistics") @SaCheckPermission("inclusiveTherapyV3.statistics")
public Object pageData(PageForm pageForm, public Object pageData(PageForm pageForm,
@Param(value = "startYear", required = false) Integer startYear, @Param(value = "startYear") Integer startYear,
@Param(value = "endYear", required = false) Integer endYear, @Param(value = "endYear") Integer endYear,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param("takePartInLineId") String takePartInLineId, @Param("takePartInLineId") String takePartInLineId,
@Param(value = "lotId", required = false) String lotId, @Param(value = "lotId") String lotId,
@Param(value = "signUpMode", required = false) String signUpMode, @Param(value = "signUpMode") String signUpMode,
@Param(value = "selectId", required = false) String selectId, @Param(value = "selectId") String selectId,
@Param(value = "playMonth", required = false) String playMonth, @Param(value = "playMonth") String playMonth,
@Param(value = "regionalNature", required = false) String regionalNature, @Param(value = "regionalNature") String regionalNature,
@Param(value = "travelAgencyId", required = false) String travelAgencyId) { @Param(value = "travelAgencyId") String travelAgencyId) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
line.id, line.id,
@@ -317,10 +317,10 @@ public class TheRapyRecuperationLineStatisticsController {
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.statistics") @SaCheckPermission("inclusiveTherapyV3.statistics")
public Object getUserDateByLine(PageForm pageForm, public Object getUserDateByLine(PageForm pageForm,
@Param(value = "takePartLineId", required = false) String takePartLineId, @Param(value = "takePartLineId") String takePartLineId,
@Param(value = "searchKeyword", required = false) String searchKeyword, @Param(value = "searchKeyword") String searchKeyword,
@Param(value = "unionId", required = false) String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId", required = false) String unitId) { @Param(value = "unitId") String unitId) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
enroll.*, enroll.*,
src/main/java/com/budwk/app/zhgh/staffbenefit/therapyRecuperation/controller/statistics/TheRapyRecuperationTravelAgencyMonthlyStatisticsController.java
+4 -4
View File
@@ -52,7 +52,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController {
@At("/getChartData") @At("/getChartData")
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") @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; Integer queryYear = year == null ? DateUtil.thisYear() : year;
return enrollService.getTravelAgencyMonthlyEnrollStatistics(queryYear); return enrollService.getTravelAgencyMonthlyEnrollStatistics(queryYear);
} }
@@ -68,7 +68,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController {
@At("/getUnionChartData") @At("/getUnionChartData")
@ViReturn @ViReturn
@SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") @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; Integer queryYear = year == null ? DateUtil.thisYear() : year;
List<UnionEnrollStatisticsVo> list = enrollService.getUnionEnrollStatistics(queryYear); List<UnionEnrollStatisticsVo> list = enrollService.getUnionEnrollStatistics(queryYear);
return list; return list;
@@ -85,7 +85,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController {
@At("/doExportExcel") @At("/doExportExcel")
@Ok("void") @Ok("void")
@SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") @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 { HttpServletResponse response) throws IOException {
Integer queryYear = year == null ? DateUtil.thisYear() : year; Integer queryYear = year == null ? DateUtil.thisYear() : year;
NutMap exportData = enrollService.getTravelAgencyMonthlyEnrollExportData(queryYear); NutMap exportData = enrollService.getTravelAgencyMonthlyEnrollExportData(queryYear);
@@ -113,7 +113,7 @@ public class TheRapyRecuperationTravelAgencyMonthlyStatisticsController {
@At("/doExportUnionExcel") @At("/doExportUnionExcel")
@Ok("void") @Ok("void")
@SaCheckPermission("inclusiveTherapyV3.travelAgencyMonthlyStatistics") @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 { HttpServletResponse response) throws IOException {
Integer queryYear = year == null ? DateUtil.thisYear() : year; Integer queryYear = year == null ? DateUtil.thisYear() : year;
NutMap exportData = enrollService.getUnionEnrollExportData(queryYear); NutMap exportData = enrollService.getUnionEnrollExportData(queryYear);