导出添加火化时间、登记单位名称、所属网格赋值

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java

@@ -50,6 +50,10 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncReco
         formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null);
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage());
         List<DataSyncRecordDeathDTO> records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId());
+        records.forEach(r->{
+            GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(r.getGridId());
+            r.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR);
+        });
         PageInfo<DataSyncRecordDeathDTO> pi = new PageInfo<>(records);
         return new PageData<>(records, pi.getTotal());
     }

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml

@@ -40,7 +40,9 @@
             d.ADDRESS,
             d.IC_RESI_USER_ID,
             d.GRID_ID,
-            d.AGENCY_ID
+            d.AGENCY_ID,
+            d.CREMATION_TIME,
+            d.ORGAN_NAME
         FROM
             data_sync_record_death d
         WHERE