From e71e3f3ade6400e141647c84a8da456346fd9cdc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jun 2022 17:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EpidemicUserInfoServiceImpl.java | 12 ++++++++++ .../controller/PlotBuildingController.java | 3 +++ .../controller/PlotCoordinateController.java | 3 +++ .../EpidemicPlotCoordinateServiceImpl.java | 5 +++-- .../mapper/epidemic/EpidemicUserInfoDao.xml | 1 + .../personroom/EpidemicBuildingUnitDao.xml | 9 ++++++-- .../personroom/EpidemicPlotBuildingDao.xml | 2 +- .../personroom/EpidemicPlotCoordinateDao.xml | 22 +++++++++---------- 8 files changed, 40 insertions(+), 17 deletions(-) diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java index ad2d56f..bc7aa69 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java @@ -1632,6 +1632,14 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl().ok(dto); } @@ -1685,6 +1693,10 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl> getBuildingOptionApp(@RequestBody EpidemicPlotBuildingDTO formDTO) { + log.info("################楼栋############plotId:"+formDTO.getPlotId()); List list = epidemicPlotBuildingService.getBuildingOption(formDTO); return new Result>().ok(list); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java index 07bdf53..88610ae 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotCoordinateController.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.personroom.form.EpidemicPlotCoordinateFormDTO; import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO; import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel; import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -46,6 +47,7 @@ import java.util.Map; * @author zhangyuan qu@elink-cn.com * @since v1.0.0 2021-07-09 */ +@Slf4j @RestController @RequestMapping("epidemicplotcoordinate") public class PlotCoordinateController { @@ -138,6 +140,7 @@ public class PlotCoordinateController { */ @GetMapping("getPlotOptionApp") public Result> getPlotOptionApp(@RequestBody EpidemicPlotCoordinateDTO formDTO) { + log.info("###############小区#############gridId:"+formDTO.getGridId()); List list = epidemicPlotCoordinateService.getPlotOption(formDTO); return new Result>().ok(list); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java index d2be91e..c3aced5 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicPlotCoordinateServiceImpl.java @@ -141,8 +141,9 @@ public class EpidemicPlotCoordinateServiceImpl extends CrudServiceImpl params = new HashMap<>(2); params.put("plotId", id); List relation = epidemicPlotGridService.list(params); - dto.setGridIds(relation.stream().map(EpidemicPlotGridDTO::getGridId).collect(Collectors.toList())); - + if(relation != null && relation.size() > 0){ + dto.setGridIds(relation.stream().map(EpidemicPlotGridDTO::getGridId).collect(Collectors.toList())); + } return dto; } diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml index 2d5e489..f8e1680 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml @@ -690,6 +690,7 @@ from epidemic_user_inout_record uir where uir.DEL_FLAG = '0' and uir.ID_CARD = #{idCard} + order by uir.ID limit 1 ) ur on ur.ID_CARD = ui.ID_CARD where ui.DEL_FLAG = '0' diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml index 06ab4d6..cc9feff 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml @@ -200,7 +200,8 @@ SELECT - u.* + u.*, + b.BUILDING_NAME, + p.PLOT_NAME FROM epidemic_building_unit u + LEFT JOIN epidemic_plot_building b ON u.BUILDING_ID = b.id + LEFT JOIN epidemic_plot_coordinate p ON b.PLOT_ID = p.id WHERE u.DEL_FLAG = '0' and u.ROOM_CODE = #{roomCode} diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml index 0313f8b..ebb14fa 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml @@ -37,7 +37,7 @@ epidemic_plot_building pb WHERE pb.DEL_FLAG = '0' - and PLOT_ID = #{plotId} + and pb.PLOT_ID = #{plotId} diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml index f51ed2b..5837a81 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml @@ -109,18 +109,16 @@ pc.PLOT_NAME AS dictName from epidemic_plot_coordinate pc LEFT JOIN epidemic_plot_grid pg ON pc.id = pg.PLOT_ID - - - pc.STREET_ID = #{streetId} - - - and pc.COMMUNITY_ID = #{communityId} - - - and pg.GRID_ID = #{gridId} - - and pc.DEL_FLAG = '0' - + where pc.DEL_FLAG = '0' + + and pc.STREET_ID = #{streetId} + + + and pc.COMMUNITY_ID = #{communityId} + + + and pg.GRID_ID = #{gridId} +