From a1cbb0dbc15f4eabd68d8e04b8feb415aeb21029 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Thu, 14 Aug 2025 11:41:47 +0800 Subject: [PATCH] commit --- .../TheRapyRecuperationUserQueryController.java | 13 ++++++++++--- .../baseManage/baseManagement.html | 9 +++++---- .../theRapyRecuperation/basicManage/line.html | 14 +++++++++++--- .../basicManage/travelAgency.html | 13 ++++++++++--- .../process/TheRapyUserQuery.html | 13 +++++++++++++ 5 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java index 7a616cc..dc2ba00 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java @@ -69,7 +69,7 @@ public class TheRapyRecuperationUserQueryController { @ViReturn @RequiresAuthentication public Object pageData(String regionalNature, Integer state, PageForm pageForm, - Integer startYear, Integer endYear, String unionId, + Integer startYear, Integer endYear, String unionId,Integer isTakePartIn, String unitId, String takePartInLineId, String agencyId, String lotId, String takePartInBaseManagementId,String signUpMode) { Cnd cnd = Cnd.NEW(); @@ -94,6 +94,7 @@ public class TheRapyRecuperationUserQueryController { cnd.andEX("lxs.`year`", ">=", startYear); cnd.andEX("lxs.`year`", "<=", endYear); cnd.andEX("enroll.takePartInTravelAgencyId", "=", agencyId); + cnd.andEX("enroll.isTakePartIn", "=", isTakePartIn); } else { sql = Sqls.create(""" SELECT @@ -122,6 +123,7 @@ public class TheRapyRecuperationUserQueryController { cnd.andEX("line.id", "=", takePartInLineId); cnd.andEX("line.regionalNature", "=", regionalNature); cnd.andEX("lineu.signUpMode","=",signUpMode); + cnd.andEX("enroll.isTakePartIn", "=", isTakePartIn); if (state == 3) { sql.setVar("lotSql", "(select lotName from the_rapy_recuperation_lot where id = ma.lotId) as lotName"); cnd.and("enroll.takePartInBaseManagementId", "is not", null); @@ -150,7 +152,7 @@ public class TheRapyRecuperationUserQueryController { @At @ViReturn - public Object getXlLxsUserCount(String unionId, Integer startYear, Integer endYear, Integer signUpMode) { + public Object getXlLxsUserCount(Integer isTakePartIn, String unionId, Integer startYear, Integer endYear, Integer signUpMode) { Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(signingUptime)", ">=", startYear); cnd.andEX("YEAR(signingUptime)", "<=", endYear); @@ -160,6 +162,7 @@ public class TheRapyRecuperationUserQueryController { cnd.and("isNormal", "=", true); cnd.and("takePartInLineId", "is not", null); cnd.and("stateId", "=", TheRapyRecuperationState.PASS); + cnd.andEX("isTakePartIn", "=", isTakePartIn); cnd.andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode); int count = baseService.dao().count(TheRapyRecuperationEnroll.class, cnd); int count1 = baseService.dao().count(TheRapyRecuperationEnroll.class, Cnd.where("takePartInTravelAgencyId", "is not", null) @@ -167,12 +170,14 @@ public class TheRapyRecuperationUserQueryController { .andEX("YEAR(signingUptime)", ">=", startYear) .andEX("YEAR(signingUptime)", "<=", endYear) .andEX("isNormal", "=", true) + .andEX("isTakePartIn", "=", isTakePartIn) .andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode)); int count2 = baseService.dao().count(TheRapyRecuperationEnroll.class, Cnd.where("takePartInBaseManagementId", "is not", null) .andEX("selfUnionId", "=", unionId) .andEX("YEAR(signingUptime)", ">=", startYear) .andEX("YEAR(signingUptime)", "<=", endYear) .andEX("isNormal", "=", true) + .andEX("isTakePartIn", "=", isTakePartIn) .andEX("(select signUpMode from the_rapy_recuperation_line_union_select where id = takePartInLineId)", "=", signUpMode)); return Map.of("xlCount", count, "lxsCount", count1, "jdCount", count2); } @@ -311,7 +316,7 @@ public class TheRapyRecuperationUserQueryController { public void doExport(String regionalNature, Integer state,String searchName,String searchKeyword, Integer startYear, Integer endYear, String unionId, String unitId, String takePartInLineId, String agencyId, String lotId, - String takePartInBaseManagementId,String signUpMode, + String takePartInBaseManagementId,String signUpMode,Integer isTakePartIn, HttpServletResponse response) throws IOException { Cnd cnd = Cnd.NEW(); @@ -336,6 +341,7 @@ public class TheRapyRecuperationUserQueryController { cnd.andEX("lxs.`year`", ">=", startYear); cnd.andEX("lxs.`year`", "<=", endYear); cnd.andEX("enroll.takePartInTravelAgencyId", "=", agencyId); + cnd.andEX("enroll.isTakePartIn", "=", isTakePartIn); } else { sql = Sqls.create(""" SELECT @@ -365,6 +371,7 @@ public class TheRapyRecuperationUserQueryController { cnd.andEX("line.id", "=", takePartInLineId); cnd.andEX("line.regionalNature", "=", regionalNature); cnd.andEX("lineu.signUpMode","=",signUpMode); + cnd.andEX("enroll.isTakePartIn","=",isTakePartIn); if (state == 3) { sql.setVar("lotSql", "(select lotName from the_rapy_recuperation_lot where id = ma.lotId) as lotName"); cnd.and("enroll.takePartInBaseManagementId", "is not", null); diff --git a/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html b/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html index e3c078e..1fadd06 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html +++ b/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html @@ -718,13 +718,14 @@ layout("/layouts/platform.html"){ processData: false, contentType: false, success: (data) => { - requestLaterMsgFun(this, data, async () => { + if (data.code === 0){ + this.$message.success(data.msg) this.pageData(); this.importVisible = false - }, () => { - }, () => { this.importLoading = false - }) + }else { + this.importVisible = false + } }, error: (data) => { this.notifyWarning("导入失败") diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html index 3c414f9..4f30a65 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html +++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html @@ -865,11 +865,19 @@ layout("/layouts/platform.html"){ data.append("file", val.raw, val.raw.name); }); this.importLoading = true - const resp = await $.post(loc() + "/travelLineImport", data) - if (resp.code === 0) { + const resp = await $.ajax({ + url: loc() + '/travelLineImport', + type: 'POST', + data: data, + processData: false, + contentType: false + }) + if (resp.code === 0){ + this.$message.success(resp.msg) this.pageData(); this.importVisible = false - } else { + this.importLoading = false + }else { this.notifyWarning("导入失败") this.importLoading = false } diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html index c4a1572..a5bf871 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html +++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html @@ -439,12 +439,19 @@ layout("/layouts/platform.html"){ }); this.importLoading = true - const resp = await $.post(loc() + '/travelAgencyImport', data) - if (resp.code === 0) { + const resp = await $.ajax({ + url: loc() + '/travelAgencyImport', + type: 'POST', + data: data, + processData: false, + contentType: false + }) + if (resp.code===0){ + this.$message.success(resp.msg) this.pageData(); this.importVisible = false this.importLoading = false - } else { + }else { this.notifyWarning("导入失败") this.importLoading = false } diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html index f22da24..49041e4 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html @@ -95,6 +95,15 @@ layout("/layouts/platform.html"){ + + 是否参加： + + 全部 + 已参加 + 未参加 + +