统计

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java

@@ -579,4 +579,8 @@ public class DeptServiceImpl implements IDeptService
     public Dept selectDeptByDeptName2(String string){
         return deptMapper.selectDeptByDeptName2(string);
     }
+    @Override
+    public Dept selectDeptByCreditcode(String string){
+        return deptMapper.selectDeptByCreditcode(string);
+    }
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/IDeptService.java

@@ -167,4 +167,6 @@ public interface IDeptService
     List<Dept> selectDeptByDeptName(String string);
 
     Dept selectDeptByDeptName2(String string);
+
+    Dept selectDeptByCreditcode(String string);
 }

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml

@@ -70,7 +70,10 @@
         order by create_time desc
         limit 1
     </select>
-
+    <select id="selectDeptByCreditcode" parameterType="String" resultMap="DeptResult">
+        select dept_id, parent_id,dept_name, creditcode from sys_dept
+        <where>and creditcode = #{string}</where>
+    </select>
     <update id="updateAncestorsById" parameterType="Dept">
         update sys_dept
         <set>

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

@@ -334,11 +334,10 @@
             document.getElementById(`${prefix}-tab${num}`).classList.add('active');
         }
         function searchComplaint1 () {
-            debugger
+
             rTable1();
             var currentId=$('form').eq(0).attr('id');
             var params = $.common.formToJSON(currentId);
-            debugger
             $.ajax({
                 url:prefix+'/searchType1',
                 type:'GET',
@@ -411,7 +410,6 @@
                             ]
                         }
                         myChart.setOption(option3);
-                        debugger;
                     }
                 },
                 error:function (xhr,status,error){
@@ -449,7 +447,6 @@
                 document.getElementById("quarter2").value="";
                 $("#month2").show();
             }else {
-                debugger
                 $("#quarter2").hide();
                 document.getElementById("quarter2").value="";
                 $("#month2").hide();
@@ -470,7 +467,6 @@
                 data:params,
                 success:function (response){
                     console.log(response);
-                    debugger
                     $('#closeButton').show();
                     $('#detail').show();
                     $('#bootstrap-table').bootstrapTable('load', response);
@@ -480,7 +476,6 @@
             })
         }
         function closeC(){
-            debugger
             $('#closeButton').hide();
             $('#detail').hide();
         }

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

@@ -389,7 +389,6 @@
                         ]
                     };
                     echart1.setOption(option1);
-                    debugger;
                 }
             });
             // 使用刚指定的配置项和数据显示图表。
@@ -413,7 +412,6 @@
                     response.forEach(e => {
                         ydata.push(e.value)
                     })
-                    debugger
                     var option2 = {
                         tooltip: {},
                         xAxis: {
@@ -452,7 +450,6 @@
                     response.forEach(e => {
                         ydata.push(e.value)
                     })
-                    debugger
                     var option3 = {
                         tooltip: {},
                         xAxis: {

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

@@ -404,7 +404,6 @@
         })
     }
     function closeE(){
-        debugger
         $('#closeButton').hide();
         $('#bootstrap-table').bootstrapTable('destroy');
         $('#bootstrap-table1').show();
@@ -422,7 +421,6 @@
             document.getElementById("quarter2").value="";
             $("#month2").show();
         }else {
-            debugger
             $("#quarter2").hide();
             document.getElementById("quarter2").value="";
             $("#month2").hide();

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

@@ -93,17 +93,7 @@ public class DeptStaticController extends BaseController {
         }*/
         startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
-        List<User> userlist=userMapper.selectUserList(new User());
+
-        //userlist=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList());
-        List<User> users=userlist.stream().filter(item->item.getCertificateNumber()!=null&&!"".equals(item.getCertificateNumber())).collect(Collectors.toList());
-        Map<String,User> userMap=users.stream().collect(Collectors.toMap(User::getCertificateNumber, Function.identity()));
-        for(int i=0;i<zfryjdm2405301List.size();i++){
-            if(zfryjdm2405301List.get(i).getSfzcodeEncrypt()!=null&&!"".equals(zfryjdm2405301List.get(i).getSfzcodeEncrypt())) {
-                if (userMap.containsKey(zfryjdm2405301List.get(i).getSfzcodeEncrypt())) {
-                    zfryjdm2405301List.get(i).setPhoneNumber(userMap.get(zfryjdm2405301List.get(i).getSfzcodeEncrypt()).getPhonenumber());
-                }
-            }
-        }
 
         /*List<User> users=new ArrayList<>();
         for(User u:list){

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

@@ -215,7 +215,7 @@ public class EnforcementCheckStatisticsController extends BaseController {
         }
         Long userId=searchType.getUserId();
         String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum();
-        String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
+        String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm();//待修改，组织机构代码非deptId
         /*String certificateNumber=userMapper.selectUserById(userId).getCertificateNumber();
         String deptId=zfryjdm2405301Mapper.selectZfryBySfz(certificateNumber).getZzjgdm();*/
         searchType.setUserId(null);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -172,8 +172,16 @@ public class EnforcementRegistration extends BaseDomain
     private String lawEnforcer2Show;
     // 用来展示执法人员名称 - 执法编码的 (List)
     private List<String> lawEnforcer2List;
+    //部门权限
+    private String deptQx;
 
+    public String getDeptQx() {
+        return deptQx;
+    }
 
+    public void setDeptQx(String deptQx) {
+        this.deptQx = deptQx;
+    }
 
     public List<String> getLawEnforcer2List() {
         return lawEnforcer2List;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java

@@ -75,7 +75,15 @@ public class LawEnforcementWarningList extends BaseDomain
      */
     private Integer dateType;
 
+    private String deptQx;
 
+    public String getDeptQx() {
+        return deptQx;
+    }
+
+    public void setDeptQx(String deptQx) {
+        this.deptQx = deptQx;
+    }
     public void setId(String id) 
     {
         this.id = id;

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

@@ -1,5 +1,7 @@
 package com.zdxt.code.service.impl;
 
+import com.zdxt.auth.feign.UserApi;
+import com.zdxt.auth.project.system.dept.service.IDeptService;
 import com.zdxt.code.domain.*;
 import com.zdxt.code.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,14 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
     private IEnforcementRegistrationService enforcementRegistrationService;
     @Autowired
     private IEnterpriseInformationService iEnterpriseInformationService;
+    @Autowired
+    private UserApi userApi;
+    @Autowired
+    private IZfztjdm111915Service iZfztjdm111915Service;
+    @Autowired
+    private IZfryjdm2405301Service iZfryjdm2405301Service;
+    @Autowired
+    private IDeptService iDeptService;
 
     /**
      * 企业--无权限
@@ -72,12 +82,13 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
     }
 
     /**
-     * 执法检查--本单位执法检查需设权限未设
+     * 执法检查--本单位执法检查已设权限
      * @param statisticsIndicatorPart
      * @return
      */
     @Override
     public StatisticsIndicatorPart registration(StatisticsIndicatorPart statisticsIndicatorPart){
+        String deptId=takeDeptId();
         StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart);
         StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime());
         EnforcementRegistration enforcementRegistrationNow=new EnforcementRegistration();
@@ -99,9 +110,13 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
         p2.setTotal(uniteListNow.size());
         p2.setHuan(uniteListNow.size()-uniteListLast.size());
         StatisticsIndicatorPart p3=new StatisticsIndicatorPart();
+        enforcementRegistrationNow.setDeptQx(deptId);
+        enforcementRegistrationLast.setDeptQx(deptId);
+        List<EnforcementRegistration> qxNow = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistrationNow);
+        List<EnforcementRegistration> qxLast = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistrationLast);
         p3.setName("本单位检查数量");
-        p3.setTotal(now.size());
+        p3.setTotal(qxNow.size());
-        p3.setHuan(now.size()-last.size());
+        p3.setHuan(qxNow.size()-qxLast.size());
         StatisticsIndicatorPart p=new StatisticsIndicatorPart();
         List<StatisticsIndicatorPart> statisticsIndicatorPartList=new ArrayList<>();
         p.setName("执法检查");
@@ -112,12 +127,13 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
         return p;
     }
     /**
-     * 预警部分--本部门需设权限未设
+     * 预警部分--本部门需设权限已设
      * @param statisticsIndicatorPart
      * @return
      */
     @Override
     public StatisticsIndicatorPart warning(StatisticsIndicatorPart statisticsIndicatorPart){
+        String deptId=takeDeptId();
         StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart);
         StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime());
         LawEnforcementWarningList warningStatisticsNow=new LawEnforcementWarningList();
@@ -139,9 +155,13 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
         p2.setTotal(mapNow.size());
         p2.setHuan(mapNow.size()-mapLast.size());
         StatisticsIndicatorPart p3=new StatisticsIndicatorPart();
+        warningStatisticsNow.setDeptQx(deptId);
+        warningStatisticsLast.setDeptQx(deptId);
+        List<LawEnforcementWarningList> qxNow=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsNow);
+        List<LawEnforcementWarningList> qxLast=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsLast);
         p3.setName("本单位发布预警数量");
-        p3.setTotal(lListNow1.size());
+        p3.setTotal(qxNow.size());
-        p3.setHuan(lListNow1.size()-lListLast1.size());
+        p3.setHuan(qxNow.size()-qxLast.size());
         StatisticsIndicatorPart p=new StatisticsIndicatorPart();
         List<StatisticsIndicatorPart> statisticsIndicatorPartList=new ArrayList<>();
         p.setName("执法预警");
@@ -270,4 +290,17 @@ public class StatisticalPaneImpl implements StatisticalPaneService {
         }
         return statisticsIndicatorPart;
     }
+    public String takeDeptId(){
+        //获取该帐号执法证件号
+        String lawCertificateNum=userApi.getCurrentUser().getLawCertificateNum();
+        if(lawCertificateNum!=null&&!"".equals(lawCertificateNum)){
+            //通过该帐号的执法证件号去查该帐号执法人员表中的信息
+            String zzjgdm=iZfryjdm2405301Service.selectZfryByZfCode(lawCertificateNum).getZzjgdm();
+            if(zzjgdm!=null&&!"".equals(zzjgdm)){
+                //从信息中获取组织机构代码，以此查询sys_dept中的dept_Id
+                return iDeptService.selectDeptByCreditcode(zzjgdm).getDeptId();
+            }
+        }
+        return null;
+    }
 }

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

@@ -160,6 +160,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and law_enforcer_two is not null
         and is_complaint is not null
         and check_category is not null
+        and bureau_dept_id is not null
+        <if test="deptQx != null  and deptQx != ''">and bureau_dept_id =#{deptQx}</if>
         <if test="lawEnforcement != null  and lawEnforcement != ''"> and law_enforcement like concat('%', #{lawEnforcement}, '%')</if>
         <if test="bureauDeptName != null  and bureauDeptName != ''"> and bureau_dept_name like concat('%', #{bureauDeptName}, '%')</if>
         <if test="lawEnforcementId != null  and lawEnforcementId != ''"> and law_enforcement_id = #{lawEnforcementId}</if>

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

@@ -107,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLawEnforcementWarningListVo"/>
         <where>
             and warn_type=0
+            and enforcement_department_id is not null
+            <if test="deptQx != null  and deptQx != ''">and enforcement_department_id =#{deptQx}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enforcementDepartment != null  and enforcementDepartment != ''"> and enforcement_department like concat('%', #{enforcementDepartment}, '%')</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->

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

@@ -37,14 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectZfryjdmList2" parameterType="Zfryjdm2405301" resultMap="ZfryjdmResult">
-        <include refid="selectZfryjdmVo"/>
+        select z.id, z.sfyx, z.rylx, z.zfzzfdw, z.zfryid, z.name, z.sfzcode, z.zzjgdm, z.zfdw, z.address, z.sub_name, z.is_lawcode, z.code_state, z.zfcode, z.sfzcode_encrypt, s.phoneNumber from zfryjdm2405301 z
-        where code_state = '01'
+        left join sys_user s
-        and name is not null
+        on z.sfzcode_encrypt=s.certificateNumber
-        and zfdw is not null
+        where z.code_state = '01'
-        and zfcode is not null
+        and z.name is not null
-        <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+        and z.zfdw is not null
-        <if test="zfdw != null and zfdw != ''">and zfdw like concat('%',#{zfdw},'%')</if>
+        and z.zfcode is not null
-        <if test="zfcode != null and zfcode != ''">and zfcode like concat('%',#{zfcode},'%')</if>
+        <if test="name != null and name != ''">and z.name like concat('%',#{name},'%')</if>
+        <if test="zfdw != null and zfdw != ''">and z.zfdw like concat('%',#{zfdw},'%')</if>
+        <if test="zfcode != null and zfcode != ''">and z.zfcode like concat('%',#{zfcode},'%')</if>
     </select>
 
     <update id="updateZfryjdmSfzcodeByid" parameterType="Zfryjdm2405301">