监督端-导出修改-部门+企业+检查计划+执法检查+预警+执法投诉

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html

@@ -796,7 +796,7 @@
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
             delete params.dateSearch;
-            $.ajax({
+/*            $.ajax({
                 type: "POST",
                 data: JSON.stringify(params),
                 contentType: 'application/json',
@@ -813,7 +813,21 @@
                     link.click();
                     document.body.removeChild(link)
                 }
-            })
+            })*/
+            console.log(params)
+            let paramsList=[]
+            for(var key in params){
+                if (params.hasOwnProperty(key)) {
+                    var value = params[key];
+                    // 检查值是否为空
+                    if (value!== null && value!== undefined && value!== '') {
+                        paramsList.push(key + '=' + value);
+                    }
+                }
+            }
+            console.log(paramsList)
+            console.log(paramsList.join("&"))
+            window.location.href = prefix +"/export1?"+paramsList.join("&")
         }
         function downloadC2(){
             var currentId=$('form').eq(1).attr('id');
@@ -838,6 +852,20 @@
                         document.body.removeChild(link)
                     }
                 })
+                console.log(params)
+                let paramsList=[]
+                for(var key in params){
+                    if (params.hasOwnProperty(key)) {
+                        var value = params[key];
+                        // 检查值是否为空
+                        if (value!== null && value!== undefined && value!== '') {
+                            paramsList.push(key + '=' + value);
+                        }
+                    }
+                }
+                console.log(paramsList)
+                console.log(paramsList.join("&"))
+                window.location.href = prefix +"/export2?"+paramsList.join("&")
             }else if(document.getElementById("qy").value==""){
                 $.ajax({
                     type: "POST",
@@ -857,6 +885,20 @@
                         document.body.removeChild(link)
                     }
                 })
+                console.log(params)
+                let paramsList=[]
+                for(var key in params){
+                    if (params.hasOwnProperty(key)) {
+                        var value = params[key];
+                        // 检查值是否为空
+                        if (value!== null && value!== undefined && value!== '') {
+                            paramsList.push(key + '=' + value);
+                        }
+                    }
+                }
+                console.log(paramsList)
+                console.log(paramsList.join("&"))
+                window.location.href = prefix +"/export3?"+paramsList.join("&")
             }else{
                 $.ajax({
                     type: "POST",
@@ -876,6 +918,20 @@
                         document.body.removeChild(link)
                     }
                 })
+                console.log(params)
+                let paramsList=[]
+                for(var key in params){
+                    if (params.hasOwnProperty(key)) {
+                        var value = params[key];
+                        // 检查值是否为空
+                        if (value!== null && value!== undefined && value!== '') {
+                            paramsList.push(key + '=' + value);
+                        }
+                    }
+                }
+                console.log(paramsList)
+                console.log(paramsList.join("&"))
+                window.location.href = prefix +"/export4?"+paramsList.join("&")
             }
         }
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@@ -77,7 +77,7 @@
                                     </select>
                                 </li>
                                 <li>
-                                    <p>扫码原因：</p>
+                                    <p>未扫码原因：</p>
                                     <select name="checkCss" th:with="type=${@dict.getType('no-scan-reason')}">
                                         <option value="">所有</option>
                                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -1223,7 +1223,7 @@
         function downloadR(){
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
-            $.ajax({
+            /*$.ajax({
                 type: "POST",
                 data: JSON.stringify(params),
                 contentType: 'application/json',
@@ -1240,7 +1240,21 @@
                     link.click();
                     document.body.removeChild(link)
                 }
-            })
+            })*/
+            console.log(params)
+            let paramsList=[]
+            for(var key in params){
+                if (params.hasOwnProperty(key)) {
+                    var value = params[key];
+                    // 检查值是否为空
+                    if (value!== null && value!== undefined && value!== '') {
+                        paramsList.push(key + '=' + value);
+                    }
+                }
+            }
+            console.log(paramsList)
+            console.log(paramsList.join("&"))
+            window.location.href = prefix +"/exportUser?"+paramsList.join("&")
         }
         /*******2.年度计划TOP10********/
 

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@@ -367,7 +367,7 @@
         function downloadR(){
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
-            $.ajax({
+            /*$.ajax({
                 type: "POST",
                 data: JSON.stringify(params),
                 contentType: 'application/json',
@@ -384,7 +384,21 @@
                     link.click();
                     document.body.removeChild(link)
                 }
-            })
+            })*/
+            console.log(params)
+            let paramsList=[]
+            for(var key in params){
+                if (params.hasOwnProperty(key)) {
+                    var value = params[key];
+                    // 检查值是否为空
+                    if (value!== null && value!== undefined && value!== '') {
+                        paramsList.push(key + '=' + value);
+                    }
+                }
+            }
+            console.log(paramsList)
+            console.log(paramsList.join("&"))
+            window.location.href = prefix +"/export?"+paramsList.join("&")
         }
 
         function openStaticDetail(enterpriseNumber) {
@@ -504,7 +518,7 @@
             let endName=endDate.getFullYear()+"年"+(endDate.getMonth()+1)+"月"+endDate.getDate()+"日";
             console.log(beginName);
             console.log(endName);
-            $.ajax({
+/*            $.ajax({
                 type: "POST",
                 contentType: 'application/json',
                 data: JSON.stringify(params),
@@ -521,7 +535,21 @@
                     link.click();
                     document.body.removeChild(link)
                 }
-            })
+            })*/
+            console.log(params)
+            let paramsList=[]
+            for(var key in params){
+                if (params.hasOwnProperty(key)) {
+                    var value = params[key];
+                    // 检查值是否为空
+                    if (value!== null && value!== undefined && value!== '') {
+                        paramsList.push(key + '=' + value);
+                    }
+                }
+            }
+            console.log(paramsList)
+            console.log(paramsList.join("&"))
+            window.location.href = prefix +"/zfjdm?"+paramsList.join("&")
         }
     </script>
 </body>

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html

@@ -492,7 +492,7 @@
     function downloadP(){
         var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
-        $.ajax({
+        /*$.ajax({
             type: "POST",
             data: JSON.stringify(params),
             contentType: 'application/json',
@@ -509,7 +509,21 @@
                 link.click();
                 document.body.removeChild(link)
             }
-        })
+        })*/
+        console.log(params)
+        let paramsList=[]
+        for(var key in params){
+            if (params.hasOwnProperty(key)) {
+                var value = params[key];
+                // 检查值是否为空
+                if (value!== null && value!== undefined && value!== '') {
+                    paramsList.push(key + '=' + value);
+                }
+            }
+        }
+        console.log(paramsList)
+        console.log(paramsList.join("&"))
+        window.location.href = prefix +"/export1?"+paramsList.join("&")
     }
 
     /**

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html

@@ -840,11 +840,25 @@
         //     }
         // })
         // window.open(prefix+"/export1", "parent");
-        window.location.href = prefix+"/export1";
+        console.log(params)
+        let paramsList=[]
+        for(var key in params){
+            if (params.hasOwnProperty(key)) {
+                var value = params[key];
+                // 检查值是否为空
+                if (value!== null && value!== undefined && value!== '') {
+                    paramsList.push(key + '=' + value);
+                }
+            }
+        }
+        console.log(paramsList)
+        console.log(paramsList.join("&"))
+        window.location.href = prefix +"/export1?"+paramsList.join("&")
+        // window.location.href = prefix+"/export1";
 
     }
     function downloadI2(){
-        $.ajax({
+        /*$.ajax({
             type: "POST",
             contentType: 'application/json',
             //设置响应类型
@@ -860,7 +874,8 @@
                 link.click();
                 document.body.removeChild(link)
             }
-        })
+        })*/
+        window.location.href = prefix+"/export2";
     }
 
     function sortTotalNumber(){

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html

@@ -182,7 +182,7 @@
         var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
         delete params.dateSearch;
-        $.ajax({
+/*        $.ajax({
             type: "POST",
             data: JSON.stringify(params),
             contentType: 'application/json',
@@ -199,7 +199,21 @@
                 link.click();
                 document.body.removeChild(link)
             }
-        })
+        })*/
+        console.log(params)
+        let paramsList=[]
+        for(var key in params){
+            if (params.hasOwnProperty(key)) {
+                var value = params[key];
+                // 检查值是否为空
+                if (value!== null && value!== undefined && value!== '') {
+                    paramsList.push(key + '=' + value);
+                }
+            }
+        }
+        console.log(paramsList)
+        console.log(paramsList.join("&"))
+        window.location.href = prefix +"/export?"+paramsList.join("&")
     }
 </script>
 </body>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java

@@ -21,9 +21,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.time.LocalDate;
@@ -171,15 +173,16 @@ public class ComplaintStaticController extends BaseController {
             complaintStatistics.setComplaintDepartmentId(iDeptService.selectDeptByDeptName2(searchType.getName()).getDeptId());
         return complaintStatisticsService.selectComplaintStatisticsGroupByType(complaintStatistics);
     }
-    @PostMapping("/export1")
+    @GetMapping("/export1")
     @ResponseBody
-    public void export1(HttpServletResponse httpServletResponse,@RequestBody SearchType searchType) throws IOException {
+    public void export1(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
         ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.list1(searchType,complaintStatistics);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("执法投诉统计");
         //设置文件名称
         String fileName = "执法投诉统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -215,14 +218,16 @@ public class ComplaintStaticController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
 
-    @PostMapping("/export2")
+    @GetMapping("/export2")
     @ResponseBody
-    public void export2(HttpServletResponse httpServletResponse,@RequestBody SearchType searchType) throws IOException {
+    public void export2(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
         ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics);//权限
         List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.type(complaintStatisticsList);
@@ -230,6 +235,7 @@ public class ComplaintStaticController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("投诉类型统计");
         //设置文件名称
         String fileName = "投诉类型统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -266,13 +272,15 @@ public class ComplaintStaticController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
-    @PostMapping("/export3")
+    @GetMapping("/export3")
     @ResponseBody
-    public void export3(HttpServletResponse httpServletResponse,@RequestBody SearchType searchType) throws IOException {
+    public void export3(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
         ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
         List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.qyComplaintList(complaintStatisticsList,searchType);
@@ -280,6 +288,7 @@ public class ComplaintStaticController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("投诉企业所属区域统计");
         //设置文件名称
         String fileName = "投诉企业所属区域统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -316,13 +325,15 @@ public class ComplaintStaticController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
-    @PostMapping("/export4")
+    @GetMapping("/export4")
     @ResponseBody
-    public void export4(HttpServletResponse httpServletResponse,@RequestBody SearchType searchType) throws IOException {
+    public void export4(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
         ComplaintStatistics complaintStatistics=dateMake(searchType);
         List<ComplaintStatistics> complaintStatisticsList=complaintStatisticsService.selectComplaintStatisticsLEFTEnterpriseList(complaintStatistics);//权限
         List<StatisticsIndicator> statisticsIndicatorList=complaintStatisticsService.jdComplaintList(complaintStatisticsList,searchType);
@@ -330,6 +341,7 @@ public class ComplaintStaticController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("投诉企业所属街道统计");
         //设置文件名称
         String fileName = "投诉企业所属街道统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -366,8 +378,10 @@ public class ComplaintStaticController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -118,6 +119,7 @@ public class DeptStaticController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("部门统计");
         //设置文件名称
         String fileName = "部门统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java

@@ -1,6 +1,7 @@
 package com.zdxt.code.controller;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import com.zdxt.code.service.IEnforcementInspectionProgramService;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -136,15 +138,16 @@ public class EnforcementInspectionProgramController extends BaseController
         return ZDResponse.success("执法计划分类统计总数查询成功",enforcementInspectionProgramDto1);
     }
 
-    @PostMapping("/export1")
+    @GetMapping("/export1")
     @ResponseBody
-    public void export1(HttpServletResponse httpServletResponse,@RequestBody EnforcementInspectionProgramDto enforcementInspectionProgramDto) throws IOException {
+    public void export1(HttpServletResponse httpServletResponse,EnforcementInspectionProgramDto enforcementInspectionProgramDto) throws IOException {
         List<EnforcementInspectionProgramDto> enforcementInspectionProgramDtos =
                 enforcementInspectionProgramService.staticProgram(enforcementInspectionProgramDto);//待权限1209
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("检查计划统计");
         //设置文件名称
         String fileName = "检查计划统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -183,8 +186,10 @@ public class EnforcementInspectionProgramController extends BaseController
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -2,6 +2,7 @@ package com.zdxt.code.controller;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.time.LocalDate;
@@ -40,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import com.zdxt.code.service.IEnforcementRegistrationService;
 
 import javax.servlet.Registration;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.crypto.Data;
 
@@ -635,21 +637,22 @@ public class EnforcementRegistrationController extends BaseController
         return yearList;
     }
 
-    @PostMapping("/exportUser")
+    @GetMapping("/exportUser")
     @ResponseBody
-    public void exportRegistration(HttpServletResponse httpServletResponse,@RequestBody EnforcementRegistration enforcementRegistration) throws IOException {
+    public void exportRegistration(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration) throws IOException {
         enforcementRegistrationService.exportRegistration(httpServletResponse,enforcementRegistration);
     }
 
-    @PostMapping("/export")
+    @GetMapping("/export")
     @ResponseBody
-    public void export(HttpServletResponse httpServletResponse,@RequestBody EnforcementRegistrationDto enforcementRegistrationDto) throws IOException {
+    public void export(HttpServletResponse httpServletResponse,EnforcementRegistrationDto enforcementRegistrationDto) throws IOException {
         List<EnforcementRegistrationDto> enforcementRegistrationDtos = enforcementRegistrationService.
                 staticEnforcementRegistrationLI(enforcementRegistrationDto);
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet("执法分析");
         //设置文件名称
         String fileName = "执法分析.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -710,13 +713,15 @@ public class EnforcementRegistrationController extends BaseController
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
-    @PostMapping("/zfjdm")
+    @GetMapping("/zfjdm")
     @ResponseBody
-    public void exportZFJDM(HttpServletResponse httpServletResponse,@RequestBody EnforcementCheckStatistics enforcementCheckStatistics) throws IOException, ParseException {
+    public void exportZFJDM(HttpServletResponse httpServletResponse,EnforcementCheckStatistics enforcementCheckStatistics) throws IOException, ParseException {
 /*        String month1=StringUtils.join(month,",");
         enforcementCheckStatistics.setYear(year);
         enforcementCheckStatistics.setMonth(month1);*/
@@ -737,6 +742,9 @@ public class EnforcementRegistrationController extends BaseController
             }
         }
         List<EnforcementCheckStatistics> enforcementCheckStatisticsList=enforcementCheckStatisticsService.selectAllStatisticsList(enforcementCheckStatistics);
+        //enterpriseIsNot为过滤开发环境时无企业信息的情况，正式环境可将编号abc注释
+        List<EnforcementCheckStatistics> enterpriseIsNot=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress()==null).collect(Collectors.toList());//a
+        enforcementCheckStatisticsList=enforcementCheckStatisticsList.stream().filter(item->item.getEnterpriseAddress()!=null).collect(Collectors.toList());//b
         Map<String,List<EnforcementCheckStatistics>> enforcementCheckStatisticsMap=new HashMap<>();
         for(int i=0;i<inOrderList.size();i++){
             String area=inOrderList.get(i);
@@ -746,6 +754,7 @@ public class EnforcementRegistrationController extends BaseController
         }
         //将地址不属于各个区的筛出来放入执法记录map
         List<EnforcementCheckStatistics> qt=enforcementCheckStatisticsList.stream().filter(item->!qyqtMake(inOrderList,item.getEnterpriseAddress())).collect(Collectors.toList());
+        qt.addAll(enterpriseIsNot);//c
         if(qt.size()>0){
             enforcementCheckStatisticsMap.put("其他",qt);
             inOrderList.add("其他");

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java

@@ -15,8 +15,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
@@ -229,7 +231,7 @@ public class StatisticsEnterpriseController extends BaseController {
         statisticsEnterpriseService.export1(httpServletResponse, searchType);
     }
 
-    @PostMapping("/export2")
+    @GetMapping("/export2")
     @ResponseBody
     public void export2(HttpServletResponse httpServletResponse) throws IOException {
         List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
@@ -238,6 +240,7 @@ public class StatisticsEnterpriseController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("企业类型统计");
         //设置文件名称
         String fileName = "企业类型统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -274,8 +277,10 @@ public class StatisticsEnterpriseController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java

@@ -15,8 +15,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
@@ -97,9 +99,9 @@ public class StatisticsWarningController extends BaseController {
         return prefix+"/fragmentW";
     }
 
-    @PostMapping("/export")
+    @GetMapping("/export")
     @ResponseBody
-    public void export(HttpServletResponse httpServletResponse, @RequestBody SearchType searchType) throws IOException {
+    public void export(HttpServletResponse httpServletResponse,SearchType searchType) throws IOException {
         LawEnforcementWarningList lawEnforcementWarningList=dateMake(searchType);
         if(searchType.getBureauDeptId()!=null&&!"".equals(searchType.getBureauDeptId())){
             lawEnforcementWarningList.setEnforcementDepartment(searchType.getBureauDeptId());
@@ -112,6 +114,7 @@ public class StatisticsWarningController extends BaseController {
         HSSFSheet sheet = workbook.createSheet("执法预警统计");
         //设置文件名称
         String fileName = "执法预警统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -148,8 +151,10 @@ public class StatisticsWarningController extends BaseController {
         httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        httpServletResponse.flushBuffer();
+/*        httpServletResponse.flushBuffer();
-        workbook.write(httpServletResponse.getOutputStream());
+        workbook.write(httpServletResponse.getOutputStream());*/
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
     private LawEnforcementWarningList dateMake(SearchType searchType){

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java

@@ -18,6 +18,7 @@ import org.apache.poi.ss.util.RegionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
@@ -2512,11 +2513,14 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
             }
         }
         String fileName="执法监督码"+strStart+"至"+strEnd+"使用情况.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/vnd.ms-excel");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        response.flushBuffer();
+/*        response.flushBuffer();
-        wb.write(response.getOutputStream());
+        wb.write(response.getOutputStream());*/
+        ServletOutputStream outputStream = response.getOutputStream();
+        wb.write(outputStream);
         wb.close();
     }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zdxt.code.service.impl;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
@@ -36,6 +37,7 @@ import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 import org.springframework.util.ObjectUtils;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -599,6 +601,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             List<EnforcementRegistrationDto> enforcementRegistrationDtoList =
                     enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);
             List<EnforcementRegistrationDto> enforcementRegistrationDtos=new ArrayList<>();
+            List<EnforcementRegistrationDto> enterpriseIsNot=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress()==null).collect(Collectors.toList());//a
+            enforcementRegistrationDtoList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress()!=null).collect(Collectors.toList());//b
             for(DictData qy:qyList){
                 List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
                 /*List<String> jdStrings=new ArrayList<>();
@@ -625,6 +629,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 }
             }
             List<EnforcementRegistrationDto>qtqyList=enforcementRegistrationDtoList.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+            qtqyList.addAll(enterpriseIsNot);//c
             if(qtqyList.size()>0){
                 enforcementRegistrationDtos.addAll(qtqyList);
             }
@@ -701,6 +706,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         HSSFSheet sheet = workbook.createSheet("执法检查统计");
         //设置文件名称
         String fileName = "执法检查统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         //自适应列宽
         sheet.setDefaultColumnWidth(20);//全局
         //表头样式
@@ -792,8 +798,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         response.setCharacterEncoding("UTF-8");
         response.setContentType("application/vnd.ms-excel");
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
-        response.flushBuffer();
+/*        response.flushBuffer();
-        workbook.write(response.getOutputStream());
+        workbook.write(response.getOutputStream());*/
+        ServletOutputStream outputStream = response.getOutputStream();
+        workbook.write(outputStream);
         workbook.close();
     }
     private List<EnforcementRegistration> enforcementRegistrationListToExport(EnforcementRegistration enforcementRegistration){
@@ -846,6 +854,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             }
             List<EnforcementRegistration> list = enforcementRegistrationMapper.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
             List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
+            //enterpriseIsNot为过滤开发环境时无企业信息的情况，正式环境可将编号abc注释
+            List<EnforcementRegistration> enterpriseIsNot=list.stream().filter(item->item.getEnterpriseAddress()==null).collect(Collectors.toList());//a
+            list=list.stream().filter(item->item.getEnterpriseAddress()!=null).collect(Collectors.toList());//b
             for(DictData qy:qyList){
                 List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
                 /*List<String> jdStrings=new ArrayList<>();
@@ -872,6 +883,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 }
             }
             List<EnforcementRegistration>qtqyList=list.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+            qtqyList.addAll(enterpriseIsNot);//c
             if(qtqyList.size()>0){
                 enforcementRegistrationsList.addAll(qtqyList);
             }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
 
         //设置文件名称
         String fileName = "企业数量统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         HSSFWorkbook workbook = new HSSFWorkbook();
         //全市页
         HSSFSheet sheet1 = workbook.createSheet("全市");
@@ -234,6 +236,7 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ
     public void export1(HttpServletResponse response, SearchType searchType) throws IOException {
         //设置文件名称
         String fileName = "企业数量统计.xls";
+        fileName = URLEncoder.encode(fileName, "UTF-8");
         HSSFWorkbook workbook = new HSSFWorkbook();
         //全市页
         HSSFSheet sheet1 = workbook.createSheet("全市");