Merge branch 'feature/user_house_import'

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java

@@ -84,8 +84,7 @@ public class EpidemicUserInfoController {
     public Result delete(@RequestBody Long[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
-//        epidemicUserInfoService.delete(ids);
-//        return new Result();
+
         return epidemicUserInfoService.deleteUserById(ids);
     }
 
@@ -96,15 +95,6 @@ public class EpidemicUserInfoController {
         exportParams.setHeight((short) (2 * 256));
         ExcelUtils.exportBigExcel(StringUtils.EMPTY, params, exportServer, response, exportParams, EpidecmicUserNewExcel.class);
     }
-/*
-    @GetMapping("export")
-    @LogOperation("导出")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<EpidemicRecordListDTO> list = epidemicUserInfoService.getList(params);
-
-        ExcelUtils.exportExcelToTarget(response, null, list, EpidecmicUserNewExcel.class);
-    }
-*/
 
     /**
      * @return io.pingyin.common.utils.Result<io.pingyin.common.page.PageData < io.pingyin.modules.epidemic.dto.result.EpidemicPageResultDTO>>

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInoutRecordDao.java

@@ -148,4 +148,13 @@ public interface EpidemicUserInoutRecordDao extends BaseDao<EpidemicUserInoutRec
     * @return java.lang.String
     */
     String getMobileByIdCard(@Param("idcard") String idcard);
+
+    /***
+     * 物理删除
+     * @param ids
+     * @return void
+     * @author qushutong
+     * @date 2022/4/25 15:59
+     */
+    void deleteByIds(Long[] ids);
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordDetailDTO.java

@@ -305,4 +305,8 @@ public class EpidemicRecordDetailDTO implements Serializable {
 //	@Excel(name = "房屋地址")
 	private String houseAddress;
 
+	private Long unitId;
+	private Long plotId;
+	private Long buildingId;
+
 }

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

@@ -23,10 +23,12 @@ import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.SysPopulationSimpleDictDTO;
 import com.elink.esua.epdc.dto.house.form.SysPopulationSimpleDictFormDTO;
 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.BindingFamilyFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
+import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO;
 import com.elink.esua.epdc.vaccine.constant.ImageConstant;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
@@ -47,6 +49,7 @@ import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient;
 import com.elink.esua.epdc.vaccine.house.excel.BaseResidentInformationUpdateExcel;
 import com.elink.esua.epdc.vaccine.personroom.dao.EpidemicUnitOwnerDao;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicUnitOwnerEntity;
+import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicUnitOwnerService;
 import com.elink.esua.epdc.vaccine.vim.dao.VaccinationInfoDao;
 import com.elink.esua.epdc.vaccine.vim.dao.VimImgDao;
@@ -103,6 +106,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Autowired
     private EpidemicUnitOwnerService epidemicUnitOwnerService;
 
+    @Autowired
+    private EpidemicBuildingUnitService epidemicBuildingUnitService;
+
     @Autowired
     private EpidemicUserInoutRecordDao epidemicUserInoutRecordDao;
 
@@ -195,7 +201,14 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         } else {
             result.setDestinationAddressCodes(new String[]{});
         }
-
+        EpidemicBuildingUnitDTO formDTO = new EpidemicBuildingUnitDTO();
+        formDTO.setIdCard(result.getIdCard());
+        EpidemicBuildingUnitDetailResultDTO unitInfo = epidemicBuildingUnitService.getUnitInfo(formDTO);
+        if (unitInfo != null) {
+            result.setUnitId(unitInfo.getId());
+            result.setBuildingId(unitInfo.getBuildingId());
+            result.setPlotId(unitInfo.getPlotId());
+        }
         return result;
     }
 
@@ -224,9 +237,7 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Result updateNew(EpidemicReportUserInfoDTO dto) {
-        if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
-            saveHouseRelation(dto);
-        }
+
         //基础信息dto
         EpidemicUserInfoEntity userInfoDTO = new EpidemicUserInfoEntity();
         //录入信息dto
@@ -290,24 +301,12 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
 //                    return new Result().error("电话号格式不正确");
 //                }
 //            }
-//            //判断关联人
-//            if (!StringUtils.isEmpty(userInoutRecordDTO.getRelationPeople())) {
-//                if (userInoutRecordDTO.getRelationPeople().contains("*")) {
-//                    userInoutRecordDTO.setRelationPeople(inoutRecordEntity.getRelationPeople());
-//                }
-//            }
-//            //判断关联人联系电话
-//            if (!StringUtils.isEmpty(userInoutRecordDTO.getRelationPeopleMobile())) {
-//                if (userInoutRecordDTO.getRelationPeopleMobile().contains("*")) {
-//                    userInoutRecordDTO.setRelationPeopleMobile(inoutRecordEntity.getRelationPeopleMobile());
-//                } else {
-//                    String peopleMobile = userInoutRecordDTO.getRelationPeopleMobile();
-//                    boolean isMobile = ValidateUtils.validateMobilePhone(peopleMobile);
-//                    if (!isMobile) {
-//                        return new Result().error("关联人联系电话格式不正确");
-//                    }
-//                }
-//            }
+
+            // 更新人房关系
+            if (dto.getUnitId() != null && dto.getUnitId() != NumConstant.ZERO) {
+                dto.setUserName(entity.getUserName());
+                saveHouseRelation(dto);
+            }
         } catch (RenException e) {
             return new Result().error(e.getMsg());
         }
@@ -487,29 +486,9 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
      */
     @Override
     public Result deleteUserById(Long[] ids) {
-
         //物理删除
         baseDao.deleteByIds(ids);
-//        //1、获取详情id
-//        Long inoutRecord = ids[0];
-//        if (null != inoutRecord) {
-//            baseDao.deleteById(inoutRecord);
-//            //查询信息
-//            EpidemicUserInfoEntity entity = baseDao.selectByIdCard(inoutRecord);
-//            if (null == entity) {
-//                return new Result().error("数据错误，刷新后重试！！");
-//            }
-//            // 2、判断人员信息表中数据如果只有一条就全删
-//            Integer integer = inoutRecordDao.selectByState(entity.getIdCard());
-//            if (integer == 1) {
-//                // 若同时存在，则保留基础信息，删除额外信息。
-//                baseDao.deleteById(entity.getId());
-//            }
-//            inoutRecordDao.deleteById(inoutRecord);
-//        } else {
-//            return new Result().error("删除参数不正确,请联系管理员查看");
-//        }
-        //根据情况进项删除
+        epidemicUserInoutRecordDao.deleteByIds(ids);
         return new Result();
     }
 

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

@@ -143,6 +143,12 @@ public class BuildingUnitController {
         return new Result<List<DictOptionDTO>>().ok(list);
     }
 
+    @GetMapping("getUnitInfo")
+    public Result<EpidemicBuildingUnitDetailResultDTO> getUnitInfo(EpidemicBuildingUnitDTO formDTO) {
+        EpidemicBuildingUnitDetailResultDTO dto = epidemicBuildingUnitService.getUnitInfo(formDTO);
+        return new Result<EpidemicBuildingUnitDetailResultDTO>().ok(dto);
+    }
+
     /**
      * 房间号下拉框
      *

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java

@@ -148,4 +148,6 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
      */
     HouseInfoResultDTO getHouseInfo(GetHouseInfoFormDTO formDTO);
 
+    EpidemicBuildingUnitDetailResultDTO getUnitInfo(EpidemicBuildingUnitDTO formDTO);
+
 }

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

@@ -216,7 +216,7 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      */
     void createQrCode(String roomId, HttpServletResponse response);
 
-
+    EpidemicBuildingUnitDetailResultDTO getUnitInfo(EpidemicBuildingUnitDTO formDTO);
 
 
 }

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

@@ -828,6 +828,11 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         return new Result();
     }
 
+    @Override
+    public EpidemicBuildingUnitDetailResultDTO getUnitInfo(EpidemicBuildingUnitDTO formDTO) {
+        return baseDao.getUnitInfo(formDTO);
+    }
+
     public String createHouseQrCodeUrl(String roomCode, String name) throws Exception {
         //url组成:小程序地址?房屋编码
         String url = qrCodeProperties.getPre() + roomCode;

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

@@ -423,5 +423,11 @@
                     and ID_CARD=#{idcard}
         order by CREATED_TIME desc limit 1
     </select>
+    <delete id="deleteByIds">
+        delete from epidemic_user_inout_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 </mapper>

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

@@ -278,4 +278,21 @@
             and u.ROOM_CODE = #{roomCode}
         </if>
     </select>
+
+    <select id="getUnitInfo" resultType="com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO">
+        SELECT
+            bu.*,
+            pb.BUILDING_NAME,
+            pb.PLOT_ID,
+            pc.PLOT_NAME
+        FROM
+            epidemic_building_unit bu
+            LEFT JOIN epidemic_plot_building pb ON bu.BUILDING_ID = pb.ID
+            LEFT JOIN epidemic_plot_coordinate pc ON pb.PLOT_ID = pc.ID
+        WHERE
+            bu.ID_CARD =  #{idCard}
+        ORDER BY
+            CREATED_TIME DESC
+            LIMIT 1
+    </select>
 </mapper>