diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index e3f10cb6..9ff5ce51 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -54,7 +54,7 @@ update sys_dept 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 b765f527..b945388c 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 @@ -21,6 +21,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.xml.crypto.Data; import java.io.*; import java.io.File; import java.io.IOException; @@ -134,4 +135,24 @@ public class EnforcementCheckStatisticsController extends BaseController { public ZDResponse statisticsIndicator(){ return ZDResponse.success("统计成功", enforcementCheckStatisticsService.sjtjzb()); } + @GetMapping("/statisticsIndicator1") + @ResponseBody + public ZDResponse statisticsIndicator1(){ + return ZDResponse.success("企业维度统计成功",enforcementCheckStatisticsService.EnterpriseStatistics()); + } + @GetMapping("/statisticsIndicator2") + @ResponseBody + public ZDResponse statisticsIndicator2(){ + return ZDResponse.success("执法主体维度统计成功",enforcementCheckStatisticsService.EnforcementStatistics()); + } + @GetMapping("/statisticsIndicator3") + @ResponseBody + public ZDResponse statisticsIndicator3(){ + return ZDResponse.success("执法检查维度统计成功",enforcementCheckStatisticsService.CheckStatistics()); + } + @GetMapping("/statisticsIndicator4") + @ResponseBody + public ZDResponse statisticsIndicator4(){ + return ZDResponse.success("投诉维度统计成功",enforcementCheckStatisticsService.complaintStatistics()); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java index b73b6aff..28fa5b5d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicator.java @@ -11,6 +11,10 @@ public class StatisticsIndicator extends BaseDomain { private int numInt; private Double numDouble; private List statisticsIndicatorList; + private List enterpriseInformationList; + private List zfryjdm2405301List; + private List enforcementRegistrationList; + private List enterpriseComplaintList; public void setNumDouble(Double numDouble) { this.numDouble = new Double(String.format("%.3f",numDouble)); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java index aca78827..7ca9d2f4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseInformationMapper.java @@ -87,4 +87,11 @@ public interface EnterpriseInformationMapper * @return */ List selectEnterpriseInformationByName(String enterpriseName); + + /** + * 查询所有企业信息 + * @param + * @return list + */ + List selectEnterpriseInformationAll (); } 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 4bcdbcca..85a29a7e 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 @@ -61,5 +61,21 @@ public interface EnforcementCheckStatisticsService { *导出excel3 (数据统计指标) */ public List> sjtjzb(); + /** + *企业维度统计 + */ + public List EnterpriseStatistics(); + /** + *执法主体维度统计 + */ + public StatisticsIndicator EnforcementStatistics(); + /** + *执法检查维度统计 + */ + public StatisticsIndicator CheckStatistics(); + /** + *投诉维度统计 + */ + public StatisticsIndicator complaintStatistics(); } 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 c633edeb..2df0a99c 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 @@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; import static com.zdxt.common.util.StringUtils.substring; @@ -45,6 +46,8 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic private EnforcementRegistrationMapper enforcementRegistrationMapper; @Autowired private DictDataMapper dictDataMapper; + @Autowired + private Zfryjdm2405301Mapper zfryjdm2405301Mapper; /** *将样式应用到单元格 */ @@ -161,6 +164,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic //第一行样式 HSSFCellStyle styleRow1=wb.createCellStyle(); styleRow1.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); + styleRow1.setWrapText(true);//换行 styleRow1.setFillPattern(FillPatternType.SOLID_FOREGROUND); styleRow1.setAlignment(HorizontalAlignment.CENTER); styleRow1.setVerticalAlignment(VerticalAlignment.CENTER); @@ -767,7 +771,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic DictData dictData=new DictData(); dictData.setDictType("check_category"); List dictDataList=dictDataMapper.selectDictDataList(dictData); - MapdictDataMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictSort,DictData::getDictLabel)); + MapdictDataMap=dictDataList.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); ListxzjclbList=new ArrayList<>(); for(String s: xzjclbNumMap.keySet()){ if(s!=null){ @@ -985,4 +989,334 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic }*/ } + /** + * 企业指标页 + * @param + * @return list + */ + @Override + public List EnterpriseStatistics(){ + //一级--企业数量；二级--续存企业数量--注销企业数量--区企业数量--企业类型；三级指标--街道企业数量--企业类型数量 + List enterpriseInformationList=enterpriseInformationMapper.selectEnterpriseInformationAll(); + List statisticsIndicatorList=new ArrayList<>(); + StatisticsIndicator sEnterpriseAll=new StatisticsIndicator(); + sEnterpriseAll.setName("企业数量"); + sEnterpriseAll.setNumInt(enterpriseInformationList.size()); + //sEnterpriseAll.setEnterpriseInformationList(enterpriseInformationList); + statisticsIndicatorList.add(sEnterpriseAll); + //分出是否注销 0注销1续存 + Map> e1=enterpriseInformationList.stream().collect(Collectors.groupingBy(EnterpriseInformation::getIsDelete)); + if(e1.get(0)!=null){ + StatisticsIndicator sEnterprise0=new StatisticsIndicator(); + sEnterprise0.setName("续存企业数量"); + sEnterprise0.setNumInt(e1.get(0).size()); + //sEnterprise0.setEnterpriseInformationList(e1.get(0)); + statisticsIndicatorList.add(sEnterprise0); + } + if(e1.get(1)!=null){ + StatisticsIndicator sEnterprise1=new StatisticsIndicator(); + sEnterprise1.setName("注销企业数量"); + sEnterprise1.setNumInt(e1.get(1).size()); + //sEnterprise1.setEnterpriseInformationList(e1.get(1)); + statisticsIndicatorList.add(sEnterprise1); + } + //name:区->List:街道 + List inOrderList1=new ArrayList<>(); + Collections.addAll(inOrderList1,"深圳市福田区","深圳市罗湖区","深圳市盐田区","深圳市南山区","深圳市宝安区","深圳市龙岗区","深圳市龙华区", "深圳市坪山区","深圳市光明区","深圳市大鹏新区","深圳市深汕特别合作区"); + List inOrderList2=new ArrayList<>(); + Collections.addAll(inOrderList2,"福田区","罗湖区","盐田区","南山区","宝安区","龙岗区","龙华区", "坪山区","光明区","大鹏新区","深汕特别合作区"); + Map> qMap=enterpriseInformationList.stream().collect(Collectors.groupingBy(item->(inOrderList1.contains(item.getEnterpriseAddress().substring(0,6))?item.getEnterpriseAddress().substring(3,6):"其他"))); + List es1= qMap.get("其他").stream().filter(item->item.getEnterpriseAddress().substring(0,10).equals("深圳市深汕特别合作区")).collect(Collectors.toList()); + qMap.put("深汕特别合作区",es1); + List es2= qMap.get("其他").stream().filter(item->item.getEnterpriseAddress().substring(0,7).equals("深圳市大鹏新区")).collect(Collectors.toList()); + qMap.put("大鹏新区",es2); + List es3= qMap.get("其他").stream().filter(item->item.getEnterpriseAddress().substring(0,7).equals("深圳市光明新区")).collect(Collectors.toList()); + qMap.get("光明区").addAll(es3); + qMap.remove("其他"); + List e2=enterpriseInformationList.stream().filter(item->!( + item.getEnterpriseAddress().startsWith("深圳市福田区")||item.getEnterpriseAddress().startsWith("深圳市罗湖区")|| + item.getEnterpriseAddress().startsWith("深圳市盐田区")||item.getEnterpriseAddress().startsWith("深圳市南山区")|| + item.getEnterpriseAddress().startsWith("深圳市宝安区")||item.getEnterpriseAddress().startsWith("深圳市龙岗区")|| + item.getEnterpriseAddress().startsWith("深圳市龙华区")||item.getEnterpriseAddress().startsWith("深圳市坪山区")|| + item.getEnterpriseAddress().startsWith("深圳市大鹏新区")||item.getEnterpriseAddress().startsWith("深圳市深汕特别合作区")|| + item.getEnterpriseAddress().startsWith("深圳市光明区")||item.getEnterpriseAddress().startsWith("深圳市光明新区"))) + .collect(Collectors.toList()); + StatisticsIndicator sEnterpriseQ=new StatisticsIndicator(); + sEnterpriseQ.setName("区企业数量"); + List qList=new ArrayList<>(); + for(String s:inOrderList2){ + if(qMap.get(s)!=null){ + StatisticsIndicator q=new StatisticsIndicator(); + q.setName(s); + q.setNumInt(qMap.get(s).size()); + //q.setEnterpriseInformationList(qMap.get(s)); + Map> m=qMap.get(s).stream().collect(Collectors + .groupingBy(item->item.getEnterpriseAddress().contains("街道") + ? item.getEnterpriseAddress().substring(item.getEnterpriseAddress().indexOf("区") + 1, item.getEnterpriseAddress().indexOf("街道") + 2) + : "其他")); + List jdList=new ArrayList<>(); + for(String jd:m.keySet()){ + StatisticsIndicator jd1=new StatisticsIndicator(); + jd1.setName(jd); + jd1.setNumInt(m.get(jd).size()); + //jd1.setEnterpriseInformationList(m.get(jd)); + jdList.add(jd1); + } + q.setStatisticsIndicatorList(jdList); + qList.add(q); + } + } + + StatisticsIndicator sqt=new StatisticsIndicator(); + sqt.setName("其他"); + sqt.setNumInt(e2.size()); + qList.add(sqt); + sEnterpriseQ.setStatisticsIndicatorList(qList); + statisticsIndicatorList.add(sEnterpriseQ); + StatisticsIndicator sEnterpriseType=new StatisticsIndicator(); + List sEnterpriseTypeList=new ArrayList<>(); + Map> typeMap=enterpriseInformationList.stream().collect(Collectors.groupingBy(item->item.getCompanyOrgType()==null|| item.getCompanyOrgType().equals("") ?"空":item.getCompanyOrgType())); + for(String t:typeMap.keySet()){ + if(t!=null){ + StatisticsIndicator s=new StatisticsIndicator(); + s.setName(t); + s.setNumInt(typeMap.get(t).size()); + //s.setEnterpriseInformationList(typeMap.get(t)); + sEnterpriseTypeList.add(s); + } + } + sEnterpriseType.setName("企业类型"); + sEnterpriseType.setStatisticsIndicatorList(sEnterpriseTypeList); + statisticsIndicatorList.add(sEnterpriseType); + return statisticsIndicatorList; + } + /** + * 企业指标页 + * @param + * @return list + */ + @Override + public StatisticsIndicator EnforcementStatistics(){ + List statisticsIndicatorList=new ArrayList<>(); + List zfryjdm2405301List=zfryjdm2405301Mapper.selectZfryjdmList(""); + StatisticsIndicator sAll=new StatisticsIndicator(); + Map> zfztMap=zfryjdm2405301List.stream().collect(Collectors.groupingBy(item->item.getZfzzfdw()==null||item.getZfzzfdw().equals("")?"空":item.getZfzzfdw())); + List deptList=deptMapper.selectDeptList(new Dept()); + //Map deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); + Map deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Dept::getDeptName)); + List sList=new ArrayList<>(); + for(String s:zfztMap.keySet()){ + if(s!=null){ + StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); + if(s.equals("空")){ + statisticsIndicator.setName("空"); + statisticsIndicator.setNumInt(zfztMap.get(s).size()); + //statisticsIndicator.setZfryjdm2405301List(zfztMap.get(s)); + }else { + statisticsIndicator.setName(deptMap.get(s)); + statisticsIndicator.setNumInt(zfztMap.get(s).size()); + //statisticsIndicator.setZfryjdm2405301List(zfztMap.get(s)); + } + sList.add(statisticsIndicator); + } + } + sAll.setName("执法主体"); + sAll.setNumInt(zfryjdm2405301List.size()); + sAll.setStatisticsIndicatorList(sList); + //sAll.setZfryjdm2405301List(zfryjdm2405301List); + statisticsIndicatorList.add(sAll); + return sAll; + } + @Override + public StatisticsIndicator CheckStatistics(){ + List enforcementRegistrationList=enforcementRegistrationMapper.selectAllList(new EnforcementRegistration()); + StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); + statisticsIndicator.setName("执法检查数量"); + statisticsIndicator.setNumInt(enforcementRegistrationList.size()); + //statisticsIndicator.setEnforcementRegistrationList(enforcementRegistrationList); + //二级指标 + List statisticsIndicatorList=new ArrayList<>(); + StatisticsIndicator statisticsIndicator1=new StatisticsIndicator(); + //31 + List sList31=new ArrayList<>(); + Map> xzjclbMap=enforcementRegistrationList.stream().collect(Collectors.groupingBy(item->item.getCheckCategory()==null||item.getCheckCategory().equals("")?"空":item.getCheckCategory())); + DictData dictData1=new DictData(); + dictData1.setDictType("check_category"); + List dictDataList1=dictDataMapper.selectDictDataList(dictData1); + Map dictDataCCMap=dictDataList1.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + for(String s:xzjclbMap.keySet()){ + if(s!=null){ + StatisticsIndicator si=new StatisticsIndicator(); + if(dictDataCCMap.containsKey(s)){ + si.setName(dictDataCCMap.get(s)); + }else{ + si.setName(s); + } + si.setNumInt(xzjclbMap.get(s).size()); + //si.setEnforcementRegistrationList(xzjclbMap.get(s)); + sList31.add(si); + } + } + StatisticsIndicator s21=new StatisticsIndicator(); + s21.setName("行政检查计类别"); + s21.setNumInt(enforcementRegistrationList.size()); + s21.setStatisticsIndicatorList(sList31); + Map> zfztMap=enforcementRegistrationList.stream().collect(Collectors.groupingBy(item->item.getBureauDeptId()==null||item.getBureauDeptId().equals("")?"空":item.getBureauDeptId())); + List deptList=deptMapper.selectDeptAll(); + Map deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName)); + List sList32=new ArrayList<>();//存放执法主体1，执法主体2... + for(String s:zfztMap.keySet()){ + if(s!=null){ + StatisticsIndicator si=new StatisticsIndicator(); + if(deptMap.containsKey(s)){ + si.setName(deptMap.get(s)); + }else { + si.setName(s); + } + si.setNumInt(zfztMap.get(s).size()); + //si.setEnforcementRegistrationList(zfztMap.get(s)); + sList32.add(si); + } + } + StatisticsIndicator sList22=new StatisticsIndicator(); + sList22.setName("执法主体"); + sList22.setNumInt(enforcementRegistrationList.size()); + sList22.setStatisticsIndicatorList(sList32); + //扫码情况 + Map> smqkMap=enforcementRegistrationList.stream().collect(Collectors.groupingBy(item->item.getCheckCss()==null||item.getCheckCss().equals("")?"正常扫码":item.getCheckCss())); + if(smqkMap.containsKey("正常扫码")){ + smqkMap.remove("正常扫码"); + } + DictData dictData2=new DictData(); + dictData2.setDictType("no-scan-reason"); + List dictDataList2=dictDataMapper.selectDictDataList(dictData2); + Map dictDataReasonMap=dictDataList2.stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + ListsList33=new ArrayList<>(); + for(String s:smqkMap.keySet()){ + if(s!=null){ + StatisticsIndicator si=new StatisticsIndicator(); + if(dictDataReasonMap.containsKey(s)){ + si.setName(dictDataReasonMap.get(s)); + }else { + si.setName(s); + } + si.setNumInt(smqkMap.get(s).size()); + //si.setEnforcementRegistrationList(smqkMap.get(s)); + sList33.add(si); + } + } + StatisticsIndicator sList23=new StatisticsIndicator(); + sList23.setName("扫码情况"); + sList23.setStatisticsIndicatorList(sList33); + //投诉占比 + List sList34=new ArrayList<>();//存放被投诉，（未被投诉） + Map> tsMap=enforcementRegistrationList.stream().collect(Collectors.groupingBy(item->item.getIsComplaint()==null?0:item.getIsComplaint())); + StatisticsIndicator s1=new StatisticsIndicator(); + s1.setName("被投诉"); + if(tsMap.containsKey(1)){ + if(tsMap.get(1)!=null){ + s1.setNumInt(tsMap.get(1).size()); + Double num1=(double) tsMap.get(1).size()/enforcementRegistrationList.size(); + s1.setNumDouble(num1); + //s1.setEnforcementRegistrationList(tsMap.get(1)); + Map> zttsMap=tsMap.get(1).stream().collect(Collectors.groupingBy(item->item.getBureauDeptId()==null||item.getBureauDeptId().equals("")?"空":item.getBureauDeptId())); + List sList44=new ArrayList<>();//存放主体1投诉率，主体2投诉率 + for (String s:zttsMap.keySet()){ + if(s!=null){ + StatisticsIndicator si=new StatisticsIndicator(); + if(deptMap.containsKey(s)){ + si.setName(deptMap.get(s)); + }else { + si.setName(s); + } + si.setNumInt(zttsMap.get(s).size()); + Double num=(double) zttsMap.get(s).size()/tsMap.get(1).size(); + si.setNumDouble(num); + sList44.add(si); + //si.setEnforcementRegistrationList(zttsMap.get(s)); + } + } + s1.setStatisticsIndicatorList(sList44); + } + } + sList34.add(s1); + StatisticsIndicator sList24=new StatisticsIndicator(); + sList24.setName("各执法主体投诉"); + sList24.setNumInt(enforcementRegistrationList.size()); + sList24.setStatisticsIndicatorList(sList34); + List allList=new ArrayList<>(); + allList.add(s21); + allList.add(sList22); + allList.add(sList23); + allList.add(sList24); + statisticsIndicator.setStatisticsIndicatorList(allList); + return statisticsIndicator; + } + @Override + public StatisticsIndicator complaintStatistics(){ + StatisticsIndicator statisticsIndicator=new StatisticsIndicator(); + statisticsIndicator.setName("执法投诉"); + Map deptMap=deptMapper.selectDeptAll().stream().collect(Collectors.toMap(Dept::getDeptId,Dept::getDeptName)); + DictData dictData=new DictData(); + dictData.setDictType("caseType"); + Map dictDataCTMap=dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.toMap(DictData::getDictValue,DictData::getDictLabel)); + List enterpriseComplaintList=enterpriseComplaintMapper.selectEnterpriseComplaintList(new EnterpriseComplaint()); + int number=0;//总投诉数 + Map> booleanListMap=enterpriseComplaintList.stream().collect(Collectors.partitioningBy(item->item.getComplaintDepartmentIds()==null||item.getComplaintDepartmentIds().equals(""))); + number=number+booleanListMap.get(true).size(); + List idAllList=new ArrayList<>();//所有被投诉过的id + for(EnterpriseComplaint ec:booleanListMap.get(false)){ + if(ec.getComplaintDepartmentIds()!=null) { + List idList = Arrays.asList(ec.getComplaintDepartmentIds().split(",")); + for (String s : idList) { + if (idAllList.contains(s)) { + number++; + } else { + idAllList.add(s); + number++; + } + } + } + } + Map> idAllMap=new HashMap<>();//存放主体以及凡是有对应主体的数据 + idAllMap.put("空",booleanListMap.get(true)); + for(String s:idAllList){ + List e=booleanListMap.get(false).stream().filter(item->item.getComplaintDepartmentIds().contains(s)).collect(Collectors.toList()); + if(deptMap.containsKey(s)){ + idAllMap.put(deptMap.get(s),e); + }else { + idAllMap.put(s,e); + } + } + List sZtList=new ArrayList<>(); + for(String s:idAllMap.keySet()){ + if(s!=null){ + Map> lbMap=idAllMap.get(s).stream().collect(Collectors.groupingBy(item->item.getComplaintType()==null?100:item.getComplaintType())); + StatisticsIndicator sZt=new StatisticsIndicator(); + List sLbList=new ArrayList<>(); + for(int i:lbMap.keySet()){ + StatisticsIndicator sLb=new StatisticsIndicator(); + if(dictDataCTMap.containsKey(""+i)){ + sLb.setName(dictDataCTMap.get(""+i)); + }else if(i==100) { + sLb.setName("空"); + }else { + sLb.setName(""+i); + } + sLb.setNumInt(lbMap.get(i).size()); + //sLb.setEnterpriseComplaintList(lbMap.get(i)); + sLbList.add(sLb); + } + sZt.setName(s); + sZt.setNumInt(idAllMap.get(s).size()); + sZt.setStatisticsIndicatorList(sLbList); + //sZt.setEnterpriseComplaintList(idAllMap.get(s)); + sZtList.add(sZt); + } + } + statisticsIndicator.setNumInt(number); + //statisticsIndicator.setEnterpriseComplaintList(enterpriseComplaintList); + statisticsIndicator.setStatisticsIndicatorList(sZtList); + return statisticsIndicator; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml index bbac9858..707100f7 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -216,4 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_delete = order by create_time desc + \ No newline at end of file