@@ -153,13 +268,14 @@
$(function(){
sixIndicators();
+ checkCategory();
});
function sixIndicators() {
$.ajax({
url: ctx + "code/statisticalPanel/sixIndicators",
type: "get",
- data: {dateType: "year", year:"2025"},
+ data: {dateType: "year", year:"2025", params:{"zone":1}},
success: function(res) {
if(res.success) {
const indicators = res.data;
@@ -204,9 +320,35 @@
});
}
-
-$('.fold_cont dd:first').addClass('selchk');//给第一个dd追加
-//each遍历元素
+ function checkCategory() {
+ $.ajax({
+ url: ctx + "code/statisticalPanel/staisticalCheck_category",
+ type: "get",
+ data: {dateType: "year", year:"2025"},
+ success: function(res) {
+ console.log(res);
+ if(res.success) {
+ var html = "";
+ const datas = res.data;
+ for(var i=0; i'
+ html += ' '+datas[i].num+''
+ html += ' '+datas[i].per+''
+ html += ''
+ }
+ $("#check_category").html(html);
+ }
+ },
+ error: function (error) {
+ $.modal.alertWarning("获取分析数据失败。");
+ }
+ });
+ }
+
+
+ $('.fold_cont dd:first').addClass('selchk');//给第一个dd追加
+ //each遍历元素
$(".fold_cont dd").each(function () {
$(this).click(function () { //点击事件
//当点击自身的时候添加，及删除同级的
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 6a83bfca..717ecf28 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
@@ -145,6 +145,12 @@ public class StatisticalPanelController extends BaseController {
return ZDResponse.success("被检查企业次数排行", statisticalPaneService.staisticalBureau_order(params));
}
+ @GetMapping("/staisticalCheck_category")
+ @ResponseBody
+ public ZDResponse staisticalCheck_category(SixAnalysisParams params){
+ return ZDResponse.success("行政检查类别及占比", statisticalPaneService.staisticalCheck_category(params));
+ }
+
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 185a76ce..f003771f 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
@@ -106,4 +106,8 @@ public interface StatisticalPanelMapper {
List> staisticalRegistration_order(SixAnalysisParams params);
List> staisticalComplaint_order(SixAnalysisParams params);
List> staisticalBureau_order(SixAnalysisParams params);
+
+ /** 检查类别 */
+ List> staisticalCheck_category(SixAnalysisParams params);
+
}
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 d5b494e4..34db1395 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
@@ -57,5 +57,7 @@ public interface StatisticalPaneService {
List> staisticalComplaint_order(SixAnalysisParams params);
List> staisticalBureau_order(SixAnalysisParams params);
+ /** 检查类别 */
+ List> staisticalCheck_category(SixAnalysisParams params);
}
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 950d8327..ba89c4c8 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
@@ -828,6 +828,32 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
return statisticalPanelMapper.staisticalBureau_order(params);
}
+ @Override
+ public List> staisticalCheck_category(SixAnalysisParams params) {
+ List> results = new ArrayList<>();
+ List checkCategory = iDictDataService.selectDictDataByType("check_category");
+ List> tmpMaps = statisticalPanelMapper.staisticalCheck_category(params);
+ double total = 0;
+ for (DictData dict : checkCategory) {
+ Map info = new HashMap<>();
+ info.put("category", dict.getDictLabel());
+ info.put("num", 0);
+ for(Map tmpMap : tmpMaps) {
+ if (dict.getDictValue().equals(tmpMap.get("category").toString())) {
+ info.put("num", tmpMap.get("num"));
+ total+= Integer.parseInt(tmpMap.get("num").toString());
+ break;
+ }
+ }
+ results.add(info);
+ }
+ for (Map tmpMap : results) {
+ double per = Double.parseDouble(tmpMap.get("num").toString()) / total * 100;
+ tmpMap.put("per", String.format("%.2f", per)+"%");
+ }
+ return results;
+ }
+
/**
* 计算环比增长率
* @param currentPeriodValue 当期数值
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
index f2403a9a..f67745f4 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
@@ -108,6 +108,9 @@
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
+
+ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and r.unite_check is not null and r.unite_check is nulland( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
@@ -150,6 +153,9 @@
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
+
+ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and r.unite_check is not null and r.unite_check is nulland( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
@@ -192,6 +198,9 @@
and r.is_complaint is not null
and r.check_category is not null
and r.bureau_dept_id is not null
+
+ and r.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and r.unite_check is not null and r.unite_check is nulland( r.law_enforcer_id=#{userId} or r.law_enforcer_id_two=#{userId})
@@ -228,6 +237,9 @@
left join (select * from enterprise_information group by enterprise_number) e on n.enterprise_number=e.enterprise_number
and n.enterprise_number is not null
+
+ and n.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( n.law_enforcer_id=#{userId} or n.law_enforcer_id_two=#{userId}) and n.bureau_dept_id=#{bureauDeptId}
@@ -260,6 +272,9 @@
left join (select * from enterprise_information group by enterprise_number) e on n.enterprise_number=e.enterprise_number
and n.enterprise_number is not null
+
+ and n.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( n.law_enforcer_id=#{userId} or n.law_enforcer_id_two=#{userId}) and n.bureau_dept_id=#{bureauDeptId}
@@ -292,6 +307,9 @@
left join (select * from enterprise_information group by enterprise_number) e on n.enterprise_number=e.enterprise_number
and n.enterprise_number is not null
+
+ and n.bureau_dept_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( n.law_enforcer_id=#{userId} or n.law_enforcer_id_two=#{userId}) and n.bureau_dept_id=#{bureauDeptId}
@@ -328,6 +346,9 @@
and (c.rid is not null or c.complaint_department_id is not null)
and c.enforce_type is not null
and c.enterprise_number is not null
+
+ and c.complaint_department_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) and c.bureau_dept_id=#{bureauDeptId}
@@ -362,6 +383,9 @@
and (c.rid is not null or c.complaint_department_id is not null)
and c.enforce_type is not null
and c.enterprise_number is not null
+
+ and c.complaint_department_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) and c.bureau_dept_id=#{bureauDeptId}
@@ -396,6 +420,9 @@
and (c.rid is not null or c.complaint_department_id is not null)
and c.enforce_type is not null
and c.enterprise_number is not null
+
+ and c.complaint_department_id in (select dept_id from sys_dept where zone = #{params.zone})
+ and( r.law_enforcer_id=#{userId} or c.law_enforcer_id_two=#{userId}) and c.bureau_dept_id=#{bureauDeptId}
@@ -752,4 +779,51 @@
group by r.bureau_dept_id order by num desc
+
+
\ No newline at end of file