chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

统计

v4
zouyx 2 years ago
parent
072c0326cf
commit
5c4c81b067
12 changed files with 58 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/fragmentW.html
  2. 7
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html
  3. 6
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
  4. 6
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html
  5. 4
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
  6. 7
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
  7. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  8. 8
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/fragmentE.html
  9. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
  10. 37
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  11. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java
  12. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java

6
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/fragmentW.html
View File

@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8">
<li id="fragmentW" th:fragment="fragmentW">
<p th:text="|${year}年|"></p>
<p th:text="|投诉数量 ${Number1}|"></p>
<p th:text="|投诉对象 ${Number2}|"></p>
<p th:text="|${year}年:|"></p>
<p><label th:text="预警次数"></label><b th:text="${Number1}"></b></p>
<p></i><label th:text="涉事单位"></label><b th:text="${Number2}"></b></p>
</li>
</head>
<body>

7
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/StatisticsWarning/statisticsWarning.html
View File

@ -61,13 +61,6 @@
<a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
</li>
</ul>
<!--<ul>
<li id="fragmentW" th:fragment="fragmentW">
<p th:text="|${year}年|"></p>
<p th:text="|投诉数量 ${Number1}|"></p>
<p th:text="|投诉对象 ${Number2}|"></p>
</li>
</ul>-->
<div class="static-content">
<ul>
<li id="fragmentW" th:fragment="fragmentW">

6
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
View File

@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8">
<li id="complaintA" th:fragment="complaintA">
<p th:text="|${year}年|"></p>
<p th:text="|投诉数量 ${Number1}|"></p>
<p th:text="|投诉对象 ${Number2}|"></p>
<p th:text="|${year}年:|"></p>
<p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p>
<p></i><label th:text="投诉对象"></label><b th:text="${Number2}"></b></p>
</li>
</head>
<body>

6
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintB.html
View File

@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8">
<li id="complaintB" th:fragment="complaintB">
<p th:text="|${year}年|"></p>
<p th:text="|投诉数量 ${Number3}|"></p>
<p th:text="|占比总计 ${dou}|"></p>
<p th:text="|${year}年:|"></p>
<p><label th:text="投诉数量"></label><b th:text="${Number3}"></b></p>
<p></i><label th:text="占比总计"></label><b th:text="${dou}"></b></p>
</li>
</head>
<body>

4
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
View File

@ -390,9 +390,9 @@
var option3 = {
color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'],
tooltip: {},
/*legend: {
legend: {
data: ['投诉类型统计']
},*/
},
series: [
{
name: '投诉类型统计',

7
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
View File

@ -3,10 +3,13 @@
<head>
<meta charset="UTF-8">
<li th:fragment="a">
<p th:text="|联合检查 ${unite}|"></p>
<!--<p th:text="|联合检查 ${unite}|"></p>
<p th:text="|占比 ${uniteDouble}|"></p>
<p th:text="|${check} ${checkNumber}|"></p>
<p th:text="|占比 ${checkDouble}|"></p>
<p th:text="|占比 ${checkDouble}|"></p>-->
<p th:text="|${year}年:|"></p>
<p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
<p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
</li>
</head>
<body>

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
View File

@ -141,7 +141,7 @@
<p th:text="|占比 ${checkDouble}|"></p>
</li>-->
<li id="a" th:fragment="a">
<p>2024年:</p>
<p th:text="|${year}年:|"></p>
<p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
<p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
</li>

8
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/fragmentE.html
View File

@ -2,10 +2,10 @@
<html lang="en">
<head>
<li th:fragment="fragmentE">
<p th:text="全市"></p>
<p th:text="|企业数量 ${number}|"></p>
<p th:text="|续存企业数量 ${exist}|"></p>
<p th:text="|注销企业数量 ${logout}|"></p>
<p th:text="${qyJd}"></p>
<p><label th:text="企业数量"></label><b th:text="${number}"></b></p>
<p></i><label th:text="续存企业数量"></label><b th:text="${exist}"></b></p>
<p></i><label th:text="注销企业数量"></label><b th:text="${logout}"></b></p>
</li>
</head>
<body>

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
View File

@ -342,7 +342,7 @@
var currentId=$('form').eq(1).attr('id');
var params = $.common.formToJSON(currentId);
$.ajax({
url:prefix+'/searchType',
url:prefix+'/search',
type:'GET',
data:params,
success: function (response) {

37
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
View File

@ -1,6 +1,7 @@
package com.zdxt.code.controller;
import java.lang.reflect.Array;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
@ -61,7 +62,9 @@ public class EnforcementRegistrationController extends BaseController
@RequiresPermissions("code:registration:view")
@GetMapping()
public String registration(Model model)
{ LocalDate localDate=LocalDate.now();
{
DecimalFormat str1=new DecimalFormat("0.00%");
LocalDate localDate=LocalDate.now();
DateTimeFormatter str=DateTimeFormatter.ofPattern("yyyy-MM-dd");
EnforcementRegistration enforcementRegistration =new EnforcementRegistration();
LocalDate beginTime=localDate.withYear(Integer.valueOf(localDate.getYear())).withMonth(1).withDayOfMonth(1);
@ -72,12 +75,25 @@ public class EnforcementRegistrationController extends BaseController
List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
List<EnforcementRegistration> checkList=list.stream().filter(item->item.getCheckCategory()!=null&&!"".equals(item.getCheckCategory())&&item.getCheckCategory().equals("01")).collect(Collectors.toList());
String checkName=iDictDataService.selectDictLabel("check_category","01");
model.addAttribute("year",localDate.getYear());
model.addAttribute("yearList",yearMake());
model.addAttribute("unite",uniteList.size());
model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));
/*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/
String uniteDouble=str1.format((double)uniteList.size()/list.size());
if(uniteDouble.equals("NaN")){
model.addAttribute("uniteDouble","-");
}else {
model.addAttribute("uniteDouble", uniteDouble);
}
model.addAttribute("check",checkName);//！！
model.addAttribute("checkNumber",checkList.size());
model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));
/*model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));*/
String checkDouble=str1.format((double)checkList.size()/list.size());
if(checkDouble.equals("NaN")){
model.addAttribute("checkDouble","-");
}else {
model.addAttribute("checkDouble", checkDouble);
}
return prefix + "/registration";
}
@ -132,6 +148,7 @@ public class EnforcementRegistrationController extends BaseController
@GetMapping("/searchType")
public String searchType(EnforcementRegistration enforcementRegistration,Model model)
{
model.addAttribute("year",enforcementRegistration.getYear());
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
System.out.println(1);
List<EnforcementRegistration> uniteList=list.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList());
@ -145,10 +162,20 @@ public class EnforcementRegistrationController extends BaseController
checkName = iDictDataService.selectDictLabel("check_category", "01");
}
model.addAttribute("unite",uniteList.size());
model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));
String uniteDouble=String.format("%.3f",((double)uniteList.size()/list.size()));
if(uniteDouble.equals("NaN")){
model.addAttribute("uniteDouble","-");
}else {
model.addAttribute("uniteDouble", uniteDouble);
}
model.addAttribute("check",checkName);
model.addAttribute("checkNumber",checkList.size());
model.addAttribute("checkDouble",String.format("%.3f",((double)checkList.size()/list.size())));
String checkDouble=String.format("%.3f",((double)checkList.size()/list.size()));
if(checkDouble.equals("NaN")){
model.addAttribute("checkDouble","-");
}else {
model.addAttribute("checkDouble", checkDouble);
}
return prefix+"/fragmentA";
}

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java
View File

@ -61,6 +61,8 @@ public class StatisticsEnterpriseController extends BaseController {
String jd = iDictDataService.selectDictLabel(searchType.getQy(), searchType.getJd());
enterpriseInformation.setEnterpriseAddress("深圳市" + qy + jd);
}
String qyJd=enterpriseInformation.getEnterpriseAddress().substring(3);
model.addAttribute("qyJd",enterpriseInformation.getEnterpriseAddress().substring(3));
if (qy.equals("光明区")) {
//光明区
enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation);
@ -77,6 +79,7 @@ public class StatisticsEnterpriseController extends BaseController {
enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation);
}
}else {
model.addAttribute("qyJd", "全市");
enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
}
List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java
View File

@ -89,7 +89,7 @@ public class StatisticsWarningController extends BaseController {
List<LawEnforcementWarningList> listList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(lawEnforcementWarningList);
model.addAttribute("year",searchType.getYear());
/*model.addAttribute("Number1",Number1);*/
model.addAttribute("Number1",listList);
model.addAttribute("Number1",listList.size());
/*model.addAttribute("Number2",lawEnforcementWarningListList.size());*/
Map<String,Long> map=lawEnforcementWarningListList.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting()));
model.addAttribute("Number2",map.size());

Write Preview
Loading…
Cancel
Save