待办案件修改

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;
 }

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<CaseEvidenceVO> getCaseListAll(String identityNum);
+    List<CaseEvidenceVO> getCaseListAll(Integer caseStatus);
 
     AjaxResult evidenceConfirmation(CaseApplication caseApplication);
 

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<CaseEvidenceVO> getCaseListAll(String identityNum) {
+    public List<CaseEvidenceVO> 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<Integer> caseStatusList = Arrays.asList(CaseApplicationConstants.CASE_CROSSEXAMI);
+
+        List<Integer> caseStatusList = Arrays.asList(caseStatus);
         return getCaseEvidenceVOList(identityNum, caseStatusList, 2);
     }
 
@@ -430,6 +430,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
 
     private List<CaseEvidenceVO> getCaseEvidenceVOList(String identityNum, List<Integer> caseStatusList, Integer identityType) {
         List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList, identityType);
+       // todo 返回房间号和开庭时间
         if (caseListByRespondent != null && caseListByRespondent.size() > 0) {
             for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
                 //根据案件id查询姓名

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceMapper.xml

@@ -7,10 +7,13 @@
         <id     property="id"       column="id"      />
         <result property="caseNum"       column="case_num"      />
         <result property="caseStatus"     column="case_status"    />
+        <result property="roomId"     column="room_id"    />
+        <result property="scheduleStartTime"     column="schedule_start_time"    />
     </resultMap>
     <select id="getCaseListByRespondent" resultType="CaseEvidenceVO" resultMap="CaseEvidenceVOResult">
-        select DISTINCT(c.id) id, c.case_num,c.case_status
-        from case_application as c  ,case_affiliate as d
+        select DISTINCT(c.id) id, c.case_num,c.case_status,rc.room_id,rc.schedule_start_time
+        from case_application as c  join case_affiliate as d on c.id = d.case_appli_id
+        left join reserved_conference rc on rc.case_id=c.id
         where c.id = d.case_appli_id
         <if test="identityNum != null and identityNum != ''">
             and d.identity_num = #{identityNum}