Merge branch 'feature/user_house_import'

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -1643,6 +1643,14 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 
         FamilyMemberInfoResultDTO dto = baseDao.getFamilyMember(formDTO);
 
+        // 如果记录表没有信息，需插入一条
+        if(dto.getRecordId() == null || dto.getRecordId() == 0){
+            // 新增epidemic_user_inout_record
+            EpidemicUserInoutRecordEntity epidemicUserInoutRecordEntity = new EpidemicUserInoutRecordEntity();
+            epidemicUserInoutRecordEntity.setIdCard(dto.getIdCard());
+            epidemicUserInoutRecordDao.insert(epidemicUserInoutRecordEntity);
+        }
+
         return new Result<FamilyMemberInfoResultDTO>().ok(dto);
     }
 
@@ -1696,6 +1704,10 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
             // 新增epidemic_user_info
             EpidemicUserInfoEntity epidemicUserInfoEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInfoEntity.class);
             baseDao.insert(epidemicUserInfoEntity);
+
+            // 新增epidemic_user_inout_record
+            EpidemicUserInoutRecordEntity epidemicUserInoutRecordEntity = ConvertUtils.sourceToTarget(formDTO, EpidemicUserInoutRecordEntity.class);
+            epidemicUserInoutRecordDao.insert(epidemicUserInoutRecordEntity);
         }
 
         // 绑定房屋

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java

@@ -21,10 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 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.form.BindingFamilyFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.*;
-import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +100,20 @@ public class AppFamilyController {
         return epidemicBuildingUnitService.getHouseInfo(formDTO);
     }
 
+    /**
+     * 修改房屋信息
+     *
+     * @param formDTO
+     * @return
+     * @Author wanggongfeng
+     */
+    @PostMapping("updateHouseInfo")
+    public Result updateHouseInfo(@RequestBody HouseInfoFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        return epidemicBuildingUnitService.updateHouseInfo(formDTO);
+    }
+
     /**
      * 绑定我的家庭房屋
      *

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/PlotBuildingController.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotBuildingResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotBuildingExcel;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotBuildingService;
+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 zhy qu@elink-cn.com
  * @since v1.0.0 2022-02-15
  */
+@Slf4j
 @RestController
 @RequestMapping("epidemicplotbuilding")
 public class PlotBuildingController {
@@ -119,6 +121,7 @@ public class PlotBuildingController {
      */
     @GetMapping("getBuildingOptionApp")
     public Result<List<DictOptionDTO>> getBuildingOptionApp(@RequestBody EpidemicPlotBuildingDTO formDTO) {
+        log.info("################楼栋############plotId:"+formDTO.getPlotId());
         List<DictOptionDTO> list = epidemicPlotBuildingService.getBuildingOption(formDTO);
         return new Result<List<DictOptionDTO>>().ok(list);
     }

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<List<DictOptionDTO>> getPlotOptionApp(@RequestBody EpidemicPlotCoordinateDTO formDTO) {
+        log.info("###############小区#############gridId:"+formDTO.getGridId());
         List<DictOptionDTO> list = epidemicPlotCoordinateService.getPlotOption(formDTO);
         return new Result<List<DictOptionDTO>>().ok(list);
     }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java

@@ -23,10 +23,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -169,6 +171,13 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      */
     Result getHouseInfo(GetHouseInfoFormDTO formDTO);
 
+    /**
+     * 修改房屋信息
+     * @param formDTO
+     * @return
+     */
+    Result updateHouseInfo(HouseInfoFormDTO formDTO);
+
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @describe: 批量生成房屋的房屋编码和一户一档二维码
@@ -199,4 +208,6 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
     void createQrCode(String roomId, HttpServletResponse response);
 
 
+
+
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

@@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.*;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity;
@@ -742,6 +743,13 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         return new Result<HouseInfoResultDTO>().ok(houseInfoResultDTO);
     }
 
+    @Override
+    public Result updateHouseInfo(HouseInfoFormDTO formDTO) {
+        EpidemicBuildingUnitEntity entity = ConvertUtils.sourceToTarget(formDTO, EpidemicBuildingUnitEntity.class);
+        baseDao.updateById(entity);
+        return new Result();
+    }
+
     public String createHouseQrCodeUrl(String roomCode, String name) throws Exception {
         //url组成:小程序地址?房屋编码
         String url = qrCodeProperties.getPre() + roomCode;

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<EpidemicP
         Map<String, Object> params = new HashMap<>(2);
         params.put("plotId", id);
         List<EpidemicPlotGridDTO> relation = epidemicPlotGridService.list(params);
+        if(relation != null && relation.size() > 0){
             dto.setGridIds(relation.stream().map(EpidemicPlotGridDTO::getGridId).collect(Collectors.toList()));
-
+        }
         return dto;
     }
 

epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

@@ -701,6 +701,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'

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicBuildingUnitDao.xml

@@ -220,7 +220,8 @@
     <select id="getHouseOption" resultType="com.elink.esua.epdc.dto.epidemic.DictOptionDTO">
         SELECT
         u.ID AS dictValue,
-        u.ROOM_NO AS dictName
+        u.ROOM_NO AS dictName,
+        u.ROOM_CODE
         FROM
         epidemic_building_unit u
         WHERE u.DEL_FLAG = '0'
@@ -235,9 +236,13 @@
     <select id="getHouseInfo" resultType="com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO"
             parameterType="com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO">
         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'
         <if test="roomCode != null and roomCode !=''">
             and u.ROOM_CODE = #{roomCode}

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotBuildingDao.xml

@@ -37,7 +37,7 @@
             epidemic_plot_building pb
         WHERE pb.DEL_FLAG = '0'
         <if test="plotId != null and plotId !=''">
-            and PLOT_ID = #{plotId}
+            and pb.PLOT_ID = #{plotId}
         </if>
 
     </select>

epdc-cloud-vim-yushan/src/main/resources/mapper/personroom/EpidemicPlotCoordinateDao.xml

@@ -109,9 +109,9 @@
         pc.PLOT_NAME AS dictName
         from epidemic_plot_coordinate pc
         LEFT JOIN epidemic_plot_grid pg ON pc.id = pg.PLOT_ID
-        <where>
+        where pc.DEL_FLAG = '0'
         <if test="streetId != null and streetId != ''">
-                pc.STREET_ID = #{streetId}
+            and pc.STREET_ID = #{streetId}
         </if>
         <if test="communityId != null and communityId != ''">
             and pc.COMMUNITY_ID = #{communityId}
@@ -119,8 +119,6 @@
         <if test="gridId != null and gridId != ''">
             and pg.GRID_ID = #{gridId}
         </if>
-            and pc.DEL_FLAG = '0'
-        </where>
     </select>
 
     <select id="getOldData" resultType="com.elink.esua.epdc.vaccine.personroom.entity.EpidemicPlotCoordinateEntity">