Browse Source

pc登记查询

v6
yanyan 1 year ago
parent
commit
6f476829f0
  1. 332
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html
  2. 48
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  3. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java
  4. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

332
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html

@ -0,0 +1,332 @@
<!DOCTYPE html>
<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" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<p>企业名称:</p>
<input type="text" id="enterpriseName" name="enterpriseName"/>
</li>
<li>
<p>检查次数:</p>
<input type="text" id="num" name="num"/>
</li>
<!-- <li class="select-time" onmouseover="tipShow()" onmouseleave="tipHide()">-->
<li 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"/>
<input type="hidden" name="currentMonth">
</li>
<li>
<a class="btn btn-success btn-sm" onclick="searchW()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-reset btn-sm" onclick="resetW()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
<!-- <a class="btn btn-warning btn-sm" onclick="downloadRW()"><i class="fa fa-share-square-o"></i> 导出</a>-->
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group" style="color: orange">
<span id="warnDay">近30天</span>被检查企业数量:<span id="warnEn"></span>家 总检查次数:<span id="warnCount"></span>
</div>
<div class="btn-group-sm" id="tip" >当筛选起止日期为同年同月时有统计</div>
<div class="btn-group-sm" id="tips" role="group">
</div>
<div class="col-sm-12 select-table table-bordered">
<div id="detail2" class="detail-list" style="width: 75%;">
<span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
<table id="bootstrap-table3"></table>
</div>
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="zdxtInclude :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('code:LawEnforcementWarningList:edit')}]];
var prefix = ctx + "code/LawEnforcementWarningList";
var prefix2 = ctx + "code/registration";
window.onload = function () {
$("#tip").hide();
if(window.sessionStorage.getItem('registrationDetailVueGo')){
document.getElementById("enterpriseName").value=window.sessionStorage.getItem('lawEnforcementWarningList-enterpriseName');
document.getElementById("warningLevel").value=window.sessionStorage.getItem('lawEnforcementWarningList-warningLevel');
document.getElementById("startTime").value=window.sessionStorage.getItem('lawEnforcementWarningList-startTime');
document.getElementById("endTime").value=window.sessionStorage.getItem('lawEnforcementWarningList-endTime');
// $.table.search();
searchW();
sessionStorage.clear();
console.log(window.sessionStorage.getItem('lawEnforcementWarningList-enterpriseName'));
console.log(window.sessionStorage.getItem('lawEnforcementWarningList-warningLevel'));
console.log(window.sessionStorage.getItem('lawEnforcementWarningList-startTime'));
console.log(window.sessionStorage.getItem('lawEnforcementWarningList-endTime'));
}else{
searchW();
}
}
function tipShow(){
$("#tip").show();
}
function tipHide(){
$("#tip").hide();
}
$(function() {
$('#detail2').hide();
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
$("input[name='currentMonth']").val(year + "-" + month);
var options = {
modalName: "执法预警列表",
showHeader: true,
showFooter: false,
showColumns: false,
showRefresh: false,
showToggle: false,
pagination: true,
pageSize: 10,
pageList: [10, 25, 50],
columns: [
{
field : 'id',
title : '主键ID',
visible: false
},
{
field : 'enterpriseName',
title : '企业名称'
},
{
field : 'num',
title : '检查次数',
formatter:function (value,row,index) {
return "<span style='cursor: pointer;color: blue'" +
" onclick='selectUnite(\""+row.enterpriseNumber+ "\",\""+row.beginTime+ "\",\""+row.endTime+ "\")'>" +value+ "</span>";
}
},
{
field : 'createTime',
title : '最后一次检查时间',
formatter:function (value){
return value.slice(0, -9);
}
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
return actions.join('');
}
}
],
// onPostBody: function(data) {
// let count = 0;
// for (let i = 0; i < data.length; i++) {
// count = count+ parseInt(data[i].num);
// i++;
// }
// $("#warnEn").text(data.length)
// $("#warnCount").text(count)
// }
};
// $.table.init(options);
$("#bootstrap-table").bootstrapTable(options);
});
function detail(dictId) {
console.log(dictId);
window.sessionStorage.setItem('lawEnforcementWarningList-enterpriseName', document.getElementById("enterpriseName").value);
window.sessionStorage.setItem('lawEnforcementWarningList-warningLevel', document.getElementById("warningLevel").value);
window.sessionStorage.setItem('lawEnforcementWarningList-startTime', document.getElementById("startTime").value);
window.sessionStorage.setItem('lawEnforcementWarningList-endTime', document.getElementById("endTime").value);
var url = prefix + '/registrationDetail/' + dictId;
$.modal.openTab("字典数据", url);
}
function selectUnite(value,beginTime,endTime){
let start = $("#startTime").val();
let end = $("#endTime").val();
let num = $("#num").val();
$.ajax({
url: prefix2 +'/queryByEpId',
type:'POST',
data:{
"enterpriseNumber": value,
"beginTime": start,
"endTime": end,
"num": num
},
success: function (response) {
$('#detail2').show();
$('#bootstrap-table3').bootstrapTable('load', response);
}
})
}
function closeUnite(){
$('#detail2').hide();
}
$(function() {
var options = {
showHeader: true,
showFooter: false,
showColumns: false,
showRefresh: false,
showToggle: false,
pagination: true,
pageSize: 10,
pageList: [10, 25, 50],
columns: [
{
field : 'id',
title : '主键ID',
visible: false
},
{
field : 'bureauDeptName',
title : '执法部门'
},
{
field : 'lawEnforcementItemText',
title : '执法事项'
},
{
field : 'enforcementTime',
title : '执法时间'
},]
};
$("#bootstrap-table3").bootstrapTable(options);
});
function searchW(){
$("#tips").hide()
rTable()
// tipsChange()
}
function rTable(){
$("#warnDay").text("")
if (($("#startTime").val()==null || $("#startTime").val()=="")
&& ($("#endTime").val()==null || $("#endTime").val()=="")) {
$("#warnDay").text("近30天")
}
if ($("#startTime").val()!=null && $("#startTime").val()!==""){
$("#warnDay").text("搜索开始时间为:"+ $("#startTime").val())
}
if ($("#endTime").val()!=null && $("#endTime").val()!==""){
$("#warnDay").text($("#warnDay").text()+"搜索结束时间为:"+ $("#endTime").val())
}
var currentId=$('form').eq(0).attr('id');
var params = $.common.formToJSON(currentId);
$.ajax({
url: prefix2 + "/queryListNew",
method: 'post',
data:params,
success:function (response){
$("#warnEn").text(response.total)
$("#warnCount").text(response.msg)
$('#bootstrap-table').bootstrapTable('load', response);
data1=response;
// console.log(data1);
},error:function (xhr,status,error){
console.error("请求失败:",status,error);
}
})
}
function resetW(){
$('form').eq(0).trigger("reset");
console.log($.common.formToJSON($('form').eq(0).attr('id')));
searchW();
}
function tipsChange(){
var beginTime=document.getElementById('startTime').value;
var endTime=document.getElementById('endTime').value;
if(beginTime!=null&&beginTime!=""&&endTime!=null&&endTime!=""){
var beginDate=new Date(beginTime);
var endDate=new Date(endTime);
if(beginDate.getFullYear()==endDate.getFullYear()&&beginDate.getMonth()==endDate.getMonth()){
var currentId=$('form').eq(0).attr('id');
var params = $.common.formToJSON(currentId);
$.ajax({
url: prefix + "/tips",
method: 'GET',
data:params,
success:function (response){
console.log(response)
document.getElementById("tips").textContent = "被预警企业数"+response[0]+"家 被检査次数:3~4次"+response[1]+"家、5~6次"+response[2]+"家、7次以上"+response[3]+"家";
$("#tips").show()
},error:function (xhr,status,error){
console.error("请求失败:",status,error);
}
})
}
}
}
function downloadRW(){
var currentId=$('form').eq(0).attr('id');
var params = $.common.formToJSON(currentId);
/* $.ajax({
type: "POST",
data: JSON.stringify(params),
contentType: 'application/json',
//设置响应类型
xhrFields: {responseType: "blob"},
url: prefix+"/exportWarnList",
success: function (result) {
const link = document.createElement('a');
let blob = new Blob([result], {type: 'application/vnd.ms-excel'});
link.style.display = 'none';
link.href = URL.createObjectURL(blob);
link.setAttribute('download', "预警列表.xls");
document.body.appendChild(link);
link.click();
document.body.removeChild(link)
}
})*/
console.log(params)
let paramsList=[]
for(var key in params){
if (params.hasOwnProperty(key)) {
var value = params[key];
// 检查值是否为空
if (value!== null && value!== undefined && value!== '') {
paramsList.push(key + '=' + value);
}
}
}
console.log(paramsList)
console.log(paramsList.join("&"))
window.location.href = prefix +"/exportWarnList?"+paramsList.join("&")
}
// // 获取当前日期和时间
// var currentDate = new Date();
// var beforeDate = new Date(new Date().setDate(currentDate.getDate() - 30));
//
// // 获取年份、月份和日期
// var year = currentDate.getFullYear();
// var month = currentDate.getMonth() + 1; // getMonth()返回的月份是从0开始的,所以需要加1
// var day = currentDate.getDate();
// // 获取年份、月份和日期
// var year1 = beforeDate.getFullYear();
// var month1 = beforeDate.getMonth() + 1; // getMonth()返回的月份是从0开始的,所以需要加1
// var day1 = beforeDate.getDate();
// // 将年份、月份和日期拼接成一个字符串
// var beginTime = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + (day1 < 10 ? '0' + day1 : day1);
// var endTime = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day);
</script>
</body>
</html>

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

@ -13,6 +13,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import cn.hutool.core.util.StrUtil;
import com.zdxt.auth.dto.UserBean;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.project.system.dept.service.IDeptService;
import com.zdxt.auth.project.system.dict.mapper.DictDataMapper;
import com.zdxt.auth.project.system.dict.service.IDictDataService;
@ -26,6 +28,7 @@ import com.zdxt.code.service.EnforcementCheckStatisticsService;
import com.zdxt.code.service.ILinkageDictService;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.controller.BaseController;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.util.ExcelUtils;
import com.zdxt.common.util.StringUtils;
import com.zdxt.common.util.TableDataInfo;
@ -72,6 +75,9 @@ public class EnforcementRegistrationController extends BaseController
@Autowired
private DictDataMapper dictDataMapper;
@Autowired
private UserApi userApi;
@RequiresPermissions("code:registration:view")
@GetMapping()
public String registration(Model model)
@ -340,6 +346,48 @@ public class EnforcementRegistrationController extends BaseController
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration);
return ZDResponse.success("查询成功",list);
}
/**
* 查询执法端-执法登记列表
*/
@PostMapping("/queryListNew")
@ResponseBody
public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration)
{
if (StringUtils.isEmpty(enforcementRegistration.getBeginTime())
&& StringUtils.isEmpty(enforcementRegistration.getEndTime())) {
enforcementRegistration.setBeginTime(DateUtils.getPastTimes(30));
enforcementRegistration.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd"));
}
//查询检查总次数
List<EnforcementRegistration> registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
int count = 0;
if (registrations.size() >0) {
count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum);
}
UserBean userByUserId = userApi.getCurrentUser();
enforcementRegistration.setDeptId(userByUserId == null ? null : userByUserId.getDeptId());
startPage();
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
TableDataInfo dataTable = getDataTable(list);
dataTable.setMsg(count);
return dataTable;
}
@PostMapping("/queryByEpId")
@ResponseBody
public TableDataInfo queryByEpId(EnforcementRegistration enforcementRegistration)
{
if (StringUtils.isEmpty(enforcementRegistration.getBeginTime())
&& StringUtils.isEmpty(enforcementRegistration.getEndTime())) {
enforcementRegistration.setBeginTime(DateUtils.getPastTimes(30));
enforcementRegistration.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd"));
}
startPage();
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration);
return getDataTable(list);
}
@RequiresPermissions("code:registration:list")
@PostMapping("/echarts1")
@ResponseBody

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LawEnforcementWarningListController.java

@ -53,7 +53,7 @@ public class LawEnforcementWarningListController extends BaseController
@GetMapping()
public String LawEnforcementWarningList()
{
return prefix + "/LawEnforcementWarningList";
return "/project/code/registration/registerView";
}
/**

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

@ -238,6 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="numRight != null and numRight != ''">
and t.num &lt;= #{numRight}
</if>
<if test="num != null and num != ''">
and t.num &gt;= #{num}
</if>
<!-- <if test="deptId != null and warnType!=null and warnType ==0" >-->
<!-- and t.bureau_dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors)-->
<!-- </if>-->

Loading…
Cancel
Save