测试回归bug,修复行政执法等页面bug
This commit is contained in:
parent
c33e943b08
commit
8f711baa41
|
|
@ -92,7 +92,13 @@ public class BigScreenSystemController {
|
|||
return PageResult.of(bigScreenService.getZfdxslfy(query));
|
||||
}
|
||||
|
||||
ng> checkCount() {
|
||||
/**
|
||||
* 查询当月执法检查数量
|
||||
*
|
||||
* @return 执法检查数量
|
||||
*/
|
||||
@RequestMapping("/zfjcsl")
|
||||
public Result<Long> checkCount() {
|
||||
return Ok.of(bigScreenService.checkCount());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,20 @@ public class EnforceCheckController {
|
|||
this.enforceCheckService = enforceCheckService;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 创建执法检查记录
|
||||
*
|
||||
* @param enforceCheck 执法检查记录
|
||||
* @return 创建结果
|
||||
*/
|
||||
@PostMapping
|
||||
public Result<EnforceCheck> createEnforceCheck(@RequestBody EnforceCheck enforceCheck, @CurrentUser RemoteUserInfo user) {
|
||||
List<Object> publishData = enforceCheckService.saveEnforceCheck(enforceCheck, user, "add");
|
||||
if (!publishData.isEmpty()) {
|
||||
return Ok.of((EnforceCheck) publishData.get(0));
|
||||
}
|
||||
return Ok.of();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据ID查询执法检查记录
|
||||
|
|
|
|||
|
|
@ -288,7 +288,18 @@ public class CaseService {
|
|||
|
||||
@Transactional(readOnly = true)
|
||||
public Optional<Case> 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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue