diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java index b945388c..300ab819 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementCheckStatisticsController.java @@ -3,6 +3,7 @@ package com.zdxt.code.controller; import cn.hutool.http.server.HttpServerResponse; import com.zdxt.code.domain.EnforcementCheckStatistics; +import com.zdxt.code.domain.EnforcementRegistration; import com.zdxt.code.domain.EnterpriseStreet; import com.zdxt.code.service.EnforcementCheckStatisticsService; import com.zdxt.common.ZDResponse; @@ -27,6 +28,8 @@ import java.io.File; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.Charset; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -48,8 +51,7 @@ public class EnforcementCheckStatisticsController extends BaseController { @GetMapping ("/queryList/{year}/{month}") @ResponseBody - public void queryList(HttpServletResponse response, @PathVariable String year, @PathVariable List month) - {//以执法主体维度统计 + public void queryList(HttpServletResponse response, @PathVariable String year, @PathVariable List month) throws ParseException {//以执法主体维度统计 EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics(); String month1=StringUtils.join(month,","); enforcementCheckStatistics.setYear(year); @@ -90,14 +92,16 @@ public class EnforcementCheckStatisticsController extends BaseController { enforcementCheckStatisticsService.excelExport2(response,enterpriseStreetList,enterpriseAddress); } - @GetMapping ("/queryAllList/{year}/{month}") + @GetMapping ("/queryAllList/{startTime}/{endTime}") @ResponseBody - public void queryAllList(HttpServletResponse response, @PathVariable String year, @PathVariable List month) - {//以企业维度统计 + public void queryAllList(HttpServletResponse response, @PathVariable String startTime, @PathVariable String endTime) throws ParseException {//以企业维度统计 EnforcementCheckStatistics enforcementCheckStatistics=new EnforcementCheckStatistics(); - String month1=StringUtils.join(month,","); +/* String month1=StringUtils.join(month,","); enforcementCheckStatistics.setYear(year); - enforcementCheckStatistics.setMonth(month1); + enforcementCheckStatistics.setMonth(month1);*/ + enforcementCheckStatistics.setStartTime(startTime); + enforcementCheckStatistics.setEndTime(endTime); + enforcementCheckStatistics.setNowTime(new Date()); List enforcementCheckStatisticsList=enforcementCheckStatisticsService.selectAllStatisticsList(enforcementCheckStatistics); List inOrderList=new ArrayList<>(); Collections.addAll(inOrderList,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区", diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java index 18ed41b1..04c32aef 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementCheckStatistics.java @@ -42,4 +42,10 @@ public class EnforcementCheckStatistics extends BaseDomain { private String month; /** 企业地址 */ private String enterpriseAddress; + /** 起始时间 */ + private String startTime; + /** 结束时间 */ + private String endTime; + /** 当前时间 */ + private Date nowTime; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/EnforcementCheckStatisticsService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/EnforcementCheckStatisticsService.java index 85a29a7e..c2f3ade9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/EnforcementCheckStatisticsService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/EnforcementCheckStatisticsService.java @@ -1,11 +1,10 @@ package com.zdxt.code.service; -import com.zdxt.code.domain.EnforcementCheckStatistics; -import com.zdxt.code.domain.EnterpriseComplaint; -import com.zdxt.code.domain.EnterpriseStreet; -import com.zdxt.code.domain.StatisticsIndicator; +import com.zdxt.code.domain.*; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.util.Calendar; import java.util.List; import java.util.Map; @@ -50,7 +49,7 @@ public interface EnforcementCheckStatisticsService { /** *excel导出(执法监督码使用情况) */ - public void excelExport(HttpServletResponse response, EnforcementCheckStatistics enforcementCheckStatistics, List areaAllList, Map> list, List enterpriseStreet); + public void excelExport(HttpServletResponse response, EnforcementCheckStatistics enforcementCheckStatistics, List areaAllList, Map> list, List enterpriseStreet) throws ParseException; /** *excel导出(企业信息) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java index 2df0a99c..8e372abf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java @@ -21,6 +21,8 @@ import sun.util.logging.resources.logging; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -59,6 +61,54 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic cell.setCellStyle(styleRow3); } } + private void setStyle1(int c1,String c2,String c3,String c4,String c5,String c6,long c7,long c8,long c9,long c10,long c11,String c12,HSSFRow row,HSSFCellStyle styleRow3){ + HSSFCell cell1= row.createCell(0); + cell1.setCellValue(c1); + cell1.setCellStyle(styleRow3); + HSSFCell cell2= row.createCell(1); + cell2.setCellValue(c2); + cell2.setCellStyle(styleRow3); + HSSFCell cell3= row.createCell(2); + cell3.setCellValue(c3); + cell3.setCellStyle(styleRow3); + HSSFCell cell4= row.createCell(3); + cell4.setCellValue(c4); + cell4.setCellStyle(styleRow3); + HSSFCell cell5= row.createCell(4); + cell5.setCellValue(c5); + cell5.setCellStyle(styleRow3); + HSSFCell cell6= row.createCell(5); + cell6.setCellValue(c6); + cell6.setCellStyle(styleRow3); + HSSFCell cell7 = row.createCell(6); + cell7.setCellStyle(styleRow3); + if(c7!=0) { + cell7.setCellValue(c7); + } + HSSFCell cell8 = row.createCell(7); + cell8.setCellStyle(styleRow3); + if(c8!=0) { + cell8.setCellValue(c8); + } + HSSFCell cell9 = row.createCell(8); + cell9.setCellStyle(styleRow3); + if(c9!=0) { + cell9.setCellValue(c9); + } + HSSFCell cell10 = row.createCell(9); + cell10.setCellStyle(styleRow3); + if(c10!=0) { + cell10.setCellValue(c10); + } + HSSFCell cell11 = row.createCell(10); + cell11.setCellStyle(styleRow3); + if(c11!=0) { + cell11.setCellValue(c11); + } + HSSFCell cell12= row.createCell(11); + cell12.setCellValue(c12); + cell12.setCellStyle(styleRow3); + } /** *为合并的单元格修正样式 */ @@ -138,17 +188,18 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic *导出excel */ @Override - public void excelExport(HttpServletResponse response, EnforcementCheckStatistics enforcementCheckStatistics, List inOrderList, Map> list,List enterpriseStreet){ + public void excelExport(HttpServletResponse response, EnforcementCheckStatistics enforcementCheckStatistics, List inOrderList, Map> list,List enterpriseStreet) throws ParseException { //创建HSSFWorkbook对象（excel文档对象） HSSFWorkbook wb=new HSSFWorkbook(); //建立新的sheet对象（sheet：表单） - HSSFSheet sheet= wb.createSheet("行政执法检查统计"+enforcementCheckStatistics.getMonth()+"月"); + HSSFSheet sheet= wb.createSheet("行政执法检查统计"); //自适应列宽 sheet.setDefaultColumnWidth(20);//全局 sheet.setColumnWidth(0,2500);//某列 sheet.setColumnWidth(1,2500); //在sheet里创建第一行，参数为excel行数，0~65535 HSSFRow row1=sheet.createRow(0); + row1.setHeightInPoints(60); //字体样式 HSSFFont font1=wb.createFont(); font1.setFontName("微软雅黑"); @@ -197,7 +248,15 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic //创建单元格，参数为列数，0~255 HSSFCell cell1=row1.createCell(0); //修改单元格内容 - cell1.setCellValue(enforcementCheckStatistics.getMonth()+"月行政执法检查统计"); + //（统计范围：8月14日至9月23日 统计时间：2024年9月23日 11时30分 企业赋码总数量：10697家） + SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sYear=new SimpleDateFormat("yyyy"); + SimpleDateFormat sMonther=new SimpleDateFormat("MM"); + SimpleDateFormat sDay=new SimpleDateFormat("dd"); + String strStart=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getStartTime()))+"日"; + String strEnd=sMonther.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"月"+sDay.format(simpleDateFormat.parse(enforcementCheckStatistics.getEndTime()))+"日"; + String strNow=sYear.format(enforcementCheckStatistics.getNowTime())+"年"+sMonther.format(enforcementCheckStatistics.getNowTime())+"月"+sDay.format(enforcementCheckStatistics.getNowTime())+"日 "+enforcementCheckStatistics.getNowTime().getHours()+"时"+enforcementCheckStatistics.getNowTime().getMinutes()+"分"; + cell1.setCellValue("月行政执法检查统计\n（统计范围："+strStart+"至"+strEnd+" 统计时间："+strNow+" 企业赋码总数量："+enterpriseStreet.size()+"家"); //将单元格样式应用到该单元格 cell1.setCellStyle(styleRow1); //合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列) @@ -235,7 +294,10 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic Collections.addAll(cellList,""+(i+1),area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(), qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),"1", "1","","","",qyGroup2.get(k).get(0).getRemark()); - setStyle(cellList,row,styleRow3); + //setStyle(cellList,row,styleRow3); + setStyle1(i+1,area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(), + qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),1,1,0,0,0, + qyGroup2.get(k).get(0).getRemark(),row,styleRow3); }else { sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业 sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),7,7)); @@ -261,20 +323,32 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1", ""+qyGroup1.get(k),"","","",zfGroup2.get(zf).get(0).getRemark()); + setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), + zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1,qyGroup1.get(k), + 0,0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3); } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) { Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1", "",""+qyGroup1.get(k),"","",zfGroup2.get(zf).get(0).getRemark()); + setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), + zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1, + 0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3); } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) { Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1", "","",""+qyGroup1.get(k),"",zfGroup2.get(zf).get(0).getRemark()); + setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), + zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1, + 0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3); }else { Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),"1", "","","",""+qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark()); + setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(), + zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),1, + 0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark(),row,styleRow3); } - setStyle(cellList,row,styleRow3); + //setStyle(cellList,row,styleRow3); }else{ sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+zfGroup1.get(zf)),3,3));//合并执法 hbStyle(rowNum+1, (int) (rowNum+zfGroup1.get(zf)),3,3,sheet); @@ -291,20 +365,32 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1", ""+qyGroup1.get(k),"","","",ryGroup2.get(ry).get(0).getRemark()); + setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), + ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1, + qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3); } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) { Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1", "",""+qyGroup1.get(k),"","",ryGroup2.get(ry).get(0).getRemark()); + setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), + ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1, + 0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3); } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) { Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1", "","",""+qyGroup1.get(k),"",ryGroup2.get(ry).get(0).getRemark()); + setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), + ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1, + 0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3); }else { Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),"1", "","","",""+qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark()); + setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(), + ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),1, + 0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark(),row,styleRow3); } - setStyle(cellList,row,styleRow3); + //setStyle(cellList,row,styleRow3); }else { sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+ryGroup1.get(ry)),4,4));//合并人员 hbStyle(rowNum+1, (int) (rowNum+ryGroup1.get(ry)),4,4,sheet); @@ -320,20 +406,32 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"", ""+qyGroup1.get(k),"","","",sxGroup2.get(sx).get(0).getRemark()); + setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), + sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx), + qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3); } else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) { Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"", "",""+qyGroup1.get(k),"","",sxGroup2.get(sx).get(0).getRemark()); + setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), + sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx), + 0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3); } else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) { Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"", "","",""+qyGroup1.get(k),"",sxGroup2.get(sx).get(0).getRemark()); + setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), + sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx), + 0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3); }else { Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx)+"", "","","",""+qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark()); + setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(), + sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup1.get(sx), + 0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark(),row,styleRow3); } - setStyle(cellList,row,styleRow3); + //setStyle(cellList,row,styleRow3); if (sxGroup1.get(sx) >= 2) { sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 5, 5));//合并事项 sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 6, 6)); @@ -463,14 +561,15 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic //输出Excel文件 try { //wb.write(new File("D:/code/执法监督码使用情况统计.xls")); - FileOutputStream foutputStream = new FileOutputStream("执法监督码使用情况统计.xls"); + String string="执法监督码"+strStart+"至"+strEnd+"使用情况.xls"; + FileOutputStream foutputStream = new FileOutputStream(string); wb.write(foutputStream); wb.close(); foutputStream.close(); response.setContentType("application/x-xls"); - response.setHeader("Content-Disposition", "attachment; filename="+ URLEncoder.encode("执法监督码使用情况统计.xls","utf-8")); + response.setHeader("Content-Disposition", "attachment; filename="+ URLEncoder.encode(string,"utf-8")); OutputStream outputStream = response.getOutputStream(); - FileInputStream fileInputStream = new FileInputStream(new File("执法监督码使用情况统计.xls")); + FileInputStream fileInputStream = new FileInputStream(new File(string)); int length; byte[] buffer = new byte[1024]; while ((length = fileInputStream.read(buffer)) > 0) { @@ -478,7 +577,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic } fileInputStream.close(); outputStream.flush(); - File file=new File("执法监督码使用情况统计.xls"); + File file=new File(string); if(file.delete()){ System.out.println("本地删除成功"); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml index 79536c78..d30442fe 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml @@ -53,8 +53,14 @@ inner join sys_dept s on e.law_enforcement_id=s.dept_id inner join enterprise_information i on e.enterprise_number=i.enterprise_number - and year(e.create_time)=#{year} - and month(e.create_time)in(${month}) + and (e.enterprise_number not like "92440300MACQUM2M9C" + or e.enterprise_number is null) + + and DATE_FORMAT(e.create_time,'%Y-%m-%d') >= STR_TO_DATE(#{startTime},'%Y-%m-%d') + + + and DATE_FORMAT(e.create_time,'%Y-%m-%d') <= STR_TO_DATE(#{endTime},'%Y-%m-%d') + order by e.enterprise_name