| 
						
						
							
								
							
						
						
					 | 
					@ -8,6 +8,7 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; | 
					 | 
					 | 
					import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
					 | 
					 | 
					import com.alibaba.fastjson.JSON; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.Constant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.Constant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.FieldConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.NumConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.constant.StrConstant; | 
					 | 
					 | 
					import com.epmet.commons.tools.constant.StrConstant; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO; | 
					 | 
					 | 
					import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -20,6 +21,7 @@ import com.epmet.commons.tools.exception.EpmetException; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.redis.common.CustomerStaffRedis; | 
					 | 
					 | 
					import com.epmet.commons.tools.redis.common.CustomerStaffRedis; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.security.dto.TokenDto; | 
					 | 
					 | 
					import com.epmet.commons.tools.security.dto.TokenDto; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.ExcelUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.ExcelUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.Md5Util; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.Result; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.SpringContextUtils; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.SpringContextUtils; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; | 
					 | 
					 | 
					import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -190,12 +192,16 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        FormItemResult formItemResult = exportResiUserItemDTO.getItemMap().get(columnName); | 
					 | 
					 | 
					                        FormItemResult formItemResult = exportResiUserItemDTO.getItemMap().get(columnName); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        String newValue = vauleStr; | 
					 | 
					 | 
					                        String newValue = vauleStr; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType()) && StringUtils.isNotBlank(vauleStr)) { | 
					 | 
					 | 
					                        if (Constant.OPITON_SOURCE_REMOTE.equals(sqlColumn.getOptionSourceType()) && StringUtils.isNotBlank(vauleStr)) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            putRemoteValue(exportResiUserItemDTO.getRemoteItemConditionMap().get(itemId), staffInfoCacheResult.getAgencyId(), o, originalConditionMap, formItemResult, columnName, vauleStr); | 
					 | 
					 | 
					                            putRemoteValue(exportResiUserItemDTO.getRemoteItemConditionMap().get(itemId), staffInfoCacheResult.getAgencyId(), o, originalConditionMap, formItemResult, columnName, vauleStr); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            newValue = String.valueOf(o.get(columnName)); | 
					 | 
					 | 
					                            newValue = String.valueOf(o.get(columnName)); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())) { | 
					 | 
					 | 
					                        } else if (Constant.OPITON_SOURCE_LOCAL.equals(sqlColumn.getOptionSourceType())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            newValue = putOptionValue(formItemResult, vauleStr); | 
					 | 
					 | 
					                            newValue = putOptionValue(formItemResult, vauleStr); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } | 
					 | 
					 | 
					                        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        if (FieldConstant.ID.equals(key)) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            newValue = Md5Util.md5(vauleStr); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        singleRowData.add(newValue); | 
					 | 
					 | 
					                        singleRowData.add(newValue); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    }); | 
					 | 
					 | 
					                    }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    resultData.add(singleRowData); | 
					 | 
					 | 
					                    resultData.add(singleRowData); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -241,10 +247,10 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        IcCustomExportResultDTO data = exportConfigResult.getData(); | 
					 | 
					 | 
					        IcCustomExportResultDTO data = exportConfigResult.getData(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					        //添加一个虚拟列Id 用于分组
 | 
					 | 
					 | 
					        //添加一个虚拟列Id 用于分组 合并单元格
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					        data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, "ID", "local")); | 
					 | 
					 | 
					        data.getShowSqlColumns().add(0, new IcCustomExportResultDTO.SqlColumn(null, "ic_resi_user", false, FieldConstant.ID, "local")); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        List<String> id = new ArrayList<>(); | 
					 | 
					 | 
					        List<String> id = new ArrayList<>(); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					        id.add("ID"); | 
					 | 
					 | 
					        id.add(FieldConstant.ID); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        data.getHeaders().add(0, id); | 
					 | 
					 | 
					        data.getHeaders().add(0, id); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return exportConfigResult; | 
					 | 
					 | 
					        return exportConfigResult; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -336,6 +342,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } | 
					 | 
					 | 
					                } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                break; | 
					 | 
					 | 
					                break; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            default: | 
					 | 
					 | 
					            default: | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                return valueStr; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        return valueStr; | 
					 | 
					 | 
					        return valueStr; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |