监督端-部门统计修改-导数+内容

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

@@ -77,8 +77,8 @@
             columns: [
                 /*{
                 checkbox: false
-                },*/
-                /*{
+                },
+                {
                     field : 'id',
                     title : '主键ID',
                     visible: false
@@ -212,7 +212,8 @@
                 console.log(response);
                 $('#closeButton').show();
                 $('#bootstrap-table-details').show();
-                $('#bootstrap-table').hide();
+                // $('#bootstrap-table').hide();
+                $('#bootstrap-table, .fixed-table-pagination').hide();
                 $('#bootstrap-table-details').bootstrapTable('load', response);
             },error:function (xhr,status,error){
                 console.error("请求失败：",status,error);
@@ -222,7 +223,8 @@
     function closeD(){
         $('#closeButton').hide();
         $('#bootstrap-table-details').bootstrapTable('destroy');
-        $('#bootstrap-table').show();
+        // $('#bootstrap-table').show();
+        $('#bootstrap-table, .fixed-table-pagination').show();
     }
     function deptRest(n){
         $('form').eq(0).trigger("reset");
@@ -231,7 +233,7 @@
     function downloadD(){
         var currentId=$('form').eq(0).attr('id');
         var params = $.common.formToJSON(currentId);
-        $.ajax({
+/*        $.ajax({
             type: "POST",
             data: JSON.stringify(params),
             contentType: 'application/json',
@@ -248,7 +250,26 @@
                 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!== '') {
+/*                    // 对属性名和属性值进行 URL 编码
+                    var encodedKey = encodeURIComponent(key);
+                    var encodedValue = encodeURIComponent(value);
+                    // 拼接属性名和属性值
+                    paramsList.push(encodedKey + '=' + encodedValue);*/
+                    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/DeptStaticController.java

@@ -23,6 +23,7 @@ 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.util.ArrayList;
@@ -103,9 +104,9 @@ public class DeptStaticController extends BaseController {
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.getZfryjdmListByCode(zfryjdm2405301);
         return getDataTable(zfryjdm2405301List);
     }
-    @PostMapping("/export")
+    @GetMapping("/export")
     @ResponseBody
-    public void exportDept(HttpServletResponse httpServletResponse, @RequestBody Zfryjdm2405301 zfryjdm2405301) throws IOException {
+    public void exportDept(HttpServletResponse httpServletResponse,Zfryjdm2405301 zfryjdm2405301) throws IOException {
         /*List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209
         for(int i=0;i<zfryjdm2405301List.size();i++){
             if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
@@ -155,11 +156,19 @@ public class DeptStaticController extends BaseController {
             cell3.setCellValue(zfryjdm2405301List.get(i).getZfcode());
             cell4.setCellValue(zfryjdm2405301List.get(i).getPhoneNumber());
         }
-        httpServletResponse.setCharacterEncoding("UTF-8");
+/*        httpServletResponse.setCharacterEncoding("UTF-8");
         httpServletResponse.setContentType("application/vnd.ms-excel");
         httpServletResponse.setHeader("Content-disposition", "attachment;filename=" + fileName);
         httpServletResponse.flushBuffer();
         workbook.write(httpServletResponse.getOutputStream());
+        workbook.close();*/
+        httpServletResponse.setCharacterEncoding("UTF-8");
+        httpServletResponse.setContentType("application/vnd.ms-excel");
+        httpServletResponse.addHeader("content-Disposition", "attachment;filename=" + fileName);
+//创建一个输出流
+        ServletOutputStream outputStream = httpServletResponse.getOutputStream();
+        workbook.write(outputStream);
+        httpServletResponse.flushBuffer();
         workbook.close();
     }
 }

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

@@ -45,6 +45,7 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
             if(ancestorList.size()>0){
                 hasList.add(zfztjdm111915List.get(i));
             }
+            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
         }
         if((zfryjdm2405301.getName()!=null&&!zfryjdm2405301.getName().equals(""))||(zfryjdm2405301.getZfcode()!=null&&!zfryjdm2405301.getZfcode().equals(""))){
             return hasList;
@@ -63,6 +64,7 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
             List<Zfryjdm2405301> ancestorList=zfryjdm2405301List.stream().filter(item->ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
             totalNumber=totalNumber+ancestorList.size();
             zfztjdm111915List.get(i).setNumber(ancestorList.size());
+            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
         }
         return totalNumber;
     }
@@ -91,6 +93,7 @@ public class Zfztjdm111915ServiceImpl implements IZfztjdm111915Service {
             if(ancestorList.size()>0){
                 hasList.addAll(ancestorList);
             }
+            zfryjdm2405301List=zfryjdm2405301List.stream().filter(item->!ancestorHasIt(item.getAncestors(),zfztjdm111915List.get(j).getDeptId(),item.getDeptId())).collect(Collectors.toList());
         }
         if((zfryjdm2405301.getName()!=null&&!zfryjdm2405301.getName().equals(""))||(zfryjdm2405301.getZfcode()!=null&&!zfryjdm2405301.getZfcode().equals(""))){
             return hasList;