Browse Source

补充页面弹窗功能以及样式

开发综合分析页面
v4
chenrui 2 years ago
parent
commit
4117d4038b
  1. 9
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
  2. 181
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
  3. 26
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html
  4. 17
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html
  5. 95
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html
  6. 9
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java
  7. 18
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  8. 41
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java
  9. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
  10. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
  11. 7
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  12. 48
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml
  13. 71
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

9
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css

@ -107,6 +107,7 @@ body {
z-index: -999; z-index: -999;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: white
} }
.tab_cont { .tab_cont {
@ -218,10 +219,14 @@ body {
} }
.tab_item2 { .tab_item2 {
position: absolute; /*position: absolute;*/
z-index: -999; z-index: -9999;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex;
flex-wrap: wrap;
align-content: space-around;
justify-content: center
} }
.tab_item2 .echarts{ .tab_item2 .echarts{

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

@ -1,7 +1,53 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('企业端-执法部门预约记录列表')" /> <th:block th:include="zdxtInclude :: header('执法分析')" />
<th:block th:include="zdxtInclude :: datetimepicker-css" />
<style type="text/css">
#showDetail{
position: absolute;
top: 27%;
left: 30%;
width: 40%;
height: 25%;
background-color: azure;
}
#showDetail table {
border-collapse: separate;
border-top: 1px solid #dfe6ec;
border-left: 1px solid #dfe6ec;
width: 100%
}
#showDetail thead tr th {
background-color: #f8f8f9;
padding: 6px;
text-align: center;
border-bottom: 1px solid #dfe6ec;
border-right: 1px solid #dfe6ec;
}
#showDetail tbody tr td {
padding: 6px;
text-align: center;
height: 34px;
border-bottom: 1px solid #dfe6ec;
border-right: 1px solid #dfe6ec;
}
#showDetail tbody tr td {
padding: 6px;
text-align: center;
height: 34px;
border-bottom: 1px solid #dfe6ec;
border-right: 1px solid #dfe6ec;
}
#detail-close{
position: absolute;
color: red;
width: 10px;
top: -4%;
right: -1%;
cursor: pointer;
}
</style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
@ -21,6 +67,7 @@
<li> <li>
<p>企业名称:</p> <p>企业名称:</p>
<input type="text" name="enterpriseName"/> <input type="text" name="enterpriseName"/>
<input type="hidden" id="enterpriseNumber" name="enterpriseNumber"/>
</li> </li>
<li> <li>
<p>检查事项:</p> <p>检查事项:</p>
@ -28,15 +75,17 @@
</li> </li>
<li> <li>
<p>时段:</p> <p>时段:</p>
<select id="year" name="year"> <!-- <select id="year" name="year">-->
<option value="">所有</option> <!-- <option value="">所有</option>-->
<option value="2024">2024</option>
</select> <!-- </select>-->
<input type="text" class="year-input" style="width: 150px" id="year" name="year">
<select id="dateSearch" name="dateSearch" onchange="timeType()" > <select id="dateSearch" name="dateSearch" onchange="timeType()" >
<option value="">所有</option> <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>
</select> </select>
<select id="quarter" name="quarter"> <select id="quarter" name="quarter">
<option value="">所有</option> <option value="">所有</option>
@ -61,11 +110,11 @@
<option value="12">12月</option> <option value="12">12月</option>
</select> </select>
</li> </li>
<li class="select-time"> <li class="select-time" id="custom">
<p>检查时间:</p> <p>自定义时间:</p>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="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="endTime"/> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-success btn-rounded btn-sm" onclick="search1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -73,19 +122,35 @@
<a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a> <a class="btn btn-download btn-rounded btn-sm" onclick="download1()"><i class="fa fa-download"></i>下载</a>
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group"></div>
</div>
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
<div id="showDetail" class="detail-list">
<div id="detail-close" style="color: red" onclick="closeDetail()">x</div>
<table>
<thead>
<tr>
<th>执法部门</th>
<th>执法人员</th>
<th>检查事项</th>
<th>数量</th>
</tr>
</thead>
<tbody id="staticDatail">
</tbody>
</table>
</div>
</div> </div>
</div> </div>
<th:block th:include="zdxtInclude :: footer" /> <th:block th:include="zdxtInclude :: footer" />
<th:block th:include="zdxtInclude :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('code:registration:edit')}]]; var editFlag = [[${@permission.hasPermi('code:registration:edit')}]];
var removeFlag = [[${@permission.hasPermi('code:registration:remove')}]]; var removeFlag = [[${@permission.hasPermi('code:registration:remove')}]];
@ -96,6 +161,8 @@
window.onload = function () { window.onload = function () {
$("#quarter").hide(); $("#quarter").hide();
$("#month").hide(); $("#month").hide();
$("#custom").hide();
$("#showDetail").hide();
}; };
$(function() { $(function() {
var options = { var options = {
@ -105,20 +172,23 @@
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
detailUrl: prefix + "/detail/{id}", detailUrl: prefix + "/detail/{id}",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "企业端-执法部门预约记录", height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50,
modalName: "执法分析",
showHeader: false, showHeader: false,
showFooter: false, showFooter: false,
showColumns: false, showColumns: false,
showRefresh: false, showRefresh: false,
showToggle: false, showToggle: false,
columns: [ columns: [
{
checkbox: false
},
{ {
field : 'bureauDeptName', field : 'bureauDeptName',
title : '执法部门' title : '执法部门'
}, },
{
field : 'enterpriseNumber',
title : '企业统一信用代码',
visible: false
},
{ {
field : 'lawEnforcement', field : 'lawEnforcement',
title : '执法人员', title : '执法人员',
@ -148,6 +218,9 @@
field : 'total', field : 'total',
title : '检查次数', title : '检查次数',
align : 'center', align : 'center',
formatter: function (value,row,index) {
return '<span style="color: green;cursor: pointer;" onclick="openStaticDetail(\'' + row.enterpriseNumber + '\')">' +value+ '</span>';
}
}, },
{ {
field : 'total', field : 'total',
@ -203,16 +276,42 @@
}); });
function timeType() { function timeType() {
var dateSearch = document.getElementById("dateSearch"); var dateSearch = document.getElementById("dateSearch");
console.log(dateSearch.value); if(dateSearch.value =="quarter"){
if(dateSearch.value=="quarter"){
$("#quarter").show(); $("#quarter").show();
$("#month").hide(); $("#month").hide();
$("#custom").hide();
$("#month").val("");
$("#startTime").val("");
$("#endTime").val("");
}else if(dateSearch.value=="month"){ }else if(dateSearch.value=="month"){
$("#quarter").hide(); $("#quarter").hide();
$("#month").show(); $("#month").show();
}else { $("#custom").hide();
$("#quarter").val("");
$("#startTime").val("");
$("#endTime").val("");
}else if(dateSearch.value == 'year'){
$("#quarter").hide();
$("#month").hide();
$("#custom").hide();
$("#quarter").val("");
$("#month").val("");
$("#startTime").val("");
$("#endTime").val("");
}else if(dateSearch.value == 'custom'){
$("#custom").show();
$("#quarter").hide(); $("#quarter").hide();
$("#month").hide(); $("#month").hide();
$("#year").val("");
$("#quarter").val("");
$("#month").val("");
} }
} }
function search1 (formId) { function search1 (formId) {
@ -312,6 +411,50 @@
} }
var encodedUri=encodeURI(csvContent); var encodedUri=encodeURI(csvContent);
var link=do*/ var link=do*/
layui.use('laydate', function(){
var laydate = layui.laydate;
laydate.render({
elem: '#year',
type: 'year',
trigger: 'click'
});
});
function openStaticDetail(enterpriseNumber) {
$("#enterpriseNumber").val(enterpriseNumber);
console.log(enterpriseNumber);
$.ajax({
url: prefix + '/staticEnforcementRegistrationDetail', //后台url
data: $("#formId").serialize(),
type: "POST",
dataType: 'json',
success: function (data) {
$("#enterpriseNumber").val("");
console.log(data.data);
var html = "";
for (var i = 0; i < data.data.length; i++) {
var ele = data.data[i];
var tr = "<tr>\n" +
"<td>"+(ele.bureauDeptName != null && ele.bureauDeptName != '' ? ele.bureauDeptName : '')+"</td>\n" +
" <td>"+ ((ele.lawEnforcer != null && ele.lawEnforcer != '' ? ele.lawEnforcer : '') +","+ (ele.lawEnforcerTwo != null ? ele.lawEnforcerTwo : '')) +"</td>\n" +
"<td>"+(ele.lawEnforcementItemText != null && ele.lawEnforcementItemText != '' ? ele.lawEnforcementItemText :'')+"</td>\n" +
"<td>"+ele.total+"</td>\n" +
"</tr>";
html += tr;
$("#staticDatail").html(html);
}
$("#showDetail").show();
},
error: function (er) {}
});
}
function closeDetail() {
$("#showDetail").hide();
}
</script> </script>
</body> </body>
</html> </html>

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

@ -10,32 +10,6 @@
<body> <body>
<div class="statwrap"> <div class="statwrap">
<div class="seltime" id="seltime">
<i class="icsty"></i>
<!-- <span>-->
<!-- <select id="month" name="month" onchange="selectDate()" style="display: none;">-->
<!-- <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>-->
<!-- </span>-->
<!-- <span>-->
<!-- <span>所属行业:</span>-->
<!-- <select id="industry" name="industry" th:with="type=${@dict.getType('industryType')}" onchange="selectDate()">-->
<!-- <option value="">请选择</option>-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<!-- </span>-->
</div>
<div class="statit"> <div class="statit">
<span id="one1" class="actit" onclick="setTab('one',1,5)">检查计划统计</span> <span id="one1" class="actit" onclick="setTab('one',1,5)">检查计划统计</span>
<span id="one2" onclick="setTab('one',2,5)">检查计划排行</span> <span id="one2" onclick="setTab('one',2,5)">检查计划排行</span>

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

@ -212,6 +212,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="/js/echarts.min.js"></script> <script type="text/javascript" src="/js/echarts.min.js"></script>
<th:block th:include="zdxtInclude :: footer"/> <th:block th:include="zdxtInclude :: footer"/>
@ -220,7 +221,7 @@
window.onload = function () { window.onload = function () {
selectDate(); selectDate();
} };
function setTab(name, cursel, n) { function setTab(name, cursel, n) {
for (i = 1; i <= n; i++) { for (i = 1; i <= n; i++) {
@ -277,12 +278,12 @@
dataY: dataY, dataY: dataY,
dataSum: dataSum, dataSum: dataSum,
dataPercent: dataPercent, dataPercent: dataPercent,
} };
initSchedule(data); initSchedule(data);
} }
function initSchedule(dataAll) { function initSchedule(dataAll) {
var _this = this; var _this = this;
var myColor = ['#3C83FF'] var myColor = ['#3C83FF'];
var option = { var option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
@ -332,7 +333,7 @@
var traceValue; var traceValue;
for (var i = 0; i < dataAll.dataX.length; i++) { for (var i = 0; i < dataAll.dataX.length; i++) {
if (data === dataAll.dataX[i]) { if (data === dataAll.dataX[i]) {
traceValue = dataAll.dataY[i] traceValue = dataAll.dataY[i];
break break
} }
} }
@ -340,7 +341,7 @@
'{a|' + data + '}', '{a|' + data + '}',
'{b|' + traceValue + '}', '{b|' + traceValue + '}',
'{c|件}' '{c|件}'
] ];
return arr.join('') return arr.join('')
}, },
formatter: function (params) { formatter: function (params) {
@ -423,14 +424,14 @@
var traceValue; var traceValue;
for (var i = 0; i < dataAll.dataX.length; i++) { for (var i = 0; i < dataAll.dataX.length; i++) {
if (data.name === dataAll.dataX[i]) { if (data.name === dataAll.dataX[i]) {
traceValue = dataAll.dataPercent[i] traceValue = dataAll.dataPercent[i];
break break
} }
} }
var arr = [ var arr = [
'{a|' + traceValue + '}', '{a|' + traceValue + '}',
'{b|%}' '{b|%}'
] ];
return arr.join(''); return arr.join('');
}, },
textStyle: { textStyle: {
@ -468,7 +469,7 @@
] ]
}; };
echartLine.setOption(option, true); echartLine.setOption(option, true);
}; }
/** 案件数量 */ /** 案件数量 */
function queryCaseAnalysis(qorm, year, quarter, month,industryValue) { function queryCaseAnalysis(qorm, year, quarter, month,industryValue) {

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

@ -0,0 +1,95 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="zdxtInclude :: header('综合分析')"/>
<th:block th:include="zdxtInclude :: datetimepicker-css" />
<link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
<style type="text/css">
.statwrap .panel-card{
width: 32%;
height: 35%;
background-color: #dedbd6;
margin: 30px 10px
}
.statwrap{
display: flex;
flex-wrap: wrap;
justify-content: center;
align-content: center;
}
.panel-card-top{
width: 60%;
height: 35%;
padding-left: 6%;
padding-top: 2%;
display: flex;
flex-direction: column;
flex-wrap: nowrap;
justify-content: space-around;
align-items: stretch;
}
.panel-card-bottom{
display: flex;
flex-wrap: wrap;
align-content: flex-end;
width: 100%;
height: 56%;
justify-content: space-around;
}
.panel-card-left{
width: 35%;
height: 52%;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.panel-card-right{
width: 35%;
height: 52%;
display: flex;
flex-direction: column;
justify-content: space-around;
}
</style>
</head>
<body>
<div class="statwrap">
<div class="panel-card">
<div class="panel-card-top">
<div style="font-size: 17px">执法部门数量</div>
<div style="font-size: 19px;color: burlywood">48</div>
<div>
<span>2</span><span>较上年</span>
</div>
</div>
<div class="panel-card-bottom">
<div class="panel-card-left">
<div style="font-size: 17px">执法人员数量</div>
<div style="font-size: 19px;color: burlywood">1969</div>
<div>
<span>32</span><span style="margin-left: 2%">较上年</span>
</div>
</div>
<div class="panel-card-right">
<div style="font-size: 17px">本单位执法人员数量</div>
<div style="font-size: 19px;color: burlywood">48</div>
<div>
<span>14</span><span style="margin-left: 2%">较上年</span>
</div>
</div>
</div>
</div>
<div class="panel-card"></div>
<div class="panel-card"></div>
<div class="panel-card"></div>
<div class="panel-card"></div>
<div class="panel-card"></div>
</div>
</body>
</html>

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

@ -50,6 +50,15 @@ public class EnforcementInspectionProgramController extends BaseController
{ {
return prefix2 + "/staticProgram"; return prefix2 + "/staticProgram";
} }
@GetMapping("/statisticalPanel")
public String statisticalPanel()
{
return prefix2 + "/statisticalPanel";
}
/** /**
* 查询执法检查计划列表 * 查询执法检查计划列表
*/ */

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

@ -100,6 +100,11 @@ public class EnforcementRegistrationController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
/**
* 获取执法数据列表
* @param enforcementRegistrationDto
* @return
*/
@PostMapping("/staticEnforcementRegistration") @PostMapping("/staticEnforcementRegistration")
@ResponseBody @ResponseBody
public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){ public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){
@ -108,6 +113,19 @@ public class EnforcementRegistrationController extends BaseController
staticEnforcementRegistration(enforcementRegistrationDto); staticEnforcementRegistration(enforcementRegistrationDto);
return getDataTable(enforcementRegistrationDtos); return getDataTable(enforcementRegistrationDtos);
} }
/**
* 获取执法分析详细清单数据
* @param enforcementRegistrationDto
* @return
*/
@PostMapping("/staticEnforcementRegistrationDetail")
@ResponseBody
public ZDResponse staticListDetail(EnforcementRegistrationDto enforcementRegistrationDto){
List<EnforcementRegistrationDto> enforcementRegistrationDtos = enforcementRegistrationService.
staticEnforcementRegistrationDetail(enforcementRegistrationDto);
return ZDResponse.success("获取执法分析详细清单",enforcementRegistrationDtos);
}
/** /**
* 查询执法端-执法登记列表 * 查询执法端-执法登记列表
*/ */

41
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java

@ -1,9 +1,11 @@
package com.zdxt.code.domain.dto; package com.zdxt.code.domain.dto;
import com.zdxt.common.BaseDomain;
/** /**
* 执法登记 统计 * 执法登记 统计
*/ */
public class EnforcementRegistrationDto { public class EnforcementRegistrationDto extends BaseDomain {
/** 被执法企业 */ /** 被执法企业 */
private String enterpriseName; private String enterpriseName;
@ -38,6 +40,19 @@ public class EnforcementRegistrationDto {
*/ */
private String bureauDeptName; private String bureauDeptName;
/**
* 年度
*/
private String year;
/**
* 季度
*/
private String quarter;
/**
* 月度
*/
private String month;
public String getEnterpriseName() { public String getEnterpriseName() {
return enterpriseName; return enterpriseName;
@ -110,4 +125,28 @@ public class EnforcementRegistrationDto {
public void setBureauDeptName(String bureauDeptName) { public void setBureauDeptName(String bureauDeptName) {
this.bureauDeptName = bureauDeptName; this.bureauDeptName = bureauDeptName;
} }
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
public String getQuarter() {
return quarter;
}
public void setQuarter(String quarter) {
this.quarter = quarter;
}
public String getMonth() {
return month;
}
public void setMonth(String month) {
this.month = month;
}
} }

7
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java

@ -100,4 +100,11 @@ public interface EnforcementRegistrationMapper
* @return * @return
*/ */
List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
/**
* 统计分析,统计分类列表
* @param enforcementRegistrationDto
* @return
*/
List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto);
} }

7
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java

@ -96,4 +96,11 @@ public interface IEnforcementRegistrationService
*/ */
List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); List<EnforcementRegistrationDto> staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto);
/**
* 统计分析列表详细清单
* @param enforcementRegistrationDto
* @return
*/
List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto);
} }

7
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@ -541,6 +541,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
return enforcementRegistrationDtos; return enforcementRegistrationDtos;
} }
@Override
public List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto) {
List<EnforcementRegistrationDto> enforcementRegistrationDtos =
enforcementRegistrationMapper.staticEnforcementRegistrationDetail(enforcementRegistrationDto);
return enforcementRegistrationDtos;
}
public static String getTime(Integer mouthTime){ public static String getTime(Integer mouthTime){
int year = LocalDate.now().getYear(); int year = LocalDate.now().getYear();
int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1); int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1);

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

@ -225,22 +225,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM enforcement_inspection_program FROM enforcement_inspection_program
<where> <where>
<if test="bureauDeptName != null and bureauDeptName != ''"> <if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%') and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if> </if>
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]> and <![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]> and <![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if> </if>
<if test="year != null and year != ''"> <if test="year != null and year != ''">
YEAR(create_time) = #{year} and YEAR(create_time) = #{year}
</if> </if>
<if test="quarter != null and quarter != '' "> <if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter} and QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month} and DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
</where> </where>
@ -255,22 +255,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM enforcement_inspection_program FROM enforcement_inspection_program
<where> <where>
<if test="bureauDeptName != null and bureauDeptName != ''"> <if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%') and bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if> </if>
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]> and <![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]> and <![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if> </if>
<if test="year != null and year != ''"> <if test="year != null and year != ''">
YEAR(create_time) = #{year} and YEAR(create_time) = #{year}
</if> </if>
<if test="quarter != null and quarter != '' "> <if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter} and QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month} and DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
</where> </where>
@ -285,22 +285,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM enforcement_inspection_program FROM enforcement_inspection_program
<where> <where>
<if test="bureauDeptName != null and bureauDeptName != ''"> <if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%') AND bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if> </if>
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]> AND <![CDATA[ create_time >= #{beginTime} ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]> AND <![CDATA[ create_time <= #{endTime} ]]>
</if> </if>
<if test="year != null and year != ''"> <if test="year != null and year != ''">
YEAR(create_time) = #{year} AND YEAR(create_time) = #{year}
</if> </if>
<if test="quarter != null and quarter != '' "> <if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter} AND QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month} AND DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
</where> </where>
@ -315,22 +315,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM enforcement_inspection_program FROM enforcement_inspection_program
<where> <where>
<if test="bureauDeptName != null and bureauDeptName != ''"> <if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat('%', #{bureauDeptName}, '%') AND bureau_dept_name like concat('%', #{bureauDeptName}, '%')
</if> </if>
<if test="beginTime != null and beginTime != ''"> <if test="beginTime != null and beginTime != ''">
<![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]> AND <![CDATA[ create_time >= concat('%', #{beginTime}, '%') ]]>
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
<![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]> AND <![CDATA[ create_time <= concat('%', #{endTime}, '%') ]]>
</if> </if>
<if test="year != null and year != ''"> <if test="year != null and year != ''">
YEAR(create_time) = #{year} AND YEAR(create_time) = #{year}
</if> </if>
<if test="quarter != null and quarter != '' "> <if test="quarter != null and quarter != '' ">
QUARTER(create_time) = #{quarter} AND QUARTER(create_time) = #{quarter}
</if> </if>
<if test="month != null and month != '' "> <if test="month != null and month != '' ">
DATE_FORMAT(create_time, '%Y-%m') = #{month} AND DATE_FORMAT(create_time, '%Y-%m') = #{month}
</if> </if>
AND bureau_dept_id is not null AND bureau_dept_id is not null
</where> </where>

71
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -542,23 +542,86 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( SELECT * FROM enforcement_registration ( SELECT * FROM enforcement_registration
<where> <where>
<if test="enterpriseName != null and enterpriseName != ''"> <if test="enterpriseName != null and enterpriseName != ''">
enterprise_name like concat(concat('%',#{enterpriseName}),'%') AND enterprise_name like concat(concat('%',#{enterpriseName}),'%')
</if> </if>
<if test="bureauDeptName != null and bureauDeptName != ''"> <if test="bureauDeptName != null and bureauDeptName != ''">
bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%') AND bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%')
</if> </if>
<if test="lawEnforcer != null and lawEnforcer != ''"> <if test="lawEnforcer != null and lawEnforcer != ''">
(law_enforcer like concat(concat('%',#{lawEnforcer}),'%') AND (law_enforcer like concat(concat('%',#{lawEnforcer}),'%')
or or
law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%')) law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%'))
</if> </if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> <if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%') AND law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
</if>
<if test="year != null and year != ''">
AND YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(create_time, '%m') = #{month}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
AND <![CDATA[ create_time >= #{params.beginTime} ]]>
</if>
<if test="params.endTime != null and params.endTime != ''">
AND <![CDATA[ create_time <= #{params.endTime} ]]>
</if> </if>
</where> </where>
ORDER BY create_time DESC LIMIT 1000000000 ) t ORDER BY create_time DESC LIMIT 1000000000 ) t
GROUP BY GROUP BY
t.enterprise_number t.enterprise_number
order by t.create_time
</select> </select>
<select id="staticEnforcementRegistrationDetail" resultType="com.zdxt.code.domain.dto.EnforcementRegistrationDto" parameterType="EnforcementRegistrationDto">
SELECT
bureau_dept_name,
law_enforcer,
law_enforcer_two,
law_enforcement_item_text,
count( t.id ) AS total
FROM
( SELECT * FROM enforcement_registration
<where>
<if test="enterpriseName != null and enterpriseName != ''">
AND enterprise_name like concat(concat('%',#{enterpriseName}),'%')
</if>
<if test="bureauDeptName != null and bureauDeptName != ''">
AND bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%')
</if>
<if test="lawEnforcer != null and lawEnforcer != ''">
AND (law_enforcer like concat(concat('%',#{lawEnforcer}),'%')
or
law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%'))
</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''">
AND law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%')
</if>
<if test="year != null and year != ''">
AND YEAR(create_time) = #{year}
</if>
<if test="quarter != null and quarter != '' ">
AND QUARTER(create_time) = #{quarter}
</if>
<if test="month != null and month != '' ">
AND DATE_FORMAT(create_time, '%m') = #{month}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
AND <![CDATA[ create_time >= #{params.beginTime} ]]>
</if>
<if test="params.endTime != null and params.endTime != ''">
AND <![CDATA[ create_time <= #{params.endTime} ]]>
</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">
AND enterprise_number = #{enterpriseNumber}
</if>
</where>
ORDER BY create_time DESC LIMIT 1000000000 ) t
GROUP BY t.bureau_dept_id
order by t.create_time
</select>
</mapper> </mapper>
Loading…
Cancel
Save