Merge remote-tracking branch 'remotes/origin/dev_ic_platform' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -56,6 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.file.Files;
@@ -316,10 +317,11 @@ public class IcResiUserController {
         Map<String, Map<String, Object>> resiMainList = icResiUserService.getDataForExport(otherSheetItems.get(BASE_TABLE_NAME),new HashMap<>(), pageFormDTO.getCustomerId(), pageFormDTO.getFormCode(), BASE_TABLE_NAME, pageFormDTO.getConditions());
 
         //=========================================
-        String fileName = "居民基本信息.xls";
+        String templatePath = "excel/ic_resi_info_cid_for_easy_excel.xlsx";
-        String templatePath = this.getClass().getResource("/excel/ic_resi_info_cid_for_easy_excel.xls").getPath();
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
-        //InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
+
-        ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName,response)).withTemplate(templatePath).build();
+        String fileName = "居民基本信息.xlsx";
+        ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName,response)).withTemplate(inputStream).build();
         FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
         WriteSheet fistSheet = EasyExcel.writerSheet(NumConstant.ZERO).build();
         System.out.println("===resiMainList==="+"  "+JSON.toJSONString(resiMainList.values()));