From 95e8b2da2a8928f47f9eed573b392136c789ac2a Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Fri, 18 Jul 2025 11:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 6 +- .../AppEnterpriseInformationController.java | 10 +- .../app/controller/AppSystemController.java | 7 + .../java/com/zdxt/auth/feign/DeptApiImpl.java | 3 +- .../system/user/service/UserServiceImpl.java | 2 +- .../resources/mapper/system/DeptMapper.xml | 2 +- .../resources/mapper/system/UserMapper.xml | 16 +- .../code/statistical/single-analysis.html | 12 +- .../StatisticalPanelController.java | 188 +++++++- .../zdxt/code/domain/SixAnalysisParams.java | 293 ++++++------ .../code/mapper/StatisticalPanelMapper.java | 27 ++ .../IEnterpriseInformationService.java | 1 + .../code/service/StatisticalPaneService.java | 27 ++ .../EnterpriseInformationServiceImpl.java | 5 + .../impl/StatisticalPaneServiceImpl.java | 76 +++ .../mapper/EnforcementRegistrationMapper.xml | 28 +- .../mapper/EnterpriseInformationMapper.xml | 7 +- .../NonEnforcementRegistrationMapper.xml | 2 +- .../mapper/StatisticalPanelMapper.xml | 433 ++++++++++++++++++ 19 files changed, 978 insertions(+), 167 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 2e3c1c62..39722428 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -601,8 +601,10 @@ public class AppEnforcementRegistrationController extends BaseController //查询行政检查评价 EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate(); - if (StringUtils.isNotEmpty(regResults.get(0).getUniteCheck())) { - enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUniteCheck()); +// if (StringUtils.isNotEmpty(regResults.get(0).getUniteCheck())) { +// enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUniteCheck()); + if (StringUtils.isNotEmpty(regResults.get(0).getUnionNo())) { + enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUnionNo()); } else { enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(regResults.get(0).getId()); } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java index 489b1d46..e40d8578 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java @@ -76,9 +76,15 @@ public class AppEnterpriseInformationController extends BaseController @ResponseBody public TableDataInfo queryListAndQrInfo(@RequestBody EnterpriseInformation enterpriseInformation) { - startPage(); +// startPage(); List list = enterpriseInformationService.selectEnterpriseInformationAndQrInfo(enterpriseInformation); - return getDataTable(list); +// return getDataTable(list); + + TableDataInfo rspData = getDataTable(list); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(60); + return rspData; } /** diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java index 31d73db1..b0d0b173 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppSystemController.java @@ -1,6 +1,7 @@ package com.zdxt.app.controller; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.PostBean; @@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @Author: kylin @@ -104,6 +106,11 @@ public class AppSystemController extends BaseController { @ResponseBody public TableDataInfo listApp(User user) { startPage(); + if (null != user.getNotUserId()) { + Map params = user.getParams(); + params.put("notUserIds", Convert.toStrArray(user.getNotUserId())); + } + user.setDataScopeId(null); List list = userService.selectUserListByHave(user); //解密 // if(list.size() > 0){ diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java index 18a1453d..0f6de482 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java @@ -81,6 +81,7 @@ public class DeptApiImpl implements DeptApi { Dept dept2 = new Dept(); dept2.setDeptName(deptBean2.getDeptName()); dept2.setDeptType(deptBean2.getDeptType()); + dept2.setZone(deptBean2.getZone()); List depts = iDeptService.selectDeptListNoPermission(dept2); List deptBeans = new ArrayList<>(); DeptBean deptBean; @@ -297,7 +298,7 @@ public class DeptApiImpl implements DeptApi { DeptBean dept = deptApi.getDeptById(deptId); Optional op =Optional.ofNullable(dept); if(!op.isPresent() || deptId == null)return null; // 防止admin这种没有部门的进来后造成死循环 - if (null != dept.getZone() && (5 == dept.getZone() || 1 == dept.getZone())) { + if (null != dept.getZone() && (5 == dept.getZone() || 15 == dept.getZone())) { return dept; } return iterationDeptParentToBureauGA(dept.getParentId()); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 1a2fdb2c..dd0220cd 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -133,7 +133,7 @@ public class UserServiceImpl implements IUserService { } @Override - @DataScope(deptAlias = "d", userAlias = "u") +// @DataScope(deptAlias = "d", userAlias = "u") public List selectUserListByHave(User user) { return userMapper.selectUserListByHave(user); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index 25e47401..edba72af 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -172,7 +172,7 @@ #{item} - + AND zone = #{zone} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index de4232af..cc609419 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -192,18 +192,21 @@ AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET - (#{deptId},ancestors) )) + and u.dept_id = #{deptId} AND u.tenant_code = #{tenantCode} - and u.user_id not in (#{notUserId}) + and u.user_id not in + + #{uid} + - AND u.law_certificate_num is not null - AND u.law_certificate_num !="" +-- AND u.law_certificate_num is not null +-- AND u.law_certificate_num !="" + and u.dept_id != 405 ${params.dataScope} @@ -218,7 +221,8 @@ left join sys_tenant t on t.tenant_code = u.tenant_code where u.del_flag = '0' - AND (u.dept_id = #{deptId}) + AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET + (#{deptId},ancestors) ]]> 0 )) AND u.user_name like concat('%', #{userName}, '%') diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html index a1ac2bba..5137789b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/single-analysis.html @@ -275,6 +275,16 @@ var deptName = null; var beginTime = null; var endTime = null; + $.ajax({ + url: ctx + "code/statisticalPanel/queryDeptLength", + type: "post", + data: JSON.stringify({"zoneList": [1, 15, 16]}), + dataType: 'json', + contentType: "application/json", + success: function (result) { + totalSize = result.data; + } + }); layui.use('laydate',function(){ var laydate = layui.laydate; @@ -324,7 +334,7 @@ $.ajax({ url: ctx + "code/statisticalPanel/queryDept", type: "post", - data: JSON.stringify({"zone": 1}), + data: JSON.stringify({"zoneList": [1, 15, 16]}), dataType: 'json', contentType: "application/json", success: function(res) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java index e2ff849f..bf507828 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java @@ -14,7 +14,10 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 综合统计 @@ -107,6 +110,11 @@ public class StatisticalPanelController extends BaseController { { return "project/code/statistical/single-analysis"; } + @GetMapping("/home-analysis") + public String homeAnalysis(Model model) + { + return "project/code/statistical/home"; + } /** @@ -197,9 +205,9 @@ public class StatisticalPanelController extends BaseController { return ZDResponse.success("部门列表", deptBeans); } - @GetMapping("/queryDeptLength") + @PostMapping("/queryDeptLength") @ResponseBody - public ZDResponse queryDeptLength(DeptBean deptParams){ + public ZDResponse queryDeptLength(@RequestBody DeptBean deptParams){ return ZDResponse.success("部门列表长度", deptApi.queryDeptLength(deptParams)); } @@ -210,5 +218,181 @@ public class StatisticalPanelController extends BaseController { return ZDResponse.success("部门列表-街道和区直", deptBeans); } + + /** 涉企检查 - 统计 */ + @PostMapping("/analysisEnterprisesIns") + @ResponseBody + public ZDResponse analysisEnterprisesIns(@RequestBody SixAnalysisParams params){ + Integer num = statisticalPaneService.analysisEnterprisesIns(params); + double ent_rr_num = statisticalPaneService.analysisEnterprisesInsRr(params); + double ent_yoy_num = statisticalPaneService.analysisEnterprisesInsYoy(params); + params.setUniteCheck(null); + Integer allnum = statisticalPaneService.analysisEnterprisesIns(params); + String rr = this.setPercentage((num - ent_rr_num) / ent_rr_num); + String yoy = this.setPercentage((num - ent_yoy_num) / ent_yoy_num); + String per = this.setPercentage((double)num / allnum); + Map resMap = new HashMap(); + resMap.put("num", num); + resMap.put("rr", rr); + resMap.put("yoy", yoy); + resMap.put("per", per); + return ZDResponse.success("联合检查", resMap); + } + /** 非行政涉企检查 - 统计 */ + @PostMapping("/analysisEnterprisesNonIns") + @ResponseBody + public ZDResponse analysisEnterprisesNonIns(@RequestBody SixAnalysisParams params){ + Integer num = statisticalPaneService.analysis_non_enterprisesIns(params); + Map resMap = new HashMap(); + resMap.put("num", num); + return ZDResponse.success("联合检查", resMap); + } + + /** 检查预告 - 统计 */ + @PostMapping("/analysisInsNotice") + @ResponseBody + public ZDResponse analysisInsNotice(@RequestBody SixAnalysisParams params){ + Integer num = statisticalPaneService.analysisInsNotice(params); + double ent_rr_num = statisticalPaneService.analysisInsNoticeRr(params); + double ent_yoy_num = statisticalPaneService.analysisInsNoticeYoy(params); + params.setIsReg(1); + Integer isnum = statisticalPaneService.analysisInsNotice(params); + String per = this.setPercentage((double)isnum / num); + String rr = this.setPercentage((num - ent_rr_num) / ent_rr_num); + String yoy = this.setPercentage((num - ent_yoy_num) / ent_yoy_num); + Map resMap = new HashMap(); + resMap.put("num", num); + resMap.put("rr", rr); + resMap.put("yoy", yoy); + resMap.put("per", per); + return ZDResponse.success("检查预告", resMap); + } + + /** 涉企投诉 - 统计 */ + @PostMapping("/analysisEnterprisesComplaint") + @ResponseBody + public ZDResponse analysisEnterprisesComplaint(@RequestBody SixAnalysisParams params){ + Integer num = statisticalPaneService.analysisEnterprisesComplaint(params); + double ent_rr_num = statisticalPaneService.analysisEnterprisesComplaintRr(params); + double ent_yoy_num = statisticalPaneService.analysisEnterprisesComplaintYoy(params); + String rr = this.setPercentage((num - ent_rr_num) / ent_rr_num); + String yoy = this.setPercentage((num - ent_yoy_num) / ent_yoy_num); + Map resMap = new HashMap(); + resMap.put("num", num); + resMap.put("rr", rr); + resMap.put("yoy", yoy); + return ZDResponse.success("涉企投诉", resMap); + } + + /** 被查企业 - 统计 */ + @PostMapping("/analysisEnterprises") + @ResponseBody + public ZDResponse analysisEnterprises(@RequestBody SixAnalysisParams params){ + Integer num = statisticalPaneService.analysisEnterprises(params); + double ent_rr_num = statisticalPaneService.analysisEnterprisesRr(params); + double ent_yoy_num = statisticalPaneService.analysisEnterprisesYoy(params); + String rr = this.setPercentage((num - ent_rr_num) / ent_rr_num); + String yoy = this.setPercentage((num - ent_yoy_num) / ent_yoy_num); + Map resMap = new HashMap(); + resMap.put("num", num); + resMap.put("rr", rr); + resMap.put("yoy", yoy); + return ZDResponse.success("被查企业", resMap); + } + + /** 非行政检查类型 - 统计 */ + @PostMapping("/analysisNonRegistration") + @ResponseBody + public ZDResponse analysisNonRegistration(@RequestBody SixAnalysisParams params){ + List> resMaps = statisticalPaneService.analysisNonRegistration(params); + return ZDResponse.success("被查企业", resMaps); + } + + /** 按区的行政/非行政 - 统计 */ + @PostMapping("/areaRegistration") + @ResponseBody + public ZDResponse areaRegistration(@RequestBody SixAnalysisParams params){ + DeptBean deptParams = new DeptBean(); + deptParams.setZone(2); + deptParams.setDeptName(params.getDeptId()); + List depts = deptApi.selectDepts(deptParams); + params.setDeptId(depts.get(0).getDeptId()); + Integer jc_num = statisticalPaneService.analysisEnterprisesIns(params); + Integer qy_num = statisticalPaneService.analysisEnterprises(params); + Integer njc_num = statisticalPaneService.analysis_non_enterprisesIns(params); + Integer nqy_num = statisticalPaneService.analysis_non_enterprises(params); + + // 下转弹出层需要的数据(联合检查, 涉企检查频次压缩率, 行政检查预告次数, 涉企投诉次数) + params.setUniteCheck("1"); + Integer nuite_jc_num_all = statisticalPaneService.analysis_enterprisesIns_all(params); + Integer nuite_jc_num = statisticalPaneService.analysisEnterprisesIns(params); + params.setUniteCheck(null); + Integer law_jc_num = statisticalPaneService.analysisInsNotice(params); + Integer com_jc_num = statisticalPaneService.analysisEnterprisesComplaint(params); + + Map resMap = new HashMap(); + resMap.put("area", deptParams.getDeptName()); + resMap.put("jc_num", jc_num); + resMap.put("qy_num", qy_num); + resMap.put("njc_num", njc_num); + resMap.put("nqy_num", nqy_num); + + resMap.put("nuite_jc_num", nuite_jc_num); + if(null == nuite_jc_num || 0 == nuite_jc_num) { + resMap.put("per_jc_num", 0+"%"); + } else { + resMap.put("per_jc_num", ((double)nuite_jc_num/nuite_jc_num_all)*100+"%"); + } + resMap.put("law_jc_num", law_jc_num); + resMap.put("com_jc_num", com_jc_num); + return ZDResponse.success(deptParams.getDeptName()+"的行政/非行政", resMap); + } + + + /** 时间维度 */ + @PostMapping("/analysisTime") + @ResponseBody + public ZDResponse analysisEnterprisesInsTime(@RequestBody SixAnalysisParams params){ + List> insMaps = statisticalPaneService.analysisEnterprisesInsTime(params); + List> entMaps = statisticalPaneService.analysisEnterprisesTime(params); + + List times = new ArrayList<>(); + List ins = new ArrayList<>(); + List ent = new ArrayList<>(); + if (insMaps.size()<=entMaps.size()) { + for(int i=0 ; i resMap = new HashMap<>(); + resMap.put("times", times); + resMap.put("ins", ins); + resMap.put("ent", ent); + return ZDResponse.success("被查企业", resMap); + } + + + private String setPercentage(Double percentage) { + if (percentage == 0 || percentage.isNaN() || percentage.isInfinite()) { + return "0.0"; + } else { + String s = percentage * 100 + ""; + if (s.length() > s.indexOf(".") + 3) { + percentage = Double.valueOf(s.substring(0, s.indexOf(".") + 3)); + } else { + percentage = Double.valueOf(s); + } + return Double.valueOf(String.format("%.2f", percentage)).toString(); + } + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java index a7ddd160..f27e76b4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SixAnalysisParams.java @@ -1,142 +1,151 @@ -package com.zdxt.code.domain; - -import com.zdxt.common.BaseDomain; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class SixAnalysisParams extends BaseDomain { - private Long userId; - private String bureauDeptId; - private String bureauDeptName; - /** 0:联合检查, 1:单独检查, null:所有检查 */ - private String uniteCheck; - /** 区域传入 字典类型 */ - private String qy; - private String jd; - /** 开始时间 */ - private String beginTime; - /** 接受时间 */ - private String endTime; - /** 时间类型：year,quarter,month,day */ - private String dateType; - private Integer year; - private Integer quarter; - private Integer month; - private Integer day; - -// Map params = new HashMap(); -// -// public Map getParams() { -// return params; -// } -// -// public void setParams(Map params) { -// this.params = params; -// } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getBureauDeptId() { - return bureauDeptId; - } - - public void setBureauDeptId(String bureauDeptId) { - this.bureauDeptId = bureauDeptId; - } - - public String getBureauDeptName() { - return bureauDeptName; - } - - public void setBureauDeptName(String bureauDeptName) { - this.bureauDeptName = bureauDeptName; - } - - public String getUniteCheck() { - return uniteCheck; - } - - public void setUniteCheck(String uniteCheck) { - this.uniteCheck = uniteCheck; - } - - public String getQy() { - return qy; - } - - public void setQy(String qy) { - this.qy = qy; - } - - public String getJd() { - return jd; - } - - public void setJd(String jd) { - this.jd = jd; - } - - public String getBeginTime() { - return beginTime; - } - - public void setBeginTime(String beginTime) { - this.beginTime = beginTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getDateType() { - return dateType; - } - - public void setDateType(String dateType) { - this.dateType = dateType; - } - - public Integer getYear() { - return year; - } - - public void setYear(Integer year) { - this.year = year; - } - - public Integer getQuarter() { - return quarter; - } - - public void setQuarter(Integer quarter) { - this.quarter = quarter; - } - - public Integer getMonth() { - return month; - } - - public void setMonth(Integer month) { - this.month = month; - } - - public Integer getDay() { - return day; - } - - public void setDay(Integer day) { - this.day = day; - } -} +package com.zdxt.code.domain; + +import com.zdxt.common.BaseDomain; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class SixAnalysisParams extends BaseDomain { + private Long userId; + private String bureauDeptId; + private String bureauDeptName; + /** 0:联合检查, 1:单独检查, null:所有检查 */ + private String uniteCheck; + /** 区域传入 字典类型 */ + private String qy; + private String jd; + /** 开始时间 */ + private String beginTime; + /** 接受时间 */ + private String endTime; + /** 时间类型：year,quarter,month,day */ + private String dateType; + private Integer year; + private Integer quarter; + private Integer month; + private Integer day; + private Integer isReg; + +// Map params = new HashMap(); +// +// public Map getParams() { +// return params; +// } +// +// public void setParams(Map params) { +// this.params = params; +// } + + public Integer getIsReg() { + return isReg; + } + + public void setIsReg(Integer isReg) { + this.isReg = isReg; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getBureauDeptId() { + return bureauDeptId; + } + + public void setBureauDeptId(String bureauDeptId) { + this.bureauDeptId = bureauDeptId; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } + + public String getUniteCheck() { + return uniteCheck; + } + + public void setUniteCheck(String uniteCheck) { + this.uniteCheck = uniteCheck; + } + + public String getQy() { + return qy; + } + + public void setQy(String qy) { + this.qy = qy; + } + + public String getJd() { + return jd; + } + + public void setJd(String jd) { + this.jd = jd; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getDateType() { + return dateType; + } + + public void setDateType(String dateType) { + this.dateType = dateType; + } + + public Integer getYear() { + return year; + } + + public void setYear(Integer year) { + this.year = year; + } + + public Integer getQuarter() { + return quarter; + } + + public void setQuarter(Integer quarter) { + this.quarter = quarter; + } + + public Integer getMonth() { + return month; + } + + public void setMonth(Integer month) { + this.month = month; + } + + public Integer getDay() { + return day; + } + + public void setDay(Integer day) { + this.day = day; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalPanelMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalPanelMapper.java index b19b01bc..31db0554 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalPanelMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalPanelMapper.java @@ -119,4 +119,31 @@ public interface StatisticalPanelMapper { /** 投诉类型 */ List> staisticalEnforce_type(SixAnalysisParams params); + + /** 涉企检查 */ + Integer analysis_enterprisesIns(SixAnalysisParams params); + Double analysis_enterprisesIns_rr(SixAnalysisParams params); + Double analysis_enterprisesIns_yoy(SixAnalysisParams params); + Integer analysis_non_enterprisesIns(SixAnalysisParams params); + Integer analysis_enterprisesIns_all(SixAnalysisParams params); + /** 检查预告 */ + Integer analysis_insNotice(SixAnalysisParams params); + Double analysis_insNotice_rr(SixAnalysisParams params); + Double analysis_insNotice_yoy(SixAnalysisParams params); + /** 涉企投诉 */ + Integer analysis_enterprisesComplaint(SixAnalysisParams params); + Double analysis_enterprisesComplaint_rr(SixAnalysisParams params); + Double analysis_enterprisesComplaint_yoy(SixAnalysisParams params); + /** 被查企业 */ + Integer analysis_enterprises(SixAnalysisParams params); + Double analysis_enterprises_rr(SixAnalysisParams params); + Double analysis_enterprises_yoy(SixAnalysisParams params); + Integer analysis_non_enterprises(SixAnalysisParams params); + + /** 时间维度 */ + List> analysis_enterprisesIns_time(SixAnalysisParams params); + List> analysis_enterprises_time(SixAnalysisParams params); + + /** 非行政检查类型 */ + List> analysis_non_registration(SixAnalysisParams params); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java index 98248b5d..ae804bea 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseInformationService.java @@ -25,6 +25,7 @@ public interface IEnterpriseInformationService */ EnterpriseInformation selectEnterpriseInformationById(String id); EnterpriseInformation selectEnterpriseInformationByNum(String num); + EnterpriseInformation selectEnterpriseInformationByNumOne(String num); /** * 查询企业信息 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java index a1ddb219..239e39ec 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java @@ -74,4 +74,31 @@ public interface StatisticalPaneService { /** 投诉类型 */ List> staisticalEnforce_type(SixAnalysisParams params); + + + /** 涉企检查 */ + Integer analysisEnterprisesIns(SixAnalysisParams params); + Double analysisEnterprisesInsRr(SixAnalysisParams params); + Double analysisEnterprisesInsYoy(SixAnalysisParams params); + Integer analysis_non_enterprisesIns(SixAnalysisParams params); + Integer analysis_enterprisesIns_all(SixAnalysisParams params); + /** 检查预告 */ + Integer analysisInsNotice(SixAnalysisParams params); + Double analysisInsNoticeRr(SixAnalysisParams params); + Double analysisInsNoticeYoy(SixAnalysisParams params); + /** 涉企投诉 */ + Integer analysisEnterprisesComplaint(SixAnalysisParams params); + Double analysisEnterprisesComplaintRr(SixAnalysisParams params); + Double analysisEnterprisesComplaintYoy(SixAnalysisParams params); + /** 被查企业 */ + Integer analysisEnterprises(SixAnalysisParams params); + Double analysisEnterprisesRr(SixAnalysisParams params); + Double analysisEnterprisesYoy(SixAnalysisParams params); + Integer analysis_non_enterprises(SixAnalysisParams params); + /** 非行政检查类型 */ + List> analysisNonRegistration(SixAnalysisParams params); + + /** 时间维度 */ + List> analysisEnterprisesInsTime(SixAnalysisParams params); + List> analysisEnterprisesTime(SixAnalysisParams params); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index dcc03c0f..8ac9b340 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -115,6 +115,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS return enterpriseInformation; } + @Override + public EnterpriseInformation selectEnterpriseInformationByNumOne(String num) { + return enterpriseInformationMapper.selectEnterpriseInformationByNum(num); + } + @Override public EnterpriseInformation selectEnterpriseInformationBySalt(String salt) { return enterpriseInformationMapper.selectEnterpriseInformationBySalt(salt); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java index 140fd5bf..fe9247d0 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java @@ -1500,4 +1500,80 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService { // return all_area; // } + + + @Override + public Integer analysisEnterprisesIns(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesIns(params); + } + @Override + public Double analysisEnterprisesInsRr(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesIns_rr(params); + } + @Override + public Double analysisEnterprisesInsYoy(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesIns_yoy(params); + } + + @Override + public Integer analysis_non_enterprisesIns(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_non_enterprisesIns(params); + } + @Override + public Integer analysis_enterprisesIns_all(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesIns_all(params); + } + @Override + public Integer analysisInsNotice(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_insNotice(params); + } + @Override + public Double analysisInsNoticeRr(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_insNotice_rr(params); + } + @Override + public Double analysisInsNoticeYoy(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_insNotice_yoy(params); + } + @Override + public Integer analysisEnterprisesComplaint(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesComplaint(params); + } + @Override + public Double analysisEnterprisesComplaintRr(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesComplaint_rr(params); + } + @Override + public Double analysisEnterprisesComplaintYoy(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesComplaint_yoy(params); + } + @Override + public Integer analysisEnterprises(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprises(params); + } + @Override + public Double analysisEnterprisesRr(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprises_rr(params); + } + @Override + public Double analysisEnterprisesYoy(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprises_yoy(params); + } + @Override + public Integer analysis_non_enterprises(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_non_enterprises(params); + } + @Override + public List> analysisNonRegistration(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_non_registration(params); + } + + @Override + public List> analysisEnterprisesInsTime(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprisesIns_time(params); + } + @Override + public List> analysisEnterprisesTime(SixAnalysisParams params) { + return statisticalPanelMapper.analysis_enterprises_time(params); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index a4c80e38..b2b2c92b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -84,7 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_number = #{enterpriseNumber} and enforcement_time = #{enforcementTime} and law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%') - and law_enforcer_id = #{lawEnforcerId} + + + and law_enforcer_id = #{lawEnforcerId} + + and law_enforcer_tel = #{lawEnforcerTel} and law_enforcer_id_two = #{lawEnforcerIdTwo} and law_enforcer_tel_two = #{lawEnforcerTelTwo} @@ -97,7 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and law_enforcement_basis_text = #{lawEnforcementBasisText} and reslut = #{reslut} and is_submit = #{isSubmit} - and user_id = #{userId} + + + and user_id = #{userId} + + and dept_id = #{deptId} and is_delete = #{isDelete} and is_complaint = #{isComplaint} @@ -155,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enforcement_time <= #{params.endTime} - and (law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two)) + and (law_enforcer_id = #{dataScopeId} or user_id = #{dataScopeId} or law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two)) order by enforcement_time desc @@ -175,7 +183,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_number = #{enterpriseNumber} and enforcement_time = #{enforcementTime} and law_enforcer like concat('%',#{lawEnforcer} ,'%') or law_enforcer_two like concat('%',#{lawEnforcer} ,'%') - and law_enforcer_id = #{lawEnforcerId} + + + and law_enforcer_id = #{lawEnforcerId} + + and law_enforcer_tel = #{lawEnforcerTel} and law_enforcer_id_two = #{lawEnforcerIdTwo} and law_enforcer_tel_two = #{lawEnforcerTelTwo} @@ -188,7 +200,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and law_enforcement_basis_text = #{lawEnforcementBasisText} and reslut = #{reslut} and is_submit = #{isSubmit} - and user_id = #{userId} + + + and user_id = #{userId} + + and dept_id = #{deptId} and is_delete = #{isDelete} and is_complaint = #{isComplaint} @@ -246,7 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enforcement_time <= #{params.endTime} - and (law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two)) + and (law_enforcer_id = #{dataScopeId} or user_id = #{dataScopeId} or law_enforcer_id = #{dataScopeId} or FIND_IN_SET(#{dataScopeId}, law_enforcer_id_two)) order by enforcement_time desc diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml index 23a46b16..54ff6321 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseInformationMapper.xml @@ -112,9 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enterprise_information ei LEFT JOIN ( SELECT - * + enterprise_number, qr_code_url FROM - ( SELECT * FROM qr_code_generate_history WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1000000000 ) t + ( SELECT enterprise_number, qr_code_url, generate_time FROM qr_code_generate_history WHERE `status` = 0 ORDER BY generate_time DESC LIMIT 1000000000 ) t GROUP BY t.enterprise_number ORDER BY @@ -130,6 +130,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY ei.create_time DESC + + LIMIT #{params.pageNum}, #{params.pageSize} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file