监督端-预警详情列表-将字段修改成与执法记录一致（无牵头标识，以及联合执法查看效果）（为适应开发环境无相应企业信息以及预约工单，部分做相应调整）

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/LawEnforcementWarningList/registrationDetail.html

@@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('企业端-执法部门预约记录列表')" />
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet" />
 </head>
 <body class="gray-bg">
 <div class="container-div">
@@ -40,6 +41,10 @@
 
         <div class="btn-group-sm" id="toolbar" role="group"></div>
         <div class="col-sm-12 select-table table-bordered">
+            <div id="detail" class="detail-list">
+                <span id="closeComplaint" class="detail-close" onclick="closeC()">×</span>
+                <table id="bootstrap-table2"></table>
+            </div>
             <table id="bootstrap-table"></table>
         </div>
     </div>
@@ -47,8 +52,23 @@
 <th:block th:include="zdxtInclude :: footer" />
 <script th:inline="javascript">
     var prefix = ctx + "code/registration";
+    var prefixC= ctx+"code/complaintStatic";
+    var checkCategory=[[${@dict.getType('check_category')}]];
+    var reson=[[${@dict.getType('no-scan-reason')}]];
+    var caseType=[];
     window.onload = function () {
         rTable();
+        $('#detail').hide();
+        $.ajax({
+            url:"/system/dict/data"+'/queryDict',
+            type:'GET',
+            data:{
+                dictType:"caseType",
+            },
+            success: function (response) {
+                caseType.push(response);
+            }
+        })
     }
     function goBackToList() {
         window.sessionStorage.setItem('registrationDetailVueGo', true);
@@ -68,6 +88,62 @@
             pageSize: 10,
             pageList: [10, 25, 50],
             //quarterBoolean:quarterBoolean,
+            /*columns: [
+                {
+                    field : 'enterpriseName',
+                    title : '被检查企业名称',
+                    formatter:function (value) {
+                        return "<div style='text-align: left'>"+ value +"</div>";
+                    }
+                },
+                {
+                    field : 'qy',
+                    title : '企业所属区域'
+                },
+                {
+                    field : 'jd',
+                    title : '企业所属街道'
+                },
+                {
+                    field : 'bureauDeptName',
+                    title : '执法部门',
+                    /!*formatter:function (value,row,index) {
+                        if(row.uniteType==1){
+                            return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
+                        }else {
+                            return "<div style='text-align: left'>" + value + "</div>";
+                        }
+                    }*!/
+                },
+                {
+                    field : 'lawEnforcement',
+                    title : '执法人员',
+                    formatter:function (value,row,index) {
+                        name="";
+                        if(row.lawEnforcer!=""&&row.lawEnforcer!=null){
+                            name=row.lawEnforcer;
+                        }
+                        if(row.lawEnforcer!=""&&row.lawEnforcer!=null&&row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
+                            name=name+",";
+                        }
+                        if(row.lawEnforcerTwo!=""&&row.lawEnforcerTwo!=null){
+                            name=name+row.lawEnforcerTwo;
+                        }
+                        return name;
+                    }
+                },
+                {
+                    field : 'lawEnforcementItemText',
+                    title : '检查事项',
+                    formatter:function (value,row,index) {
+                        return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
+                    }
+                },
+                {
+                    field : 'createTime',
+                    title : '检查时间'
+                },
+            ]*/
             columns: [
                 {
                     field : 'enterpriseName',
@@ -87,13 +163,13 @@
                 {
                     field : 'bureauDeptName',
                     title : '执法部门',
-                    /*formatter:function (value,row,index) {
+                    formatter:function (value,row,index) {
                         if(row.uniteType==1){
                             return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
                         }else {
                             return "<div style='text-align: left'>" + value + "</div>";
                         }
-                    }*/
+                    }
                 },
                 {
                     field : 'lawEnforcement',
@@ -123,6 +199,63 @@
                     field : 'createTime',
                     title : '检查时间'
                 },
+                {
+                    field : 'uniteCheck',
+                    title : '联合检查',
+                    formatter:function (value,row,index) {
+                        if(value !=null && value!=''){
+                            return "<span>是</span>";
+                            /*return '<span style="cursor: pointer;color: blue;" ONCLICK="selectUnite(\'' + index + '\')">'+'是'+'</span>';*/
+                        }else{
+                            return "<span>否</span>";
+                        }
+                    }
+                },
+                {
+                    field : 'checkCategory',
+                    title : '行政检查类别',
+                    formatter:function (value,row,index) {
+                        for(i=0;i<checkCategory.length;i++){
+                            if(checkCategory[i].dictValue==row.checkCategory){
+                                return checkCategory[i].dictLabel;
+                            }
+                        }
+                    }
+                },
+                {
+                    field : 'checkCss',
+                    title : '是否扫码',
+                    formatter:function (value,row,index) {
+                        if(value != null&& value !=''){
+                            return "<span>否</span>";
+                        }else{
+                            return "<span>是</span>";
+                        }
+                    }
+                },
+                {
+                    field : 'checkCss',
+                    title : '未扫码原因',
+                    formatter:function (value,row,index) {
+                        for (i = 0; i < reson.length; i++) {
+                            if (reson[i].dictValue == row.checkCss) {
+                                return "<span>"+ reson[i].dictLabel +"</span>";
+                            }
+                        }
+                    }
+                },
+                {
+                    field : 'isComplaint',
+                    title : '是否投诉',
+                    formatter:function (value,row,index) {
+                        if(value == 0){
+                            return "<span>否</span>";
+                        }else{
+                            /*return "<span>是</span>";*/
+                            return '<span style="cursor: pointer;color: blue;" ONCLICK="selectC(\'' + row.id + '\')">'+'是'+'</span>';
+                        }
+                    }
+                },
             ]
         };
         console.log(options);
@@ -147,6 +280,73 @@
         console.log($.common.formToJSON($('form').eq(0).attr('id')));
         rTable();
     }
+    function selectC(rid) {
+        $.ajax({
+            url:prefixC+'/complaintByRid',
+            type:'GET',
+            data:{
+                rid:rid,
+            },
+            success: function (response) {
+                $('#detail').show();
+                $('#bootstrap-table2').bootstrapTable('load', response);
+            }
+        })
+    }
+    $(function() {
+        var options2 = {
+            modalName: "执法记录统计",
+            showHeader: true,
+            showFooter: false,
+            showColumns: false,
+            showRefresh: false,
+            showToggle: false,
+            pagination: true,
+            pageSize: 10,
+            pageList: [10, 25, 50],
+            //quarterBoolean:quarterBoolean,
+            columns: [
+                {
+                    field: 'complaintDepartment',
+                    title: '被投诉对象'
+                },
+                {
+                    field: 'enterpriseName',
+                    title: '企业名称'
+                },
+                {
+                    field: 'enforceType',
+                    title: '投诉类型',
+                    formatter:function (value,row,index) {
+                        // debugger
+                        for(i=0;i<caseType[0].data.length;i++){
+                            // debugger
+                            if(caseType[0].data[i].dictValue==value){
+                                // debugger
+                                return caseType[0].data[i].dictLabel;
+                            }
+                        }
+                    }
+                },
+                {
+                    field: 'problemDescription',
+                    title: '问题描述'
+                },
+                {
+                    field: 'linkman',
+                    title: '联系人'
+                },
+                {
+                    field: 'linkman_tel',
+                    title: '联系电话'
+                }
+            ],
+        }
+        $("#bootstrap-table2").bootstrapTable(options2);
+    })
+    function closeC(){
+        $('#detail').hide();
+    }
     /*$(function() {
         var options = {
             url: prefix + "/listWarn",

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

@@ -134,7 +134,9 @@ public class EnforcementRegistrationController extends BaseController
                 enforcementRegistration.setJd(jd);
                 enforcementRegistration.setQy(qy);
                 List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
-                list=enforcementRegistrationService.untieCheck1Make(list);
+                /*   注释为过滤开发环境无预约工单情况，正式环境可开启，此代码用于执法记录列表中对联合执法的记录标注牵头单位以及联合单位
+                    list=enforcementRegistrationService.untieCheck1Make(list);
+                */
                 for(int i=0;i<list.size();i++){
                     list.get(i).setQy(qy);
                     list.get(i).setJd(jd);
@@ -146,7 +148,9 @@ public class EnforcementRegistrationController extends BaseController
                 List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy());
                 enforcementRegistration.setQy(qy);
                 List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
-                list=enforcementRegistrationService.untieCheck1Make(list);
+//              /*   注释为过滤开发环境无预约工单情况，正式环境可开启，此代码用于执法记录列表中对联合执法的记录标注牵头单位以及联合单位
+//                    list=enforcementRegistrationService.untieCheck1Make(list);
+//                */
                 /*List<String> jdStrings=new ArrayList<>();
                 for(DictData dictData:jdList){
                     jdStrings.add(dictData.getDictLabel());
@@ -179,6 +183,9 @@ public class EnforcementRegistrationController extends BaseController
             List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
             list=enforcementRegistrationService.untieCheck1Make(list);
             List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
+            //enterpriseIsNot为过滤开发环境时无企业信息的情况，正式环境可将编号abc注释
+            List<EnforcementRegistration> enterpriseIsNot=list.stream().filter(item->item.getEnterpriseAddress()==null).collect(Collectors.toList());//a
+            list=list.stream().filter(item->item.getEnterpriseAddress()!=null).collect(Collectors.toList());//b
             for(DictData qy:qyList){
                 List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
                 /*List<String> jdStrings=new ArrayList<>();
@@ -205,6 +212,7 @@ public class EnforcementRegistrationController extends BaseController
                 }
             }
             List<EnforcementRegistration>qtqyList=list.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+            qtqyList.addAll(enterpriseIsNot);//c
             if(qtqyList.size()>0){
                 enforcementRegistrationsList.addAll(qtqyList);
             }
@@ -750,7 +758,9 @@ public class EnforcementRegistrationController extends BaseController
     @PostMapping("/RWList")
     @ResponseBody
     public TableDataInfo RWList (EnforcementRegistration enforcementRegistration){
+        //获取区域字典
         List<DictData> qyList=iDictDataService.selectDictDataByType("address_Type");
+        //获取区域名称列表
         List<String> qyStrings=new ArrayList<>();
         for(DictData dictData:qyList){
             qyStrings.add(dictData.getDictLabel());
@@ -758,6 +768,9 @@ public class EnforcementRegistrationController extends BaseController
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
         /*list=enforcementRegistrationService.untieCheck1Make(list);*///牵头单位标识
         List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
+        //enterpriseIsNot为过滤开发环境时无企业信息的情况，正式环境可将编号abc注释
+        List<EnforcementRegistration> enterpriseIsNot=list.stream().filter(item->item.getEnterpriseAddress()==null).collect(Collectors.toList());//a
+        list=list.stream().filter(item->item.getEnterpriseAddress()!=null).collect(Collectors.toList());//b
         for(DictData qy:qyList){
             List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
                 /*List<String> jdStrings=new ArrayList<>();
@@ -784,6 +797,7 @@ public class EnforcementRegistrationController extends BaseController
             }
         }
         List<EnforcementRegistration>qtqyList=list.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList());
+        qtqyList.addAll(enterpriseIsNot);//c
         if(qtqyList.size()>0){
             enforcementRegistrationsList.addAll(qtqyList);
         }

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

@@ -34,6 +34,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zdxt.code.mapper.EnforcementRegistrationMapper;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -938,12 +939,16 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
                 //获取预约id，查出该工单--1为主，0为副 再优化
                 if(!StrUtil.hasEmpty(uniteMap.get(false).get(i).getLawId())){
                     EnterpriseLawEnforcement enterpriseLawEnforcement=enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(uniteMap.get(false).get(i).getLawId());
-                    uniteMap.get(false).get(i).setUniteType(enterpriseLawEnforcement.getMainDeputyOrder());
-                    if(enterpriseLawEnforcement.getMainDeputyOrder()==1){
-                        firstList.add(uniteMap.get(false).get(i));
-                    }else {
-                        second.add(uniteMap.get(false).get(i));
+                    //适应开发环境无企业信息情况
+                    if(!ObjectUtils.isEmpty(enterpriseLawEnforcement)){
+                        uniteMap.get(false).get(i).setUniteType(enterpriseLawEnforcement.getMainDeputyOrder());
+                        if(enterpriseLawEnforcement.getMainDeputyOrder()==1){
+                            firstList.add(uniteMap.get(false).get(i));
+                        }else {
+                            second.add(uniteMap.get(false).get(i));
+                        }
                     }
+
                 }
             }
             list=firstList;