diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenSystemController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenSystemController.java index 8bd0d65..9b04ba3 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenSystemController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/BigScreenSystemController.java @@ -92,7 +92,13 @@ public class BigScreenSystemController { return PageResult.of(bigScreenService.getZfdxslfy(query)); } -ng> checkCount() { + /** + * 查询当月执法检查数量 + * + * @return 执法检查数量 + */ + @RequestMapping("/zfjcsl") + public Result checkCount() { return Ok.of(bigScreenService.checkCount()); } diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforceCheckController.java b/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforceCheckController.java index 3b53f4a..c269bd2 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforceCheckController.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/controller/EnforceCheckController.java @@ -34,7 +34,20 @@ public class EnforceCheckController { this.enforceCheckService = enforceCheckService; } - + /** + * 创建执法检查记录 + * + * @param enforceCheck 执法检查记录 + * @return 创建结果 + */ + @PostMapping + public Result createEnforceCheck(@RequestBody EnforceCheck enforceCheck, @CurrentUser RemoteUserInfo user) { + List publishData = enforceCheckService.saveEnforceCheck(enforceCheck, user, "add"); + if (!publishData.isEmpty()) { + return Ok.of((EnforceCheck) publishData.get(0)); + } + return Ok.of(); + } /** * 根据ID查询执法检查记录 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 8ad8b75..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 @@ -288,7 +288,18 @@ public class CaseService { @Transactional(readOnly = true) public Optional findCaseById(String caseId) { - + return caseRepository.findById(caseId).map(c -> { + //获取执法结构信息 + c.getEnforcementInfo().getAgency().getAgencyName(); + //获取企业信息 + c.getEnforcementInfo().getEnterprise().getUnitName(); + c.setEnterprise(c.getEnforcementInfo().getEnterprise()); + //获取 执法检查信息 + enforceCheckService.getEnforceCheckByEnforcementId(c.getEnforcementInfo().getEnforcementId()).ifPresent(check -> { + c.setEnforceCheck(check); + }); + return c; + }); } private Case getCaseevidenceDetailInfo(Case c) {