模版再次调整

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

@@ -56,7 +56,6 @@ 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;
@@ -317,10 +316,10 @@ 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 templatePath = this.getClass().getResource("/excel/ic_resi_info_cid_for_easy_excel.xls").getPath();
         String fileName = "居民基本信息.xls";
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
+        String templatePath = this.getClass().getResource("/excel/ic_resi_info_cid_for_easy_excel.xls").getPath();
-        ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName,response)).withTemplate(inputStream).build();
+        //InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath);
+        ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName,response)).withTemplate(templatePath).build();
         FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build();
         WriteSheet fistSheet = EasyExcel.writerSheet(NumConstant.ZERO).build();
         System.out.println("===resiMainList==="+"  "+JSON.toJSONString(resiMainList.values()));

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

@@ -640,7 +640,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 return;
             }
             result.put(resiId, map);
-            System.out.println("当前是："+map.get("NAME"));
             for (Map.Entry<String, FormItem> e : formItemMap.entrySet()) {
                 String k = e.getKey();
                 FormItem v = e.getValue();
@@ -678,8 +677,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         v.getOptions().forEach(optionDTO -> {
                             map.put(optionDTO.getValue(), vauleStr.contains(optionDTO.getValue()) ? "是" : "否");
                         });
-                        if (v.getOptions().get(0).getValue().equals("zhianxunluo"))
-                            System.out.println("v=======" + map.get("NAME") + map.get("zhianxunluo"));
                     } else if ("select".equals(v.getItemType())) {
                         v.getOptions().forEach(optionDTO -> {
                             if (optionDTO.getValue().equals(vauleStr)) {