Browse Source

统计修改

v4
zouyx 2 years ago
parent
commit
a8f493302d
  1. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html
  2. 6
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
  3. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html
  4. 84
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
  5. 80
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
  6. 68
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
  7. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/enterpriseFragment.html
  8. 23
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
  9. 12
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html
  10. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java
  11. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  12. 16
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java
  13. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
  14. 32
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintA.html

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

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

@ -39,7 +39,7 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<p>投诉对象:</p> <p>被投诉对象:</p>
<input type="text" name="name"/> <input type="text" name="name"/>
</li> </li>
<li> <li>
@ -102,7 +102,7 @@
<li id="complaintA" th:fragment="complaintA"> <li id="complaintA" th:fragment="complaintA">
<p th:text="|${year}年:|"></p> <p th:text="|${year}年:|"></p>
<p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p> <p><label th:text="投诉数量"></label><b th:text="${Number1}"></b></p>
<p></i><label th:text="投诉对象"></label><b th:text="${Number2}"></b></p> <p></i><label th:text="被投诉对象"></label><b th:text="${Number2}"></b></p>
</li> </li>
</ul> </ul>
@ -220,7 +220,7 @@
columns: [ columns: [
{ {
field : 'complaintDepartment', field : 'complaintDepartment',
title : '投诉对象' title : '被投诉对象'
}, },
{ {
field : 'complaintType', field : 'complaintType',

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/deptStatic/deptStatic.html

@ -83,7 +83,7 @@
},*/ },*/
{ {
field : 'zfdw', field : 'zfdw',
title : '执法部门' title : '部门名称'
}, },
{ {
field : 'name', field : 'name',

84
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html

@ -91,13 +91,16 @@
<!-- <option value="">所有</option>--> <!-- <option value="">所有</option>-->
<!-- </select>--> <!-- </select>-->
<input type="text" class="year-input" style="width: 150px" id="year" name="year"> <!--<input type="text" class="year-input" style="width: 150px" id="year" name="year">-->
<select id="year" name="year">
<!--<option value="2024">2024</option>-->
<option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
</select>
<select id="dateSearch" name="dateSearch" onchange="timeType()" > <select id="dateSearch" name="dateSearch" onchange="timeType()" >
<option value="">所有</option>
<option value="year">年度</option> <option value="year">年度</option>
<option value="quarter">季度</option> <option value="quarter">季度</option>
<option value="month">月度</option> <option value="month">月度</option>
<option value="custom">自定义时间</option> <option value="select-time">自定义时间</option>
</select> </select>
<select id="quarter" name="quarter"> <select id="quarter" name="quarter">
<option value="">所有</option> <option value="">所有</option>
@ -122,15 +125,21 @@
<option value="12">12月</option> <option value="12">12月</option>
</select> </select>
</li> </li>
<li class="select-time" id="custom"> <!--<li class="select-time" id="custom">
<p>自定义时间:</p> <p>自定义时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>-->
<li id="select-time" class="select-time">
<p>自定义时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
</li> </li>
<li> <li>
<a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-success btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-reset btn-sm" onclick="resetR()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a> <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
</li> </li>
</ul> </ul>
@ -171,9 +180,12 @@
var prefix = ctx + "code/registration"; var prefix = ctx + "code/registration";
var searchType; var searchType;
window.onload = function () { window.onload = function () {
/*$("#quarter").hide();
$("#month").hide();
$("#custom").hide();*/
$("#quarter").hide(); $("#quarter").hide();
$("#month").hide(); $("#month").hide();
$("#custom").hide(); $("#select-time").hide();
$("#showDetail").hide(); $("#showDetail").hide();
}; };
$(function() { $(function() {
@ -286,7 +298,7 @@
}; };
$.table.init(options); $.table.init(options);
}); });
function timeType() { /*function timeType() {
var dateSearch = document.getElementById("dateSearch"); var dateSearch = document.getElementById("dateSearch");
if(dateSearch.value =="quarter"){ if(dateSearch.value =="quarter"){
$("#quarter").show(); $("#quarter").show();
@ -325,6 +337,54 @@
$("#quarter").val(""); $("#quarter").val("");
$("#month").val(""); $("#month").val("");
} }
}*/
function timeType() {
var dateSearch = document.getElementById("dateSearch");
console.log(dateSearch.value);
if(dateSearch.value=="quarter"){
$("#year").show();
if(document.getElementById("year").value==''){
document.getElementById("year").value=currentYear;
}
$("#select-time").hide();
document.getElementById("startTime").value="";
document.getElementById("endTime").value="";
$("#quarter").show();
$("#month").hide();
document.getElementById("month").value="";
}else if(dateSearch.value=="month"){
$("#year").show();
if(document.getElementById("year").value==''){
document.getElementById("year").value=currentYear;
}
$("#select-time").hide();
document.getElementById("startTime").value="";
document.getElementById("endTime").value="";
$("#quarter").hide();
document.getElementById("quarter").value="";
$("#month").show();
}else if(dateSearch.value=="select-time"){
$("#select-time").show();
$("#year").hide();
document.getElementById("year").value="";
$("#quarter").hide();
document.getElementById("quarter").value="";
$("#month").hide();
document.getElementById("month").value="";
}else {
$("#year").show();
if(document.getElementById("year").value==''){
document.getElementById("year").value=currentYear;
}
$("#select-time").hide();
document.getElementById("startTime").value="";
document.getElementById("endTime").value="";
$("#quarter").hide();
document.getElementById("quarter").value="";
$("#month").hide();
document.getElementById("month").value="";
}
} }
function search1 (formId) { function search1 (formId) {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
@ -424,14 +484,14 @@
var encodedUri=encodeURI(csvContent); var encodedUri=encodeURI(csvContent);
var link=do*/ var link=do*/
layui.use('laydate', function(){ /*layui.use('laydate', function(){
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ laydate.render({
elem: '#year', elem: '#year',
type: 'year', type: 'year',
trigger: 'click' trigger: 'click'
}); });
}); });*/
function openStaticDetail(enterpriseNumber) { function openStaticDetail(enterpriseNumber) {
$("#enterpriseNumber").val(enterpriseNumber); $("#enterpriseNumber").val(enterpriseNumber);
@ -467,6 +527,12 @@
function closeDetail() { function closeDetail() {
$("#showDetail").hide(); $("#showDetail").hide();
} }
function resetR(){
$('form').eq(0).trigger("reset");
search1();
timeType();
}
</script> </script>
</body> </body>
</html> </html>

80
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html

@ -28,7 +28,7 @@
<p>执法部门:</p> <p>执法部门:</p>
<input type="text" name="bureauDeptName"/> <input type="text" name="bureauDeptName"/>
</li> </li>
<li> <!--<li>
<p>时段:</p> <p>时段:</p>
<select name="timeType" id="timeType" onchange="changeSelect()"> <select name="timeType" id="timeType" onchange="changeSelect()">
<option value="">所有</option> <option value="">所有</option>
@ -54,15 +54,49 @@
<li class="select-time" id="monthDom"> <li class="select-time" id="monthDom">
<label>月度:</label> <label>月度:</label>
<input type="text" class="month-input" style="width: 150px" id="monthSearch" name="month"> <input type="text" class="month-input" style="width: 150px" id="monthSearch" name="month">
<li>-->
<li> <li>
<p>时段:</p>
<select id="year" name="year">
<!--<option value="2024">2024</option>-->
<option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
</select>
<select id="dateSearch" name="dateSearch" onchange="timeType()">
<option value="year">年度</option>
<option value="quarter">季度</option>
<option value="month">月度</option>
</select>
<select id="quarter" name="quarter">
<option value="">所有</option>
<option value="1">第一季度</option>
<option value="2">第二季度</option>
<option value="3">第三季度</option>
<option value="4">第四季度</option>
</select>
<select id="month" name="month">
<option value="">所有</option>
<option value="01">1月</option>
<option value="02">2月</option>
<option value="03">3月</option>
<option value="04">4月</option>
<option value="05">5月</option>
<option value="06">6月</option>
<option value="07">7月</option>
<option value="08">8月</option>
<option value="09">9月</option>
<option value="10">10月</option>
<option value="11">11月</option>
<option value="12">12月</option>
</select>
</li>
<a class="btn btn-success btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-success btn-sm" onclick="query()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-reset btn-sm" onclick="resetP()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li> </li>
</ul> </ul>
<div class="static-content"> <div class="static-content">
<ul> <ul>
<li id="b"> <li id="b">
<p><span id="yearDate">2024</span>:</p> <p><span id="yearDate"></span>:</p>
<p><label>年度计划</label><b><span id="yearTotal">0</span></b></p> <p><label>年度计划</label><b><span id="yearTotal">0</span></b></p>
<p><label>季度计划</label><b><span id="quarterTotal">0</span></b></p> <p><label>季度计划</label><b><span id="quarterTotal">0</span></b></p>
<p><label>月度计划</label><b><span id="monthTotal">0</span></b></p> <p><label>月度计划</label><b><span id="monthTotal">0</span></b></p>
@ -142,9 +176,12 @@
staticProgramWithQuarter(); staticProgramWithQuarter();
staticProgramWithMonth(); staticProgramWithMonth();
//初始化默认隐藏 //初始化默认隐藏
$("#yearDom").hide(); /*$("#yearDom").hide();
$("#quarterDom").hide(); $("#quarterDom").hide();
$("#monthDom").hide(); $("#monthDom").hide();*/
$("#quarter").hide();
$("#month").hide();
$("#select-time").hide();
}; };
function setTab(name, cursel, n) { function setTab(name, cursel, n) {
@ -175,7 +212,7 @@
$("#quarterTotal").text(0); $("#quarterTotal").text(0);
$("#monthTotal").text(0); $("#monthTotal").text(0);
} }
$("#yearDate").text(document.getElementById("year").value)
}, },
error: function (er) { //失败,回调函数 error: function (er) { //失败,回调函数
} }
@ -289,7 +326,7 @@
/** /**
* *
*/ */
function changeSelect(){ /*function changeSelect(){
var options = $("#timeType option:selected"); var options = $("#timeType option:selected");
if("year" == options.val()){ if("year" == options.val()){
$("#yearDom").show(); $("#yearDom").show();
@ -317,7 +354,7 @@
var date = new Date(); var date = new Date();
$("#yearDate").text(date.getFullYear()); $("#yearDate").text(date.getFullYear());
} }
} }*/
$(function() { $(function() {
@ -363,7 +400,7 @@
}; };
$.table.init(options); $.table.init(options);
layui.use('laydate', function(){ /*layui.use('laydate', function(){
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ laydate.render({
elem: '#yearSearch', elem: '#yearSearch',
@ -381,7 +418,7 @@
type: 'month', type: 'month',
trigger: 'click' trigger: 'click'
}) })
}); });*/
}); });
/** /**
@ -535,6 +572,29 @@
$("#bootstrap-table").bootstrapTable('refresh', params); $("#bootstrap-table").bootstrapTable('refresh', params);
this.changeEcharts(); this.changeEcharts();
} }
function timeType() {
var dateSearch = document.getElementById("dateSearch");
console.log(dateSearch.value);
if(dateSearch.value=="quarter"){
$("#quarter").show();
$("#month").hide();
document.getElementById("month").value="";
}else if(dateSearch.value=="month"){
$("#quarter").hide();
document.getElementById("quarter").value="";
$("#month").show();
}else {
$("#quarter").hide();
document.getElementById("quarter").value="";
$("#month").hide();
document.getElementById("month").value="";
}
}
function resetP(){
$('form').eq(0).trigger("reset");
query();
timeType();
}
function changeEcharts() { function changeEcharts() {
staticAllProgram(); staticAllProgram();
staticProgramWithAll(); staticProgramWithAll();

68
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html

@ -201,7 +201,7 @@
<div class="percent-tag"> <div class="percent-tag">
<span class="data-rise" id="dept-huan-top">&#8593</span> <span class="data-rise" id="dept-huan-top">&#8593</span>
<span class="data-fall" id="dept-huan-down">&#8595</span> <span class="data-fall" id="dept-huan-down">&#8595</span>
<span class="data-change" id="dept-huan">2</span><label>较上年</label></span> <span class="data-change" id="dept-huan">2</span><label id="dept-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-bottom"> <div class="panel-card-bottom">
@ -212,7 +212,7 @@
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<span class="data-rise" id="user-huan-top">&#8593</span> <span class="data-rise" id="user-huan-top">&#8593</span>
<span class="data-fall" id="user-huan-down">&#8595</span> <span class="data-fall" id="user-huan-down">&#8595</span>
<span class="data-change" id="user-huan">32</span><label>较上年</label> <span class="data-change" id="user-huan">32</span><label id="user-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-right"> <div class="panel-card-right">
@ -223,7 +223,7 @@
<span class="data-rise" id="oneself-user-huan-top">&#8593</span> <span class="data-rise" id="oneself-user-huan-top">&#8593</span>
<span class="data-fall" id="oneself-user-huan-down">&#8595</span> <span class="data-fall" id="oneself-user-huan-down">&#8595</span>
<span class="data-change"><span id="oneself-user-huan">--</span></span> <span class="data-change"><span id="oneself-user-huan">--</span></span>
<label>较上年</label> <label id="oneself-user-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -237,7 +237,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="enterprise-huan-top">&#8593</span> <span class="data-rise" id="enterprise-huan-top">&#8593</span>
<span class="data-fall" id="enterprise-huan-down">&#8595</span> <span class="data-fall" id="enterprise-huan-down">&#8595</span>
<span class="data-change" id="enterprise-huan">125000</span><label>较上年</label></span> <span class="data-change" id="enterprise-huan">125000</span><label id="enterprise-huan-timeType">较上年</label></span>
</div> </div>
</div> </div>
<div class="panel-card-bottom"> <div class="panel-card-bottom">
@ -248,7 +248,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="enterprise-xc-huan-top">&#8593</span> <span class="data-rise" id="enterprise-xc-huan-top">&#8593</span>
<span class="data-fall" id="enterprise-xc-huan-down">&#8595</span> <span class="data-fall" id="enterprise-xc-huan-down">&#8595</span>
<span class="data-change" id="enterprise-xc-huan"></span><label>较上年</label> <span class="data-change" id="enterprise-xc-huan"></span><label id="enterprise-xc-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-right"> <div class="panel-card-right">
@ -260,7 +260,7 @@
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<span class="data-rise" id="enterprise-zx-huan-top">&#8593</span> <span class="data-rise" id="enterprise-zx-huan-top">&#8593</span>
<span class="data-fall" id="enterprise-zx-huan-down">&#8595</span> <span class="data-fall" id="enterprise-zx-huan-down">&#8595</span>
<span class="data-change" id="enterprise-zx-huan">0.39万</span><label>较上年</label> <span class="data-change" id="enterprise-zx-huan">0.39万</span><label id="enterprise-zx-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -274,7 +274,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="program-huan-top">&#8593</span> <span class="data-rise" id="program-huan-top">&#8593</span>
<span class="data-fall" id="program-huan-down">&#8595</span> <span class="data-fall" id="program-huan-down">&#8595</span>
<span class="data-change" id="program-huan">35</span><label>较上年</label></span> <span class="data-change" id="program-huan">35</span><label id="program-huan-timeType">较上年</label></span>
</div> </div>
</div> </div>
<div class="panel-card-bottom"> <div class="panel-card-bottom">
@ -286,7 +286,7 @@
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<span class="data-rise" id="program-xz-huan-top">&#8593</span> <span class="data-rise" id="program-xz-huan-top">&#8593</span>
<span class="data-fall" id="program-xz-huan-down">&#8595</span> <span class="data-fall" id="program-xz-huan-down">&#8595</span>
<span class="data-change" id="program-xz-huan">62</span><label>较上年</label> <span class="data-change" id="program-xz-huan">62</span><label id="program-xz-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-right"> <div class="panel-card-right">
@ -296,7 +296,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="program-dw-huan-top">&#8593</span> <span class="data-rise" id="program-dw-huan-top">&#8593</span>
<span class="data-fall" id="program-dw-huan-down">&#8595</span> <span class="data-fall" id="program-dw-huan-down">&#8595</span>
<span class="data-change" id="program-dw-huan">--</span><label>较上年</label> <span class="data-change" id="program-dw-huan">--</span><label id="program-dw-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -310,7 +310,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="regis-huan-top">&#8593</span> <span class="data-rise" id="regis-huan-top">&#8593</span>
<span class="data-fall" id="regis-huan-down">&#8595</span> <span class="data-fall" id="regis-huan-down">&#8595</span>
<span class="data-change" id="regis-huan">--</span><label>较上年</label> <span class="data-change" id="regis-huan">--</span><label id="regis-huan-timeType">较上年</label>
</span> </span>
</div> </div>
</div> </div>
@ -322,7 +322,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="regis-dw-huan-top">&#8593</span> <span class="data-rise" id="regis-dw-huan-top">&#8593</span>
<span class="data-fall" id="regis-dw-huan-down">&#8595</span> <span class="data-fall" id="regis-dw-huan-down">&#8595</span>
<span class="data-change" id="regis-dw-huan">--</span><label>较上年</label> <span class="data-change" id="regis-dw-huan">--</span><label id="regis-dw-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-right"> <div class="panel-card-right">
@ -332,7 +332,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="regis-lh-huan-top">&#8593</span> <span class="data-rise" id="regis-lh-huan-top">&#8593</span>
<span class="data-fall" id="regis-lh-huan-down">&#8595</span> <span class="data-fall" id="regis-lh-huan-down">&#8595</span>
<span class="data-change" id="regis-lh-huan">--</span><label>较上年</label> <span class="data-change" id="regis-lh-huan">--</span><label id="regis-lh-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -346,7 +346,7 @@
<!-- <span class="data-rise">&#8593</span>--> <!-- <span class="data-rise">&#8593</span>-->
<span class="data-rise" id="warn-huan-top">&#8593</span> <span class="data-rise" id="warn-huan-top">&#8593</span>
<span class="data-fall" id="warn-huan-down">&#8595</span> <span class="data-fall" id="warn-huan-down">&#8595</span>
<span class="data-change" id="warn-huan">--</span><label>较上年</label></span> <span class="data-change" id="warn-huan">--</span><label id="warn-huan-timeType">较上年</label></span>
</div> </div>
</div> </div>
<div class="panel-card-bottom"> <div class="panel-card-bottom">
@ -357,7 +357,7 @@
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<span class="data-rise" id="warn-qy-huan-top">&#8593</span> <span class="data-rise" id="warn-qy-huan-top">&#8593</span>
<span class="data-fall" id="warn-qy-huan-down">&#8595</span> <span class="data-fall" id="warn-qy-huan-down">&#8595</span>
<span class="data-change" id="warn-qy-huan">--</span><label>较上年</label> <span class="data-change" id="warn-qy-huan">--</span><label id="warn-qy-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-left"> <div class="panel-card-left">
@ -370,7 +370,7 @@
<!-- <span class="data-fall" id="warn-dw-huan-down">&#8595</span>--> <!-- <span class="data-fall" id="warn-dw-huan-down">&#8595</span>-->
<span class="data-rise" id="warn-dw-huan-top">&#8593</span> <span class="data-rise" id="warn-dw-huan-top">&#8593</span>
<span class="data-fall" id="warn-dw-huan-down" style="display: none">&#8595</span> <span class="data-fall" id="warn-dw-huan-down" style="display: none">&#8595</span>
<span class="data-change" id="warn-dw-huan">--</span><label>较上年</label> <span class="data-change" id="warn-dw-huan">--</span><label id="warn-dw-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -386,32 +386,32 @@
<!-- <span class="data-rise" id="complaint-huan-down" style="display: none">&#8593</span>--> <!-- <span class="data-rise" id="complaint-huan-down" style="display: none">&#8593</span>-->
<span class="data-rise" id="complaint-huan-top">&#8593</span> <span class="data-rise" id="complaint-huan-top">&#8593</span>
<span class="data-fall" id="complaint-huan-down" style="display: none">&#8595</span> <span class="data-fall" id="complaint-huan-down" style="display: none">&#8595</span>
<span class="data-change" id="complaint-huan">--</span><label>较上年</label></span> <span class="data-change" id="complaint-huan">--</span><label id="complaint-huan-timeType">较上年</label></span>
</div> </div>
</div> </div>
<div class="panel-card-bottom"> <div class="panel-card-bottom">
<div class="panel-card-left"> <div class="panel-card-left">
<div class="cont-title">被投诉部门数量</div> <div class="cont-title">被投诉部门数量</div>
<div class="cont-total"><b><span id="complaint-qy-total"></span></b><span>件</span></div> <div class="cont-total"><b><span id="complaint-qy-total"></span></b><span>个</span></div>
<div class="percent-tag"> <div class="percent-tag">
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<!-- <span class="data-fall" id="complaint-qy-huan-top">&#8595</span>--> <!-- <span class="data-fall" id="complaint-qy-huan-top">&#8595</span>-->
<!-- <span class="data-rise" id="complaint-qy-huan-down" style="display: none">&#8593</span>--> <!-- <span class="data-rise" id="complaint-qy-huan-down" style="display: none">&#8593</span>-->
<span class="data-rise" id="complaint-qy-huan-top">&#8593</span> <span class="data-rise" id="complaint-qy-huan-top">&#8593</span>
<span class="data-fall" id="complaint-qy-huan-down" style="display: none">&#8595</span> <span class="data-fall" id="complaint-qy-huan-down" style="display: none">&#8595</span>
<span class="data-change" id="complaint-qy-huan">--</span><label>较上年</label> <span class="data-change" id="complaint-qy-huan">--</span><label id="complaint-qy-huan-timeType">较上年</label>
</div> </div>
</div> </div>
<div class="panel-card-right"> <div class="panel-card-right">
<div class="cont-title">投诉企业数量</div> <div class="cont-title">投诉企业数量</div>
<div class="cont-total"><b><span id="complaint-dw-total"></span></b><span>个</span></div> <div class="cont-total"><b><span id="complaint-dw-total"></span></b><span>件</span></div>
<div class="percent-tag"> <div class="percent-tag">
<!-- <span class="data-fall">&#8595</span>--> <!-- <span class="data-fall">&#8595</span>-->
<!-- <span class="data-fall" id="complaint-dw-huan-top">&#8595</span>--> <!-- <span class="data-fall" id="complaint-dw-huan-top">&#8595</span>-->
<!-- <span class="data-rise" id="complaint-dw-huan-down" style="display: none">&#8593</span>--> <!-- <span class="data-rise" id="complaint-dw-huan-down" style="display: none">&#8593</span>-->
<span class="data-rise" id="complaint-dw-huan-top">&#8593</span> <span class="data-rise" id="complaint-dw-huan-top">&#8593</span>
<span class="data-fall" id="complaint-dw-huan-down" style="display: none">&#8595</span> <span class="data-fall" id="complaint-dw-huan-down" style="display: none">&#8595</span>
<span class="data-change" id="complaint-dw-huan">--</span><label>较上年</label> <span class="data-change" id="complaint-dw-huan">--</span><label id="complaint-dw-huan-timeType">较上年</label>
</div> </div>
</div> </div>
</div> </div>
@ -456,6 +456,9 @@
* 查询执法部门数据 * 查询执法部门数据
*/ */
function queryStatisticalPanelDeptAndUser() { function queryStatisticalPanelDeptAndUser() {
$("#dept-huan-timeType").text(typeMake());
$("#user-huan-timeType").text(typeMake());
$("#oneself-user-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/statisticalPanelDeptAndUser', //后台url url: prefix2 + '/statisticalPanelDeptAndUser', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -491,6 +494,9 @@
* 查询企业数据 * 查询企业数据
*/ */
function enterprise() { function enterprise() {
$("#enterprise-huan-timeType").text(typeMake());
$("#enterprise-xc-huan-timeType").text(typeMake());
$("#enterprise-zx-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/enterprise', //后台url url: prefix2 + '/enterprise', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -534,6 +540,9 @@
* 查询企业数据 * 查询企业数据
*/ */
function statisticProgram() { function statisticProgram() {
$("#program-huan-timeType").text(typeMake());
$("#program-xz-huan-timeType").text(typeMake());
$("#program-dw-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/statisticProgram', //后台url url: prefix2 + '/statisticProgram', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -577,6 +586,9 @@
* 查询执法登记数据 * 查询执法登记数据
*/ */
function registration() { function registration() {
$("#regis-huan-timeType").text(typeMake());
$("#regis-dw-huan-timeType").text(typeMake());
$("#regis-lh-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/registration', //后台url url: prefix2 + '/registration', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -617,6 +629,9 @@
* 查询执法预警数据 * 查询执法预警数据
*/ */
function warning() { function warning() {
$("#warn-huan-timeType").text(typeMake());
$("#warn-qy-huan-timeType").text(typeMake());
$("#warn-dw-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/warning', //后台url url: prefix2 + '/warning', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -655,6 +670,9 @@
} }
function complaint() { function complaint() {
$("#complaint-huan-timeType").text(typeMake());
$("#complaint-qy-huan-timeType").text(typeMake());
$("#complaint-dw-huan-timeType").text(typeMake());
$.ajax({ $.ajax({
url: prefix2 + '/complaint', //后台url url: prefix2 + '/complaint', //后台url
data: $("#formId").serialize(), data: $("#formId").serialize(),
@ -709,7 +727,15 @@
function searchP(){ function searchP(){
this.initData(); this.initData();
} }
function typeMake(){
if(document.getElementById("month").value!=''&&document.getElementById("month").value!=null){
return '较上月';
}else if(document.getElementById("quarter").value!=''&&document.getElementById("quarter").value!=null){
return '较上季'
}else{
return '较上年'
}
}
</script> </script>
</body> </body>
</html> </html>

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

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<li th:fragment="enterpriseFragment"> <li th:fragment="enterpriseFragment">
<p th:text="|${year}年|"></p> <!--<p th:text="|${year}年|"></p>-->
<p th:text="|企业数量 ${number2}|"></p> <p th:text="|企业数量 ${number2}|"></p>
<p th:text="|占比总计 ${number3}|"></p> <p th:text="|占比总计 ${number3}|"></p>
</li> </li>

23
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html

@ -84,13 +84,13 @@
<form id="formId2"> <form id="formId2">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <!--<li>
<p>时段:</p> <p>时段:</p>
<select id="year2" name="year"> <select id="year2" name="year">
<!--<option value="2024">2024</option>--> &lt;!&ndash;<option value="2024">2024</option>&ndash;&gt;
<option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option> <option th:each="y:${yearList}" th:text="${y}" th:value="${y}"></option>
</select> </select>
<select id="dateSearch2" name="dateSearch" onchange="timeType2()" ><!--创建时间--> <select id="dateSearch2" name="dateSearch" onchange="timeType2()" >&lt;!&ndash;创建时间&ndash;&gt;
<option value="year">年度</option> <option value="year">年度</option>
<option value="quarter">季度</option> <option value="quarter">季度</option>
<option value="month">月度</option> <option value="month">月度</option>
@ -117,12 +117,12 @@
<option value="11">11月</option> <option value="11">11月</option>
<option value="12">12月</option> <option value="12">12月</option>
</select> </select>
</li> </li>-->
<li> <!--<li>
<a class="btn btn-success btn-sm" onclick="eSearch2()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-success btn-sm" onclick="eSearch2()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="eRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-reset btn-sm" onclick="eRest2()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a> <a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>下载</a>
</li> </li>-->
</ul> </ul>
<!--<ul> <!--<ul>
<li id="enterpriseFragment" th:fragment="enterpriseFragment"> <li id="enterpriseFragment" th:fragment="enterpriseFragment">
@ -134,11 +134,12 @@
<div class="static-content" style="margin: 1% 0;"> <div class="static-content" style="margin: 1% 0;">
<ul> <ul>
<li id="enterpriseFragment" th:fragment="enterpriseFragment"> <li id="enterpriseFragment" th:fragment="enterpriseFragment">
<p><span th:text="|${year}年:|"></span></p> <!--<p><span th:text="|${year}年:|"></span></p>-->
<p><span>至今:</span></p>
<p><label th:text="企业数量"></label><b th:text="${number2}"></b></p> <p><label th:text="企业数量"></label><b th:text="${number2}"></b></p>
<p></i><label th:text="占比总计"></label><b th:text="${number3}"></b></p> <p></i><label th:text="占比总计"></label><b th:text="${number3}"></b></p>
</li> </li>
<li><a class="btn btn-warning btn-sm" onclick="complaintDownload(2)"><i class="fa fa-download"></i>导出</a></li>
</ul> </ul>
</div> </div>
</div> </div>
@ -182,7 +183,7 @@
field : 'name', field : 'name',
title : '区域', title : '区域',
formatter:function (value,row,index) { formatter:function (value,row,index) {
return '<span ONCLICK="jd(\'' + value + '\')">'+value+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="jd(\'' + value + '\')">'+value+'</span>';
} }
}, },
{ {
@ -316,11 +317,11 @@
$.ajax({ $.ajax({
url: prefix + "/type", url: prefix + "/type",
method: 'GET', method: 'GET',
data:params, //data:params,
success:function (response){ success:function (response){
$('#bootstrap-table2').bootstrapTable('load', response); $('#bootstrap-table2').bootstrapTable('load', response);
var option3 = { var option3 = {
color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'], /*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*/
tooltip: {}, tooltip: {},
legend: { legend: {
data: ['企业类型统计'] data: ['企业类型统计']

12
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html

@ -17,10 +17,10 @@
<p>执法部门:</p> <p>执法部门:</p>
<input type="text" name="bureauDeptId"/> <input type="text" name="bureauDeptId"/>
</li> </li>
<li> <!--<li>
<p>企业名称:</p> <p>企业名称:</p>
<input type="text" name="name"/> <input type="text" name="name"/>
</li> </li>-->
<li> <li>
<p>时段:</p> <p>时段:</p>
<select id="year" name="year"> <select id="year" name="year">
@ -91,7 +91,7 @@
var options = { var options = {
modalName: "执法预警统计", modalName: "执法预警统计",
showHeader: true, showHeader: true,
showFooter: true, showFooter: false,
showColumns: false, showColumns: false,
showRefresh: false, showRefresh: false,
showToggle: false, showToggle: false,
@ -104,13 +104,17 @@
field : 'enforcementDepartment', field : 'enforcementDepartment',
title : '执法部门' title : '执法部门'
}, },
{ /*{
field : 'enterpriseName', field : 'enterpriseName',
title : '企业名称' title : '企业名称'
}, },
{ {
field : 'warningCause', field : 'warningCause',
title : '原因' title : '原因'
},*/
{
field : 'searchDate',
title : '预警时段'
}, },
{ {
field : 'enforcementNumber', field : 'enforcementNumber',

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java

@ -49,8 +49,9 @@ public class EnforcementInspectionProgramController extends BaseController
} }
@GetMapping("/staticProgramView") @GetMapping("/staticProgramView")
public String staticProgramView() public String staticProgramView(Model model)
{ {
model.addAttribute("yearList",yearMake());
return prefix2 + "/staticProgram"; return prefix2 + "/staticProgram";
} }

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@ -98,7 +98,8 @@ public class EnforcementRegistrationController extends BaseController
} }
@GetMapping("/staticRegistrationView") @GetMapping("/staticRegistrationView")
public String staticRegistrationView(){ public String staticRegistrationView(Model model){
model.addAttribute("yearList",yearMake());
return prefix + "/staticRegistration"; return prefix + "/staticRegistration";
} }

16
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsEnterpriseController.java

@ -40,11 +40,11 @@ public class StatisticsEnterpriseController extends BaseController {
List<EnterpriseInformation> enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation()); List<EnterpriseInformation> enterpriseInformationList = iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); List<EnterpriseInformation> existList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList());
List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); List<EnterpriseInformation> logoutList = enterpriseInformationList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList());
model.addAttribute("yearList", yearMake()); //model.addAttribute("yearList", yearMake());
model.addAttribute("number", enterpriseInformationList.size());//企业总数 model.addAttribute("number", enterpriseInformationList.size());//企业总数
model.addAttribute("exist", existList.size());//续存数量 model.addAttribute("exist", existList.size());//续存数量
model.addAttribute("logout", logoutList.size());//注销数量 model.addAttribute("logout", logoutList.size());//注销数量
model.addAttribute("year", localDate.getYear()); //model.addAttribute("year", localDate.getYear());
model.addAttribute("number2", enterpriseInformationList.size());//企业总数--Tap2 model.addAttribute("number2", enterpriseInformationList.size());//企业总数--Tap2
model.addAttribute("number3", "100%"); model.addAttribute("number3", "100%");
return prefix + "/statisticsEnterprise"; return prefix + "/statisticsEnterprise";
@ -254,8 +254,9 @@ public class StatisticsEnterpriseController extends BaseController {
@GetMapping("/type") @GetMapping("/type")
@ResponseBody @ResponseBody
public List<StatisticsIndicator> statistics(SearchType searchType) { public List<StatisticsIndicator> statistics(SearchType searchType) {
EnterpriseInformation enterpriseInformation=dateMake(searchType); /*EnterpriseInformation enterpriseInformation=dateMake(searchType);
List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation); List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation);*/
List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
List<DictData>list=iDictDataService.selectDictDataByType("enterpriseType"); List<DictData>list=iDictDataService.selectDictDataByType("enterpriseType");
List<DictData>dictDataList=list.subList(0,4);//截取掉其他 List<DictData>dictDataList=list.subList(0,4);//截取掉其他
List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>(); List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>();
@ -282,8 +283,9 @@ public class StatisticsEnterpriseController extends BaseController {
@RequiresPermissions("code:statisticsEnterprise:view") @RequiresPermissions("code:statisticsEnterprise:view")
@GetMapping("/search") @GetMapping("/search")
public String Search(Model model,SearchType searchType) { public String Search(Model model,SearchType searchType) {
EnterpriseInformation enterpriseInformation=dateMake(searchType); /*EnterpriseInformation enterpriseInformation=dateMake(searchType);
List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation); List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseInformation);*/
List<EnterpriseInformation> enterpriseInformationList=iEnterpriseInformationService.selectEnterpriseInformationList1(new EnterpriseInformation());
List<DictData>dictDataList=iDictDataService.selectDictDataByType("enterpriseType"); List<DictData>dictDataList=iDictDataService.selectDictDataByType("enterpriseType");
List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>(); List<StatisticsIndicator> statisticsIndicatorList=new ArrayList<>();
for(DictData d:dictDataList){ for(DictData d:dictDataList){
@ -296,7 +298,7 @@ public class StatisticsEnterpriseController extends BaseController {
statisticsIndicatorList.add(s); statisticsIndicatorList.add(s);
} }
} }
model.addAttribute("year",searchType.getYear()); /*model.addAttribute("year",searchType.getYear());*/
model.addAttribute("number2",enterpriseInformationList.size());//企业总数--Tap2 model.addAttribute("number2",enterpriseInformationList.size());//企业总数--Tap2
model.addAttribute("number3","100%"); model.addAttribute("number3","100%");
return prefix+"/enterpriseFragment"; return prefix+"/enterpriseFragment";

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml

@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and QUARTER(create_time) = #{quarter} and QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
and DATE_FORMAT(create_time, '%Y-%m') = #{month} and DATE_FORMAT(create_time, '%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
</where> </where>
@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and QUARTER(create_time) = #{quarter} and QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
and DATE_FORMAT(create_time, '%Y-%m') = #{month} and DATE_FORMAT(create_time, '%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
AND time_type is not null AND time_type is not null

32
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

@ -80,8 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000 ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
) t GROUP BY t.enterprise_number order by t.create_time desc ) t GROUP BY t.enterprise_number order by t.create_time desc
</select> </select>
<select id="selectLawEnforcementWarningListList1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult"> <!--<select id="selectLawEnforcementWarningListList1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
SELECT * FROM ( SELECT enforcement_department,enforcement_department_id,DATE_FORMAT(t.create_time,'%Y-%m') as searchDate,enforcement_number
FROM (
SELECT SELECT
id, id,
warning_time, warning_cause, warning_level , warning_time, warning_cause, warning_level ,
@ -93,15 +94,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and warn_type=0 and warn_type=0
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if> <if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="enforcementDepartment != null and enforcementDepartment != ''"> and enforcement_department like concat('%', #{enforcementDepartment}, '%')</if> <if test="enforcementDepartment != null and enforcementDepartment != ''"> and enforcement_department like concat('%', #{enforcementDepartment}, '%')</if>
<if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 --> <if test="beginTime != null and beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;
and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d') and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if> </if>
<if test="endTime != null and endTime != ''"><!-- 结束时间检索 --> <if test="endTime != null and endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;
and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d') and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if> </if>
</where> </where>
ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000 ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000
) t GROUP BY t.enterprise_number,t.enforcement_department_id,DATE_FORMAT(t.create_time,'%Y-%m') order by t.create_time desc ) t GROUP BY t.enforcement_department_id,DATE_FORMAT(t.create_time,'%Y-%m') order by t.create_time desc
</select>-->
<select id="selectLawEnforcementWarningListList1" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
SELECT
enforcement_department,
enforcement_department_id,
DATE_FORMAT( t.create_time, '%Y-%m' ) AS searchDate,
count( enforcement_number ) as enforcement_number
FROM
( SELECT enforcement_department, enforcement_department_id, create_time, enterprise_number, enforcement_number FROM law_enforcement_warning_list
<where>and warn_type = 0
<if test="enforcementDepartment != null and enforcementDepartment != ''"> and enforcement_department like concat('%', #{enforcementDepartment}, '%')</if>
<if test="beginTime != null and beginTime != ''">
and DATE_FORMAT(create_time,'%Y-%m-%d') &gt;= STR_TO_DATE(#{beginTime},'%Y-%m-%d')
</if>
<if test="endTime != null and endTime != ''">
and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d')
</if>
</where>
ORDER BY warning_level ASC, create_time DESC LIMIT 1000000000 ) t
GROUP BY
t.enforcement_department_id,searchDate
</select> </select>
<select id="selectLawEnforcementWarningListList2" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult"> <select id="selectLawEnforcementWarningListList2" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
<include refid="selectLawEnforcementWarningListVo"/> <include refid="selectLawEnforcementWarningListVo"/>

Loading…
Cancel
Save