diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java index 4c07ba9..1260bdf 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUnionQueryController.java @@ -847,7 +847,7 @@ public class TheRapyRecuperationUnionQueryController { @At @Ok("void") @RequiresAuthentication - public void exportTravelers(HttpServletResponse response) { + public void exportTravelers(Integer year, HttpServletResponse response) { Map map = new HashMap<>(); Sql sql = Sqls.create(""" SELECT @@ -870,7 +870,7 @@ public class TheRapyRecuperationUnionQueryController { String unionid = ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId(); sql.setParam("unionid", unionid); sql.setParam("stateId", TheRapyRecuperationState.PASS); - sql.setParam("year", DateUtil.thisYear()); + sql.setParam("year", year == null ? DateUtil.thisYear() : year); List list = baseService.listMap(sql); for (int i = 0; i < list.size(); i++) { list.get(i).put("index", i + 1); diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html index 7953db6..7ca7189 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html @@ -263,7 +263,7 @@ layout("/layouts/platform.html"){ size="small" type="primary">申报表导出 出行人员导出