From 1df031a05038709eb51d5f9b72952509cc832739 Mon Sep 17 00:00:00 2001 From: zhangchaoyang02 Date: Fri, 25 Apr 2025 15:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=B0=E8=B4=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=E8=A1=A8=E4=B8=8E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/api/lawenforcement/Case.js | 2 +- client/src/router/index.js | 2 +- .../iles/lawenforcement/controller/CaseController.java | 4 ++-- .../iles/lawenforcement/controller/StatisticController.java | 2 +- .../java/com/aisino/iles/lawenforcement/model/Case.java | 6 ++++++ .../com/aisino/iles/lawenforcement/service/CaseService.java | 5 +++++ .../iles/lawenforcement/service/DeliveryRecordService.java | 5 ----- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/client/src/api/lawenforcement/Case.js b/client/src/api/lawenforcement/Case.js index 5ee2be3..db4a3dd 100644 --- a/client/src/api/lawenforcement/Case.js +++ b/client/src/api/lawenforcement/Case.js @@ -43,7 +43,7 @@ export const cases = Object.assign({ data: data }) }, - caseinformsbtz (id, data) { // 案件-陈述申辩或听证 + informsbtz (id, data) { // 案件-陈述申辩或听证 return api({ url: url + '/informsbtz/' + id, method: REQUEST_METHOD_TYPES.PUT, diff --git a/client/src/router/index.js b/client/src/router/index.js index a52f723..e6a5414 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -681,7 +681,7 @@ const baseRoutes = [ path: '/tjbb', name: 'tjbb', component: SviLayout, - meta: {title: '统计分析'}, + meta: {title: '台账统计分析'}, children: [ { path: 'qxtjsb', diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java index badb158..6c96de8 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/CaseController.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; /** - * 行政处罚流程 + * 综合执法/行政处罚流程 */ @RestController @RequestMapping(Constants.API_PREFIX + "/lawenforcement/cases") @@ -34,7 +34,7 @@ public class CaseController { } /** - * 查询案件信息 + * 分页查询案件信息 * * @param query 案件数据项查询条件 * @return 分页案件信息 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java index a75bc0f..8940ef4 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/StatisticController.java @@ -53,7 +53,7 @@ public class StatisticController { } /** - * 执法周报表统计查看检查企业数详情 + * 周报表统计查看检查企业数详情 * * @return 执法周报表统计查看检查企业数详情 */ diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/model/Case.java b/server/src/main/java/com/aisino/iles/lawenforcement/model/Case.java index 3d78bb9..cb63ff1 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/model/Case.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/model/Case.java @@ -372,6 +372,12 @@ public class Case extends BaseModel { @Comment("案件描述") private String caseDesc; + /** + * 案件名称 + */ + @Column(length = 30) + @Comment("案件名称") + private String caseName; /** * 案由 diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java index 83cce54..d1cf909 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/CaseService.java @@ -103,6 +103,11 @@ public class CaseService { switch (caseInfoDto.getCaseSourceCode()) { case "1" -> caseInfoDto.setCaseSourceCode("日常检查发现"); case "2" -> caseInfoDto.setCaseSourceCode("机构监测报告"); + case "3" -> caseInfoDto.setCaseSourceCode("举报投诉"); + case "4" -> caseInfoDto.setCaseSourceCode("上级交办"); + case "5" -> caseInfoDto.setCaseSourceCode("下级情报"); + case "6" -> caseInfoDto.setCaseSourceCode("有关部门移送"); + case "7" -> caseInfoDto.setCaseSourceCode("其他"); } switch (caseInfoDto.getCaseCause()) { diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java index cb1898d..9ef5ffa 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/DeliveryRecordService.java @@ -262,11 +262,6 @@ public class DeliveryRecordService { () -> resMap.put(k, 0L) ); }); - long sum = resMap.values().stream() - .mapToLong(o -> Long.parseLong(String.valueOf(o))) - .sum(); - resMap.put("total", sum); - mm.put(key, resMap); }); return agencyList.stream().map(o -> { Map resMap = new HashMap<>();