diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js index 846963dd..301cce1b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/project/message/js/wbsUtil.js @@ -7,7 +7,6 @@ var websocketUtil={ websocketUtil._openWebSocket(); //连接发生错误的回调方法 websocket.onerror = function () { - debugger console.log("WebSocket连接发生错误"); websocketUtil._openWebSocket(); //websocketUtil._init(); @@ -18,18 +17,18 @@ var websocketUtil={ websocket.onopen = function () { websocketUtil._getMes(); - } + }; //接收到消息的回调方法 websocket.onmessage = function (event) { debugger websocketUtil._getMes(); - } + }; //连接关闭的回调方法 websocket.onclose = function () { //setMessageInnerHTML("WebSocket连接关闭"); - } + }; //监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。 window.onbeforeunload = function () { @@ -38,7 +37,7 @@ var websocketUtil={ }, //发送消息 _send:function(message){ - websocketUtil._openWebSocket() + websocketUtil._openWebSocket(); try { //发送消息 websocket.addEventListener('open',function(){ @@ -82,7 +81,7 @@ var websocketUtil={ }, //获取消息 _getMes:function(){ - var data={"receiverId":userId} + var data={"receiverId":userId}; var url="/message/action/getReceiver"; $.ajax({ type: "POST", @@ -102,7 +101,7 @@ var websocketUtil={ _openMSG:function(data){ var width=400; var height=400; - var title="消息提示" + var title="消息提示"; var content="

你小子有点带

"; for(var i=0;i +
@@ -26,7 +27,9 @@ - + +
  •  搜索  重置 @@ -36,21 +39,14 @@
    • - - - - - - - - - - - - - - +
    + 当月累计接受行政检查三至四次为黄色提示，五至六次为橙色提示，七次及以上为红色提示。 +
    +
    + × +
    +
    @@ -59,8 +55,15 @@ \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html index 0ce06a59..d29f0c07 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html @@ -49,13 +49,14 @@ $(function() { var options = { - url: prefix + "/list", + url: prefix + "/listWarn", createUrl: prefix + "/add", updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", detailUrl: prefix + "/detail/{id}", exportUrl: prefix + "/export", modalName: "企业端-执法部门预约记录", + height: $(window).height() - 150, showHeader: false, showFooter: false, showColumns: false, @@ -70,11 +71,7 @@ visible: false }, { - field : 'lawEnforcementCode', - title : '登记编号' - }, - { - field : 'lawEnforcement', + field : 'bureauDeptName', title : '执法部门' }, { @@ -86,8 +83,8 @@ title : '企业税号' }, { - field : 'enforcementTime', - title : '执法时间' + field : 'lawEnforcementItemText', + title : '执法事项' }, { field : 'lawEnforcer', @@ -97,30 +94,11 @@ } }, { - field : 'lawEnforcerTel', - title : '执法人员联系方式', - formatter:function (value,row,index) { - return (value != null && value != "" ? value : "") + - ( row.lawEnforcerTelTwo != "" && row.lawEnforcerTelTwo !=null? "," + row.lawEnforcerTelTwo : ""); - } - }, - { - field : 'lawEnforcementItemText', - title : '执法事项' - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - // actions.push(' 编辑 '); - // actions.push(' 详情'); - return actions.join(''); - } - }] + field : 'enforcementTime', + title : '执法时间' + },] }; $.table.init(options); - }); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 579ce360..cc1434cb 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -114,15 +114,15 @@ public class EnforcementRegistrationController extends BaseController /** * 查询执法端-执法登记列表 */ - /*@RequiresPermissions("code:registration:list") - @PostMapping("/list") + @RequiresPermissions("code:registration:list") + @PostMapping("/listWarn") @ResponseBody - public TableDataInfo list(EnforcementRegistration enforcementRegistration) + public TableDataInfo listWarn(EnforcementRegistration enforcementRegistration) { startPage(); - List list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration); + List list = enforcementRegistrationService.selectEnforcementRegistrationList(enforcementRegistration); return getDataTable(list); - }*/ + } @RequiresPermissions("code:registration:list") @PostMapping("/list") @ResponseBody diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml index 6e7b2cec..d3f17615 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(warning_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') - ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000 + ORDER BY enforcement_number DESC,create_time DESC LIMIT 1000000000 ) t GROUP BY t.enterprise_number order by t.create_time desc