截止9.14开发

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseDetailVO.java

@@ -1,5 +1,6 @@
 package com.ruoyi.wisdomarbitrate.domain.vo;
 
+import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @Builder
@@ -53,4 +55,13 @@ public class CaseDetailVO {
      * 申请人主张违约金
      */
     private BigDecimal claimLiquidDamag;
+
+    /**
+     * 证据材料
+     */
+    private List<CaseAttach> evidenceMaterialList;
+    /**
+     * 当前登录人身份类型
+     */
+    private Integer identityType;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseAttachMapper.java

@@ -2,6 +2,10 @@ package com.ruoyi.wisdomarbitrate.mapper;
 
 import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
 
+import java.util.List;
+
 public interface CaseAttachMapper {
     int save(CaseAttach caseAttach);
+
+    List<CaseAttach> queryAnnexPathByCaseId(Long id);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/CaseEvidenceMapper.java

@@ -10,6 +10,6 @@ import java.util.List;
 @Mapper
 public interface CaseEvidenceMapper {
     List<CaseEvidenceVO> getCaseListByRespondent(@Param(value = "identityNum" ) String identityNum
-            , @Param(value = "caseStatus" ) Integer caseStatus
+            , @Param(value = "caseStatusList") List<Integer> caseStatusList
             , @Param(value = "identityType" ) Integer identityType);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseEvidenceService.java

@@ -8,9 +8,14 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
 
 public interface ICaseEvidenceService {
-    List<CaseEvidenceVO> getCaseListByRespondent(String identityNum);
+   // List<CaseEvidenceVO> getCaseListByRespondent(String identityNum);
 
     AjaxResult getCaseDetailsById(Long id);
 
     AjaxResult uploadEvidence(MultipartFile file, Integer annexType, Long id);
+
+    //List<CaseEvidenceVO> getCaseListByApplicant(String identityNum);
+
+    List<CaseEvidenceVO> getCaseListAll(String identityNum);
+
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -31,24 +32,10 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     private CaseApplicationMapper caseApplicationMapper;
     @Autowired
     private CaseAttachMapper caseAttachMapper;
-    @Override
+ /*   @Override
     public List<CaseEvidenceVO> getCaseListByRespondent(String identityNum) {
-        int caseStatus = 3;
-        int identityType = 2;
-        List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatus,identityType);
-        if (caseListByRespondent!= null && caseListByRespondent.size()>0){
-            for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
-                //根据案件id查询申请人姓名
-                CaseAffiliate caseAffiliate = new CaseAffiliate();
-                caseAffiliate.setCaseAppliId(caseEvidenceVO.getId());
-                caseAffiliate.setIdentityType(1);
-                String name = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate).get(0).getName();
-                caseEvidenceVO.setApplicantName(name);
-            }
-            return caseListByRespondent;
-        }
-        return null;
-    }
+        return getCaseEvidenceVOList(identityNum,3, 2);
+    }*/
 
     @Override
     public AjaxResult getCaseDetailsById(Long id) {
@@ -58,6 +45,8 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
         if (caseApplication1!=null){
             CaseDetailVO caseDetailVO = new CaseDetailVO();
             BeanUtils.copyProperties(caseApplication1,caseDetailVO);
+            //查询案件证据材料
+           // List <CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
             CaseAffiliate caseAffiliate = new CaseAffiliate();
             caseAffiliate.setCaseAppliId(id);
             List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
@@ -81,15 +70,23 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
         }
         try {
             String filePath  = RuoYiConfig.getUploadPath();
+            // 获取文件原始名称
+            String fileName = file.getOriginalFilename();
+            String fileSavePath = filePath + "/" +  fileName;
             // 上传并返回新文件名称
-            String fileNewName  = FileUploadUtils.upload(filePath, file);
+            String fileNewName  = FileUploadUtils.upload(filePath,file);
             CaseAttach caseAttach = CaseAttach.builder().caseAppliId(id)
                     .annexName(fileNewName)
-                    .annexPath(filePath)
+                    .annexPath(fileSavePath)
                     .annexType(annexType)
                     .build();
             int count = caseAttachMapper.save(caseAttach);
             if (count>0){
+                //修改案件状态
+                CaseApplication caseApplication = new CaseApplication();
+                caseApplication.setId(id);
+                caseApplication.setCaseStatus(4);
+                caseApplicationMapper.submitCaseApplication(caseApplication);
                 return AjaxResult.success("上传成功");
             }
         } catch (IOException e) {
@@ -98,4 +95,36 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
 
         return AjaxResult.error("上传失败");
     }
+
+/*    @Override
+    public List<CaseEvidenceVO> getCaseListByApplicant(String identityNum) {
+        return getCaseEvidenceVOList(identityNum,4, 1);
+    }*/
+
+    @Override
+    public List<CaseEvidenceVO> getCaseListAll(String identityNum) {
+        List<Integer> caseStatusList = Arrays.asList(3, 4, 5, 9);
+        return getCaseEvidenceVOList(identityNum,caseStatusList,null);
+    }
+
+    private  List<CaseEvidenceVO> getCaseEvidenceVOList(String identityNum ,List<Integer> caseStatusList, Integer identityType){
+        List<CaseEvidenceVO> caseListByRespondent = caseEvidenceMapper.getCaseListByRespondent(identityNum, caseStatusList,identityType);
+        if (caseListByRespondent!= null && caseListByRespondent.size()>0){
+            for (CaseEvidenceVO caseEvidenceVO : caseListByRespondent) {
+                //根据案件id查询姓名
+                CaseAffiliate caseAffiliate = new CaseAffiliate();
+                caseAffiliate.setCaseAppliId(caseEvidenceVO.getId());
+                List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
+                for (CaseAffiliate affiliate : caseAffiliates) {
+                    if (affiliate.getIdentityType() == 1){  //申请人
+                        caseEvidenceVO.setApplicantName(affiliate.getName());
+                    }else {
+                        caseEvidenceVO.setRespondentName(affiliate.getName());
+                    }
+                }
+            }
+            return caseListByRespondent;
+        }
+        return null;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CasePaymentServiceImpl.java

@@ -110,7 +110,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
                         request.setTemplateParamSet(new String[]{"模板中的参数值，如果没有则为空"});
                     }
                 }
-                //SmsUtils.sendSms(request);
+                SmsUtils.sendSms(request);
                 return AjaxResult.success();
             }
         }