+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.elink.esua.epdc.modules.personroom.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+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.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingErrorDTO;
+import com.elink.esua.epdc.modules.personroom.excel.EpidemicPlotBuildingErrorExcel;
+import com.elink.esua.epdc.modules.personroom.service.EpidemicPlotBuildingErrorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 小区，楼栋信息
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-04-25
+ */
+@RestController
+@RequestMapping("epidemicplotbuildingerror")
+public class EpidemicPlotBuildingErrorController {
+
+ @Autowired
+ private EpidemicPlotBuildingErrorService epidemicPlotBuildingErrorService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = epidemicPlotBuildingErrorService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ EpidemicPlotBuildingErrorDTO data = epidemicPlotBuildingErrorService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody EpidemicPlotBuildingErrorDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ epidemicPlotBuildingErrorService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody EpidemicPlotBuildingErrorDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ epidemicPlotBuildingErrorService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ epidemicPlotBuildingErrorService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = epidemicPlotBuildingErrorService.getErrorExcelList(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, EpidemicPlotBuildingErrorExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
index 0fc0bed..5431b90 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/personroom/service/impl/EpidemicPlotBuildingServiceImpl.java
@@ -213,6 +213,7 @@ public class EpidemicPlotBuildingServiceImpl extends CrudServiceImpl recordList = ExcelImportUtil.importExcel(f, EpidemicPlotBuildingImportExcel.class, importParams);
-
+ log.info("+++++++++++转成功");
// 未成功匹配数据
List nonExistInfoList = new ArrayList<>();
//字典类型数据
// 楼栋状态全部取出
List buildingStateList = adminFeignClient.listSimpleDictInfo("building_state").getData();
+ log.info("+++++++++++漏洞状态"+buildingStateList.get(0).getDictName());
List buildingStateCodeList = buildingStateList.stream().map(SysSimpleDictDTO::getDictValue).collect(Collectors.toList());
// 楼栋类型全部取出
List buildingTypeList = adminFeignClient.listSimpleDictInfo("building_type").getData();
diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
index 50c1ee5..889da01 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml
@@ -35,11 +35,11 @@
pb.BUILDING_NAME AS dictName
FROM
epidemic_plot_building pb
- WHERE
+ WHERE pb.DEL_FLAG = '0'
- PLOT_ID = #{plotId}
+ and PLOT_ID = #{plotId}
- and pb.DEL_FLAG = '0'
+
diff --git a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml b/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
index aaadd91..d457c18 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml
@@ -54,7 +54,7 @@
WHERE
pc.DEL_FLAG = '0'
- and pc.plotName like CONCAT('%',#{plotName},'%')
+ and pc.PLOT_NAME like CONCAT('%',#{plotName},'%')
and pc.STREET_ID = #{streetId}