diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java index 109bb2c..aaf63b7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/EpidemicRecordListDTO.java @@ -219,4 +219,7 @@ public class EpidemicRecordListDTO implements Serializable { private String checkStateName; private String allDeptNames; -} \ No newline at end of file + + //房屋地址 + private String houseAddress; +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java index df7ffb0..85731d8 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java @@ -114,7 +114,10 @@ public class EpidecmicUserNewExcel{ private String destinationAddressName; @Excel(name = "拟去往目的地详细地址") private String destinationAddressDetail; + @Excel(name = "房屋地址") + private String houseAddress; @Excel(name = "是否接种",replace = { "未接种_0", "接种中_1", "接种完成_2"}) private Integer vaccinationState; + } 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 57644ab..36709df 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 @@ -49,7 +49,24 @@ ui.LIVE_ADDRESS_NAME, ui.HOUSEHOLD_REGISTER_NAME householdRegisterName, if(ui.check_state='0','已检测','未检测') as checkStateName, - ui.ALL_DEPT_NAMES + ui.ALL_DEPT_NAMES, + + ui.WORK_UNITS, + ui.HOUSE_ADDRESS, + ui.PLOT, + ui.BUILDING_NO, + ui.UNIT, + ui.ROOM_NO, + ui.BIRTHDAY, + case ui.GENDER + when '0' then '女' + when '1' then '男' + else ui.GENDER + end as GENDER, + ui.HOUSEHOLD_REGISTER_NAME, + ui.OUT_LIVE_ADDRESS_DETAIL + + from epidemic_user_info ui where ui.DEL_FLAG='0'