From 6bcb7ac3e81c2fad74b052d0e92bd342f53ac867 Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 28 Nov 2023 11:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=A1=88=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomarbitrate/CaseEvidenceController.java | 13 +++++-------- .../wisdomarbitrate/domain/vo/CaseEvidenceVO.java | 12 ++++++++++++ .../service/ICaseEvidenceService.java | 2 +- .../service/impl/CaseEvidenceServiceImpl.java | 9 +++++---- .../mapper/wisdomarbitrate/CaseEvidenceMapper.xml | 7 +++++-- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java index c4f1455..fdaadcc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java @@ -101,17 +101,14 @@ public class CaseEvidenceController extends BaseController { /** * 查询当前用户案件列表 * - * @param identityNum + * @param caseStatus * @return */ @GetMapping("/all") - public TableDataInfo getCaseListAll(@RequestParam(required = false) String identityNum) { - startPage(); - List list = caseEvidenceService.getCaseListAll(identityNum); - if (list != null) { - return getDataTable(list); - } - return getDataTable(new ArrayList<>()); + public AjaxResult getCaseListAll(@RequestParam("caseStatus") Integer caseStatus) { + + return success(caseEvidenceService.getCaseListAll(caseStatus)); + } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java index 7dca799..da1e6f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceVO.java @@ -1,8 +1,11 @@ package com.ruoyi.wisdomarbitrate.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + @Data public class CaseEvidenceVO { /** @@ -25,4 +28,13 @@ public class CaseEvidenceVO { * 案件状态 */ private Integer caseStatus; + /** + * 房间号 + */ + private Long roomId; + /** + * 开庭时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date scheduleStartTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java index 816e2e2..cdd7787 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java @@ -17,7 +17,7 @@ public interface ICaseEvidenceService { AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id,String userName,Long userId); - List getCaseListAll(String identityNum); + List getCaseListAll(Integer caseStatus); AjaxResult evidenceConfirmation(CaseApplication caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index 09ea6f9..f3c4ee3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -147,10 +147,10 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { IdentityAuthenticationMapper identityAuthenticationMapper; @Override - public List getCaseListAll(String identityNum) { + public List getCaseListAll(Integer caseStatus) { // 是否为超级管理员 int adMinFlag=0; - if (StringUtils.isBlank(identityNum)) { + String identityNum = ""; IdentityAuthentication authentication = new IdentityAuthentication(); LoginUser loginUser = SecurityUtils.getLoginUser(); // 查询该用户的角色 @@ -175,8 +175,8 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { identityNum = authentication1.getIdentityNo(); } } - } - List caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI); + + List caseStatusList = Arrays.asList(caseStatus); return getCaseEvidenceVOList(identityNum, caseStatusList, 2); } @@ -430,6 +430,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { private List getCaseEvidenceVOList(String identityNum, List caseStatusList, Integer identityType) { List caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType); + // todo 返回房间号和开庭时间 if (caseListByRespondent != null && caseListByRespondent.size() > 0) { for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) { //根据案件id查询姓名 diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml index 898e044..445d757 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml @@ -7,10 +7,13 @@ + +