执法检查统计修改

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

@@ -153,6 +153,10 @@
                             <span id="closeButton" class="detail-close" onclick="closeC()">×</span>
                             <table id="bootstrap-table2"></table>
                         </div>
+                        <div id="detail2" class="detail-list" style="width: 60%;">
+                            <span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
+                            <table id="bootstrap-table3"></table>
+                        </div>
                         <table id="bootstrap-table"></table>
                     </div>
 
@@ -273,6 +277,7 @@
             echarts3();
             echarts4();
             $('#detail').hide();
+            $('#detail2').hide();
             $.ajax({
                 url:"/system/dict/data"+'/queryDict',
                 type:'GET',
@@ -288,7 +293,7 @@
             var options = {
                 modalName: "执法记录统计",
                 showHeader: true,
-                showFooter: true,
+                showFooter: false,
                 showColumns: false,
                 showRefresh: false,
                 showToggle: false,
@@ -340,7 +345,8 @@
                         title : '联合检查',
                         formatter:function (value,row,index) {
                             if(value !=null && value!=''){
-                                return "<span>是</span>";
+                                /*return "<span>是</span>";*/
+                                return '<span style="cursor: pointer;color: blue;" ONCLICK="selectUnite(\'' + value + '\')">'+'是'+'</span>';
                             }else{
                                 return "<span>否</span>";
                             }
@@ -400,6 +406,122 @@
             console.log(options);
             $("#bootstrap-table").bootstrapTable(options);
         });
+        $(function() {
+            var options = {
+                modalName: "执法记录统计-联合执法",
+                showHeader: true,
+                showFooter: false,
+                showColumns: false,
+                showRefresh: false,
+                showToggle: false,
+                pagination: true,
+                pageSize: 10,
+                pageList: [10, 25, 50],
+                //quarterBoolean:quarterBoolean,
+                columns: [
+                    {
+                        field : 'bureauDeptName',
+                        title : '执法部门',
+                        formatter:function (value) {
+                            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 : 'enterpriseName',
+                        title : '企业名称',
+                        formatter:function (value) {
+                            return "<div style='text-align: left'>"+ value +"</div>";
+                        }
+                    },
+                    {
+                        field : 'lawEnforcementItemText',
+                        title : '检查事项',
+                        formatter:function (value,row,index) {
+                            return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
+                        }
+                    },
+                    {
+                        field : 'uniteCheck',
+                        title : '联合检查',
+                        formatter:function (value,row,index) {
+                            if(value !=null && value!=''){
+                                return "<span>是</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 "<div style='text-align: left'>"+ reson[i].dictLabel +"</div>";
+                                }
+                            }
+                        }
+                    },
+                    {
+                        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>';
+                            }
+                        }
+                    },
+                    {
+                        field : 'createTime',
+                        title : '检查时间'
+                    },
+                ]
+            };
+            console.log(options);
+            $("#bootstrap-table3").bootstrapTable(options);
+        });
         function echarts1(){
             var currentId=$('form').eq(1).attr('id');
             var params = $.common.formToJSON(currentId);
@@ -1075,6 +1197,22 @@
         function closeC(){
             $('#detail').hide();
         }
+        function selectUnite(value){
+            $.ajax({
+                url:prefix+'/selectUnite',
+                type:'POST',
+                data:{
+                    uniteCheck:value,
+                },
+                success: function (response) {
+                    $('#detail2').show();
+                    $('#bootstrap-table3').bootstrapTable('load', response);
+                }
+            })
+        }
+        function closeUnite(){
+            $('#detail2').hide();
+        }
 
         /*******2.年度计划TOP10********/
 

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

@@ -115,6 +115,15 @@ public class EnforcementRegistrationController extends BaseController
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistration);
         return getDataTable(list);
     }
+    @RequiresPermissions("code:registration:list")
+    @PostMapping("/selectUnite")
+    @ResponseBody
+    public TableDataInfo selectUnite(EnforcementRegistration enforcementRegistration)
+    {
+        startPage();
+        List<EnforcementRegistration> list = enforcementRegistrationService.selectUnite(enforcementRegistration);
+        return getDataTable(list);
+    }
 
     /**
      * 获取执法数据列表

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

@@ -33,6 +33,7 @@ public interface EnforcementRegistrationMapper
      */
     List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
+    List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration);
     /**
      * 查询企业端-执法登记列表
      *

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

@@ -34,7 +34,7 @@ public interface IEnforcementRegistrationService
      */
     List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
     List<EnforcementRegistration>  selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
-
+    List<EnforcementRegistration>  selectUnite(EnforcementRegistration enforcementRegistration);
     /**
      * 查询企业端-执法登录列表
      * @param enforcementRegistration

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

@@ -547,6 +547,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         return enforcementRegistrationDtos;
     }
 
+    @Override
+    public List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration){
+        return enforcementRegistrationMapper.selectUnite(enforcementRegistration);
+    }
     public static String getTime(Integer mouthTime){
         int year = LocalDate.now().getYear();
         int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1);

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

@@ -634,4 +634,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY t.bureau_dept_id
         order by t.create_time
     </select>
+    <select id="selectUnite" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
+        <include refid="selectEnforcementRegistrationVo"/>
+        <where>
+            <if test="uniteCheck != null and uniteCheck != ''">
+                and unite_check=#{uniteCheck}
+            </if>
+        </where>
+    </select>
 </mapper>