diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java index 175168b9..55aba1d1 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java @@ -1,6 +1,7 @@ package com.zdxt.app.controller; +import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; import com.zdxt.auth.project.system.dept.mapper.DeptMapper; import com.zdxt.auth.project.system.user.mapper.UserMapper; @@ -259,14 +260,22 @@ public class AppEnforcementCheckStatisticsController extends BaseController { if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){ searchType.setEndTime("0"); } - Long userId=searchType.getUserId(); - String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); - String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); - /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber(); - String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/ - searchType.setUserId(null); - searchType.setBureauDeptId(deptId); - List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); - return ZDResponse.success("成功",statisticsIndicatorPartList); + if(searchType.getUserId()!=null){ + Long userId=searchType.getUserId(); + String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); + if(!StrUtil.hasEmpty(lawCertificateNum)){ + String zzjgdm=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + if(!StrUtil.hasEmpty(zzjgdm)){ + String deptId=deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId();//通过creditcode=zzjgdm查找出对应的deptid + if(!StrUtil.hasEmpty(deptId)) { + searchType.setUserId(null); + searchType.setBureauDeptId(deptId); + List statisticsIndicatorPartList = enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); + return ZDResponse.success("成功", statisticsIndicatorPartList); + } + } + } + } + return ZDResponse.success("该执法人员执法部门为空"); } } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html index 4f4b4bb2..7d5be57e 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html @@ -902,7 +902,6 @@ ydata12.push(e.monthTotal12) }); } - debugger option={ color:["#2d4beb","#03a978",], legend: { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html index e48a9050..c997ed4f 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html @@ -191,7 +191,11 @@ field : 'name', title : '区域', formatter:function (value,row,index) { - return ''+value+''; + if(value=="其他"){ + return ''+value+''; + }else { + return '' + value + ''; + } } }, { @@ -432,6 +436,18 @@ { field : 'name', title : '街道', + formatter:function (value,row,index) { + var obj=document.getElementById("jd"); + var options=obj.options; + var index=obj.selectedIndex; + console.log(obj.options[obj.selectedIndex].text); + if(value==obj.options[obj.selectedIndex].text){ + return ''+value+'' + }else { + return value; + } + } + }, { field : 'totalNumber', 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 38010ed0..a73cc6a8 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 @@ -217,15 +217,23 @@ public class EnforcementCheckStatisticsController extends BaseController { if(searchType.getEndTime()==null||"".equals(searchType.getEndTime())){ searchType.setEndTime("0"); } - Long userId=searchType.getUserId(); - String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); - String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();//待修改，组织机构代码非deptId - /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber(); - String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/ - searchType.setUserId(null); - searchType.setBureauDeptId(deptId); - List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); - return ZDResponse.success("成功",statisticsIndicatorPartList); + if(searchType.getUserId()!=null && !"".equals(searchType.getcType())){ + Long userId=searchType.getUserId(); + String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); + if(lawCertificateNum!=null && !"".equals(lawCertificateNum)){ + String zzjgdm=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + if(zzjgdm!=null && !"".equals(zzjgdm)){ + String deptId=deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId();//通过creditcode=zzjgdm查找出对应的deptid + if(deptId!=null && !"".equals(deptId)) { + searchType.setUserId(null); + searchType.setBureauDeptId(deptId); + List statisticsIndicatorPartList = enforcementCheckStatisticsService.statisticsIndicatorPart3(searchType); + return ZDResponse.success("成功", statisticsIndicatorPartList); + } + } + } + } + return ZDResponse.success("该执法人员执法部门为空"); } @PostMapping("/zfjdm") diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java index 1b763c24..904a419d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticsEnterpriseServiceImpl.java @@ -263,37 +263,39 @@ public class StatisticsEnterpriseServiceImpl implements StatisticsEnterpriseServ s1row.createCell(2).setCellValue(s.getNumInt()); s1row.createCell(3).setCellValue(s.getValue()); qyRowNum++; - //街道页 - HSSFSheet sheet = workbook.createSheet(s.getName()); - sheet.setDefaultColumnWidth(20);//全局 - //设置表头 - String[] hList = {"区域", "街道", "企业数量", "续存企业数量","注销企业数量"}; - int jdRowNum=0; - HSSFRow hRow = sheet.createRow(jdRowNum); - jdRowNum++; - for (int i = 0; i < hList.length; i++) { - HSSFCell hCell = hRow.createCell(i); - HSSFRichTextString text = new HSSFRichTextString(hList[i]); - hCell.setCellValue(text); - hCell.setCellStyle(styleRow2); - } - List jdList=new ArrayList<>(); - if(searchType.getJd()!=null&&!"".equals(searchType.getJd())){ - jdList=jdListByJD(searchType); - }else { - SearchType searchType1=new SearchType(); - searchType1.setName(s.getName()); - jdList=iEnterpriseInformationService.enterpriseInformationAllListToJD(searchType1); - } - if(jdList.size()>0) { - for (StatisticsIndicator sjd : jdList) { - HSSFRow row = sheet.createRow(jdRowNum); - row.createCell(0).setCellValue(sjd.getAddress()); - row.createCell(1).setCellValue(sjd.getName()); - row.createCell(2).setCellValue(sjd.getTotalNumber()); - row.createCell(3).setCellValue(sjd.getNumInt()); - row.createCell(4).setCellValue(sjd.getValue()); - jdRowNum++; + if(!s.getName().equals("其他")) { + //街道页 + HSSFSheet sheet = workbook.createSheet(s.getName()); + sheet.setDefaultColumnWidth(20);//全局 + //设置表头 + String[] hList = {"区域", "街道", "企业数量", "续存企业数量", "注销企业数量"}; + int jdRowNum = 0; + HSSFRow hRow = sheet.createRow(jdRowNum); + jdRowNum++; + for (int i = 0; i < hList.length; i++) { + HSSFCell hCell = hRow.createCell(i); + HSSFRichTextString text = new HSSFRichTextString(hList[i]); + hCell.setCellValue(text); + hCell.setCellStyle(styleRow2); + } + List jdList = new ArrayList<>(); + if (searchType.getJd() != null && !"".equals(searchType.getJd())) { + jdList = jdListByJD(searchType); + } else { + SearchType searchType1 = new SearchType(); + searchType1.setName(s.getName()); + jdList = iEnterpriseInformationService.enterpriseInformationAllListToJD(searchType1); + } + if (jdList.size() > 0) { + for (StatisticsIndicator sjd : jdList) { + HSSFRow row = sheet.createRow(jdRowNum); + row.createCell(0).setCellValue(sjd.getAddress()); + row.createCell(1).setCellValue(sjd.getName()); + row.createCell(2).setCellValue(sjd.getTotalNumber()); + row.createCell(3).setCellValue(sjd.getNumInt()); + row.createCell(4).setCellValue(sjd.getValue()); + jdRowNum++; + } } } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index b8b06375..849acbab 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -713,6 +713,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ( SELECT * FROM enforcement_registration + and bureau_dept_name is not null + and law_enforcement_id is not null + and enterprise_name is not null + and enterprise_number is not null + and law_enforcer is not null + and law_enforcer_two is not null + and is_complaint is not null + and check_category is not null + and bureau_dept_id is not null AND enterprise_name like concat(concat('%',#{enterpriseName}),'%') @@ -747,7 +756,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC LIMIT 1000000000 ) t - GROUP BY t.bureau_dept_id + GROUP BY t.bureau_dept_id,concat(law_enforcer, law_enforcer_two),law_enforcement_item_text order by t.create_time