1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseEvidenceController.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.dto.CaseEvidenceDTO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
 import com.ruoyi.wisdomarbitrate.service.ICaseEvidenceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,18 +80,9 @@ public class CaseEvidenceController extends BaseController {
         return caseEvidenceService.evidenceConfirmation(caseApplication);
     }
 
-    /**
-     * 案件质证
-     * @param caseApplication
-     * @param objectionAddEviden 是否有异议需要举证,1是，0否
-     * @param openCourtHear 是否需要开庭审理，1是，0否
-     * @param pendingAppointArbotrar 是否指派仲裁员,1是，2否
-     * @return
-     */
+
     @PostMapping("/crossexami")
-    public AjaxResult caseCrossexamination(@Validated @RequestBody CaseApplication caseApplication
-    ,Integer objectionAddEviden,Integer openCourtHear,Integer pendingAppointArbotrar){
-        return caseEvidenceService.caseCrossexamination(caseApplication
-                ,objectionAddEviden,openCourtHear,pendingAppointArbotrar);
+    public AjaxResult caseCrossexamination(@Validated @RequestBody CaseEvidenceDTO caseEvidenceDTO){
+        return caseEvidenceService.caseCrossexamination(caseEvidenceDTO);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CaseEvidenceDTO.java

@@ -0,0 +1,37 @@
+package com.ruoyi.wisdomarbitrate.domain.dto;
+
+import com.ruoyi.wisdomarbitrate.domain.Arbitrator;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 案件质证传入对象
+ */
+@Data
+public class CaseEvidenceDTO {
+    /**
+     * 案件id
+     */
+    private Long caseId;
+
+    /**
+     * 是否有异议需要举证,1是，0否
+     */
+    private Integer objectionAddEviden;
+
+    /**
+     * 是否需要开庭审理，1是，0否
+     */
+    private Integer openCourtHear;
+
+    /**
+     * 是否指派仲裁员,1是，2否
+     */
+    private Integer pendingAppointArbotrar;
+
+    /**
+     * 案件仲裁员
+     */
+    private List<Arbitrator> arbitrators;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/CasePayDTO.java

@@ -2,7 +2,7 @@ package com.ruoyi.wisdomarbitrate.domain.dto;
 
 import lombok.Data;
 /**
- * 案件缴费传入参数
+ * 案件缴费传入对象
  */
 @Data
 public class CasePayDTO {

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

@@ -3,6 +3,7 @@ package com.ruoyi.wisdomarbitrate.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.dto.CaseEvidenceDTO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,5 +19,5 @@ public interface ICaseEvidenceService {
 
     AjaxResult evidenceConfirmation(CaseApplication caseApplication);
 
-    AjaxResult caseCrossexamination(CaseApplication caseApplication, Integer objectionAddEviden, Integer openCourtHear, Integer pendingAppointArbotrar);
+    AjaxResult caseCrossexamination(CaseEvidenceDTO caseEvidenceDTO);
 }

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

@@ -4,10 +4,8 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.CaseApplicationConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.wisdomarbitrate.domain.CaseAffiliate;
-import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
-import com.ruoyi.wisdomarbitrate.domain.CaseAttach;
-import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
+import com.ruoyi.wisdomarbitrate.domain.*;
+import com.ruoyi.wisdomarbitrate.domain.dto.CaseEvidenceDTO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseDetailVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
 import com.ruoyi.wisdomarbitrate.mapper.*;
@@ -21,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
@@ -34,6 +33,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     private CaseAttachMapper caseAttachMapper;
     @Autowired
     private CaseLogRecordMapper caseLogRecordMapper;
+
     @Override
     @Transactional
     public AjaxResult getCaseDetailsById(Long id, String userName) {
@@ -130,25 +130,35 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     }
 
     @Override
-    public AjaxResult caseCrossexamination(CaseApplication caseApplication
-            , Integer objectionAddEviden, Integer openCourtHear, Integer pendingAppointArbotrar) {
+    public AjaxResult caseCrossexamination(CaseEvidenceDTO caseEvidenceDTO) {
         //查询案件详细信息
+        CaseApplication caseApplication = new CaseApplication();
+        caseApplication.setId(caseEvidenceDTO.getCaseId());
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
         if (caseApplication1 != null) {
             int caseStatus = caseApplication1.getCaseStatus();
-            caseApplication1.setObjectionAddEviden(objectionAddEviden);
-            caseApplication1.setOpenCourtHear(openCourtHear);
-            caseApplication1.setPendingAppointArbotrar(pendingAppointArbotrar);
+            caseApplication1.setObjectionAddEviden(caseEvidenceDTO.getObjectionAddEviden());
+            caseApplication1.setOpenCourtHear(caseEvidenceDTO.getOpenCourtHear());
+            caseApplication1.setPendingAppointArbotrar(caseEvidenceDTO.getPendingAppointArbotrar());
+            List<Arbitrator> arbitrators = caseEvidenceDTO.getArbitrators();
+            if (arbitrators != null && arbitrators.size() > 0) {
+                List<Long> ids = arbitrators.stream().map(Arbitrator::getId).collect(Collectors.toList());
+                List<String> arbitratorNames = arbitrators.stream().map(Arbitrator::getArbitratorName).collect(Collectors.toList());
+                String idstr = ids.stream().map(Object::toString).collect(Collectors.joining(","));
+                String arbitratorNamestr = arbitratorNames.stream().map(Object::toString).collect(Collectors.joining(","));
+                caseApplication1.setArbitratorId(idstr);
+                caseApplication1.setArbitratorName(arbitratorNamestr);
+            }
             //修改案件状态
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
             int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
-            if (i>0){
+            if (i > 0) {
                 //案件日志表里添加数据
                 CaseLogRecord caseLogRecord = new CaseLogRecord();
                 caseLogRecord.setCaseAppliId(caseApplication1.getId());
                 caseLogRecord.setCaseNode(caseStatus);
                 String createBy = caseApplication1.getCreateBy();
-                if (createBy!=null){
+                if (createBy != null) {
                     caseLogRecord.setCreateBy(createBy);
                 }
                 caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);