From fa882ee3d5adc2bf7d0d6d414a807e93e26e69b0 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 6 Jul 2023 16:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BB=A3=E7=A0=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=96=B0=E5=A2=9Elist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ScreenCommunityController.java | 6 ++++++ .../epdc/controller/ScreenCommunityHeadController.java | 7 +++++++ .../controller/ScreenCommunityRedRossController.java | 8 ++++++++ .../controller/ScreenEventClassCensusController.java | 9 +++++++++ .../epdc/controller/ScreenEventReportController.java | 10 +++++++++- .../epdc/controller/ScreenHouseCensusController.java | 9 +++++++++ .../controller/ScreenHouseClassCensusController.java | 8 ++++++++ .../epdc/controller/ScreenPartyMemberController.java | 9 +++++++++ .../epdc/controller/ScreenResiCensusController.java | 9 +++++++++ .../controller/ScreenResiClassCensusController.java | 8 ++++++++ .../esua/epdc/controller/ScreenStreetController.java | 9 +++++++++ .../controller/ScreenStreetRedCrossController.java | 9 +++++++++ .../esua/epdc/controller/ScreenTopicController.java | 8 ++++++++ .../controller/ScreenVolunteerActivityController.java | 9 +++++++++ .../epdc/controller/ScreenVolunteerController.java | 9 +++++++++ .../controller/ScreenVolunteerDemeanorController.java | 9 +++++++++ .../controller/ScreenVolunteerLoveHoursController.java | 9 +++++++++ .../service/impl/ScreenHouseCensusServiceImpl.java | 6 ++++++ .../impl/ScreenHouseClassCensusServiceImpl.java | 7 +++++++ .../epdc/service/impl/ScreenResiCensusServiceImpl.java | 6 ++++++ .../service/impl/ScreenResiClassCensusServiceImpl.java | 6 ++++++ .../impl/ScreenVolunteerActivityServiceImpl.java | 4 ++++ .../impl/ScreenVolunteerDemeanorServiceImpl.java | 1 + .../impl/ScreenVolunteerLoveHoursServiceImpl.java | 3 +++ 24 files changed, 177 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityController.java index f9ea845a..2c91c65a 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityController.java @@ -49,6 +49,12 @@ public class ScreenCommunityController { @Autowired private ScreenCommunityService screenCommunityService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenCommunityService.list(params); + return new Result>().ok(list); + } + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenCommunityService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityHeadController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityHeadController.java index 173a0cec..cc32ceab 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityHeadController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityHeadController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityDTO; import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.excel.ScreenCommunityHeadExcel; import com.elink.esua.epdc.service.ScreenCommunityHeadService; @@ -49,6 +50,12 @@ public class ScreenCommunityHeadController { @Autowired private ScreenCommunityHeadService screenCommunityHeadService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenCommunityHeadService.list(params); + return new Result>().ok(list); + } + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenCommunityHeadService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityRedRossController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityRedRossController.java index ec467105..4ce04d83 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityRedRossController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenCommunityRedRossController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenCommunityRedRossDTO; import com.elink.esua.epdc.excel.ScreenCommunityRedRossExcel; import com.elink.esua.epdc.service.ScreenCommunityRedRossService; @@ -49,6 +50,13 @@ public class ScreenCommunityRedRossController { @Autowired private ScreenCommunityRedRossService screenCommunityRedRossService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenCommunityRedRossService.list(params); + return new Result>().ok(list); + } + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenCommunityRedRossService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java index 67b1ed97..382cf74d 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventClassCensusController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenEventClassCensusDTO; import com.elink.esua.epdc.excel.ScreenEventClassCensusExcel; import com.elink.esua.epdc.service.ScreenEventClassCensusService; @@ -49,6 +50,14 @@ public class ScreenEventClassCensusController { @Autowired private ScreenEventClassCensusService screenEventClassCensusService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenEventClassCensusService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenEventClassCensusService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventReportController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventReportController.java index 9bc2ebeb..6a1070ca 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventReportController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenEventReportController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenEventReportDTO; import com.elink.esua.epdc.excel.ScreenEventReportExcel; import com.elink.esua.epdc.service.ScreenEventReportService; @@ -45,10 +46,17 @@ import java.util.Map; @RestController @RequestMapping("eventReport") public class ScreenEventReportController { - + @Autowired private ScreenEventReportService screenEventReportService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenEventReportService.list(params); + return new Result>().ok(list); + } + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenEventReportService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseCensusController.java index 2f121667..edf6500c 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseCensusController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenHouseCensusDTO; import com.elink.esua.epdc.excel.ScreenHouseCensusExcel; import com.elink.esua.epdc.service.ScreenHouseCensusService; @@ -49,6 +50,14 @@ public class ScreenHouseCensusController { @Autowired private ScreenHouseCensusService screenHouseCensusService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenHouseCensusService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenHouseCensusService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java index 65f1fd6d..1b0bc859 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenHouseClassCensusController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenHouseClassCensusDTO; import com.elink.esua.epdc.excel.ScreenHouseClassCensusExcel; import com.elink.esua.epdc.service.ScreenHouseClassCensusService; @@ -49,6 +50,13 @@ public class ScreenHouseClassCensusController { @Autowired private ScreenHouseClassCensusService screenHouseClassCensusService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenHouseClassCensusService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenHouseClassCensusService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenPartyMemberController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenPartyMemberController.java index 0c00e008..c86681e8 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenPartyMemberController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenPartyMemberController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenPartyMemberDTO; import com.elink.esua.epdc.excel.ScreenPartyMemberExcel; import com.elink.esua.epdc.service.ScreenPartyMemberService; @@ -49,6 +50,14 @@ public class ScreenPartyMemberController { @Autowired private ScreenPartyMemberService screenPartyMemberService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenPartyMemberService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenPartyMemberService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiCensusController.java index 02d50a4a..796188c7 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiCensusController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenResiCensusDTO; import com.elink.esua.epdc.excel.ScreenResiCensusExcel; import com.elink.esua.epdc.service.ScreenResiCensusService; @@ -49,6 +50,14 @@ public class ScreenResiCensusController { @Autowired private ScreenResiCensusService screenResiCensusService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenResiCensusService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenResiCensusService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java index a7f2a405..6f0b88aa 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenResiClassCensusController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenResiClassCensusDTO; import com.elink.esua.epdc.excel.ScreenResiClassCensusExcel; import com.elink.esua.epdc.service.ScreenResiClassCensusService; @@ -49,6 +50,13 @@ public class ScreenResiClassCensusController { @Autowired private ScreenResiClassCensusService screenResiClassCensusService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenResiClassCensusService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenResiClassCensusService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetController.java index c8a4c3ed..cef597f7 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenStreetDTO; import com.elink.esua.epdc.excel.ScreenStreetExcel; import com.elink.esua.epdc.service.ScreenStreetService; @@ -49,6 +50,14 @@ public class ScreenStreetController { @Autowired private ScreenStreetService screenStreetService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenStreetService.list(params); + return new Result>().ok(list); + } + + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenStreetService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetRedCrossController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetRedCrossController.java index e6c26299..0b87764a 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetRedCrossController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenStreetRedCrossController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenStreetRedCrossDTO; import com.elink.esua.epdc.excel.ScreenStreetRedCrossExcel; import com.elink.esua.epdc.service.ScreenStreetRedCrossService; @@ -49,6 +50,14 @@ public class ScreenStreetRedCrossController { @Autowired private ScreenStreetRedCrossService screenStreetRedCrossService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenStreetRedCrossService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenStreetRedCrossService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenTopicController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenTopicController.java index 2a016ad5..7e576c31 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenTopicController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenTopicController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenTopicDTO; import com.elink.esua.epdc.excel.ScreenTopicExcel; import com.elink.esua.epdc.service.ScreenTopicService; @@ -49,6 +50,13 @@ public class ScreenTopicController { @Autowired private ScreenTopicService screenTopicService; + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenTopicService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenTopicService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerActivityController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerActivityController.java index 4dc125c7..43539370 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerActivityController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerActivityController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenVolunteerActivityDTO; import com.elink.esua.epdc.excel.ScreenVolunteerActivityExcel; import com.elink.esua.epdc.service.ScreenVolunteerActivityService; @@ -49,6 +50,14 @@ public class ScreenVolunteerActivityController { @Autowired private ScreenVolunteerActivityService screenVolunteerActivityService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenVolunteerActivityService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenVolunteerActivityService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerController.java index a48aff31..9df499a6 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenVolunteerDTO; import com.elink.esua.epdc.excel.ScreenVolunteerExcel; import com.elink.esua.epdc.service.ScreenVolunteerService; @@ -49,6 +50,14 @@ public class ScreenVolunteerController { @Autowired private ScreenVolunteerService screenVolunteerService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenVolunteerService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenVolunteerService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerDemeanorController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerDemeanorController.java index 96e9cb91..4ccf5ce1 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerDemeanorController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerDemeanorController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenVolunteerDemeanorDTO; import com.elink.esua.epdc.excel.ScreenVolunteerDemeanorExcel; import com.elink.esua.epdc.service.ScreenVolunteerDemeanorService; @@ -49,6 +50,14 @@ public class ScreenVolunteerDemeanorController { @Autowired private ScreenVolunteerDemeanorService screenVolunteerDemeanorService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenVolunteerDemeanorService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenVolunteerDemeanorService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerLoveHoursController.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerLoveHoursController.java index 43b5f2ce..864c0b96 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerLoveHoursController.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/controller/ScreenVolunteerLoveHoursController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ScreenCommunityHeadDTO; import com.elink.esua.epdc.dto.ScreenVolunteerLoveHoursDTO; import com.elink.esua.epdc.excel.ScreenVolunteerLoveHoursExcel; import com.elink.esua.epdc.service.ScreenVolunteerLoveHoursService; @@ -49,6 +50,14 @@ public class ScreenVolunteerLoveHoursController { @Autowired private ScreenVolunteerLoveHoursService screenVolunteerLoveHoursService; + + @GetMapping("list") + public Result> list(@RequestParam Map params){ + List list = screenVolunteerLoveHoursService.list(params); + return new Result>().ok(list); + } + + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = screenVolunteerLoveHoursService.page(params); diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseCensusServiceImpl.java index b2fd8a79..1d81d882 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseCensusServiceImpl.java @@ -71,6 +71,12 @@ public class ScreenHouseCensusServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + String communityId = (String)params.get("communityId"); + wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId); + + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java index 5af6c9c3..d03ec98f 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenHouseClassCensusServiceImpl.java @@ -71,6 +71,13 @@ public class ScreenHouseClassCensusServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + + String communityId = (String)params.get("communityId"); + wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId); + + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiCensusServiceImpl.java index 8ee85ffc..54695f4e 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiCensusServiceImpl.java @@ -71,6 +71,12 @@ public class ScreenResiCensusServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + String communityId = (String)params.get("communityId"); + wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId); + + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java index 49c84002..0e46fc56 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenResiClassCensusServiceImpl.java @@ -71,6 +71,12 @@ public class ScreenResiClassCensusServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + + String communityId = (String)params.get("communityId"); + wrapper.eq(StringUtils.isNotBlank(communityId), FieldConstant.COMMUNITY_ID, communityId); + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java index 4029da43..d48fb976 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerActivityServiceImpl.java @@ -71,6 +71,10 @@ public class ScreenVolunteerActivityServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerDemeanorServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerDemeanorServiceImpl.java index 75c868ed..bc4f949c 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerDemeanorServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerDemeanorServiceImpl.java @@ -71,6 +71,7 @@ public class ScreenVolunteerDemeanorServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + return wrapper; } diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerLoveHoursServiceImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerLoveHoursServiceImpl.java index f0f45cd7..db42786c 100755 --- a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerLoveHoursServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/service/impl/ScreenVolunteerLoveHoursServiceImpl.java @@ -71,6 +71,9 @@ public class ScreenVolunteerLoveHoursServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + String type = (String)params.get("type"); + wrapper.eq(StringUtils.isNotBlank(type), "type", type); + return wrapper; }