Browse Source

导入住户改为更新原来住户,修改部门显示bug

origin/epidemic_user
zhangyuan 4 years ago
parent
commit
4a889989bc
  1. 16
      epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java
  2. 2
      epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml

16
epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/house/service/impl/HousingInformationServiceImpl.java

@ -42,6 +42,7 @@ 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.vaccine.epidemic.dao.EpidemicUserInfoDao;
import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO;
import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity;
import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
import com.elink.esua.epdc.vaccine.feign.VimAdminFeignClient;
@ -382,9 +383,11 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
if (epdcResidentErrorResultDTOS != null && epdcResidentErrorResultDTOS.size() > 0) {
return new Result().ok(epdcResidentErrorResultDTOS);
}
// 保存户主和房屋信息
if (basePopulationInformationExcels != null && basePopulationInformationExcels.size() > 0) {
populationIdNoAndIdMap = savePopulationListEnd(basePopulationInformationExcels, parentAndAllDeptDTO);
}
// 保存居住人信息
if (baseResidentInformationExcels != null && baseResidentInformationExcels.size() > 0) {
saveResidentList(baseResidentInformationExcels, populationIdNoAndIdMap);
}
@ -478,6 +481,19 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(baseResidentInformationExcel.getSelfIdentityNo());
if (null == check) {
epidemicUserInfoService.insert(epidemicUserInfoEntity);
} else {
check.setRelation(epidemicUserInfoEntity.getRelation());
check.setUserName(epidemicUserInfoEntity.getUserName());
check.setGender(epidemicUserInfoEntity.getGender());
check.setNation(epidemicUserInfoEntity.getNation());
check.setMobile(epidemicUserInfoEntity.getMobile());
check.setWorkUnits(epidemicUserInfoEntity.getWorkUnits());
check.setLiveAddressName(epidemicUserInfoEntity.getLiveAddressName());
check.setPeopleCategories(epidemicUserInfoEntity.getPeopleCategories());
check.setSpecialCrowd(epidemicUserInfoEntity.getSpecialCrowd());
check.setPoliticsStatus(epidemicUserInfoEntity.getPoliticsStatus());
epidemicUserInfoService.update(ConvertUtils.sourceToTarget(check, EpidemicUserInfoDTO.class));
}
//插入房屋人员关联关系表
HouseResidentEntity houseResidentEntity = ConvertUtils.sourceToTarget(baseResidentInformationExcel, HouseResidentEntity.class);

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

@ -48,7 +48,7 @@
if(ui.check_state='0','已检测','未检测') as checkStateName,
hi.ALL_DEPT_NAMES
from epidemic_user_info ui
LEFT JOIN epdc_house_resident hr on hr.RESIDENT_ID = ui.id
LEFT JOIN epdc_house_resident hr on CONVERT(hr.RESIDENT_ID, UNSIGNED INTEGER) = ui.id
left join epdc_housing_information hi on hi.id = hr.HOUSE_ID and hi.DEL_FLAG='0'
where ui.DEL_FLAG='0'
<if test="checkState != null and checkState != '' and checkState== '0'.toString()">

Loading…
Cancel
Save