From 3a547b90aaf4abf7bb3860a428ef7f37b72706d6 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Wed, 12 Feb 2025 10:02:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9-=E5=AF=BC=E6=95=B0+?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/code/deptStatic/deptStatic.html | 33 +++++++++++++++---- .../code/controller/DeptStaticController.java | 33 ++++++++++++------- .../impl/Zfztjdm111915ServiceImpl.java | 3 ++ 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html index 42cd5644..4df4542d 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html +++ b/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("&") } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java index a466505f..544cec4c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java +++ b/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,16 +104,16 @@ public class DeptStaticController extends BaseController { List 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 zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);//待权限1209 for(int i=0;i11) { zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber())); } }*/ - List zfryjdm2405301List=iZfztjdm111915Service.export(zfryjdm2405301); + List zfryjdm2405301List = iZfztjdm111915Service.export(zfryjdm2405301); HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet("部门统计"); //设置文件名称 @@ -120,11 +121,11 @@ public class DeptStaticController extends BaseController { //自适应列宽 sheet.setDefaultColumnWidth(20);//全局 //表头样式 - HSSFFont font2=workbook.createFont(); + HSSFFont font2 = workbook.createFont(); font2.setFontName("微软雅黑"); font2.setBold(true); font2.setFontHeightInPoints((short) 11); - HSSFCellStyle styleRow2=workbook.createCellStyle(); + HSSFCellStyle styleRow2 = workbook.createCellStyle(); styleRow2.setWrapText(true);//换行 styleRow2.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); styleRow2.setFillPattern(FillPatternType.SOLID_FOREGROUND); @@ -144,22 +145,30 @@ public class DeptStaticController extends BaseController { cell.setCellValue(text); cell.setCellStyle(styleRow2); } - for(int i=0;i 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;