9.19开发提交

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

@@ -78,4 +78,19 @@ public class CaseEvidenceController extends BaseController {
     public AjaxResult evidenceConfirmation(@Validated @RequestBody CaseApplication caseApplication){
         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);
+    }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtils.java

@@ -74,12 +74,4 @@ public class SmsUtils {
         private String[] templateParamSet;
 
     }
-
-    public static void main(String[] args) {
-        SendSmsRequest sendSmsRequest = new SendSmsRequest();
-        sendSmsRequest.setPhone("18792613219");
-        sendSmsRequest.setTemplateId("1928003");
-        sendSmsRequest.setTemplateParamSet(new String[]{"xxx","仲裁","编号"});
-        SmsUtils.sendSms(sendSmsRequest);
-    }
 }

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

@@ -18,4 +18,5 @@ public interface ICaseEvidenceService {
 
     AjaxResult evidenceConfirmation(CaseApplication caseApplication);
 
+    AjaxResult caseCrossexamination(CaseApplication caseApplication, Integer objectionAddEviden, Integer openCourtHear, Integer pendingAppointArbotrar);
 }

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

@@ -7,12 +7,10 @@ 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.vo.CaseDetailVO;
 import com.ruoyi.wisdomarbitrate.domain.vo.CaseEvidenceVO;
-import com.ruoyi.wisdomarbitrate.mapper.CaseAffiliateMapper;
-import com.ruoyi.wisdomarbitrate.mapper.CaseApplicationMapper;
-import com.ruoyi.wisdomarbitrate.mapper.CaseAttachMapper;
-import com.ruoyi.wisdomarbitrate.mapper.CaseEvidenceMapper;
+import com.ruoyi.wisdomarbitrate.mapper.*;
 import com.ruoyi.wisdomarbitrate.service.ICaseEvidenceService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +19,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -38,10 +32,11 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     private CaseApplicationMapper caseApplicationMapper;
     @Autowired
     private CaseAttachMapper caseAttachMapper;
-
+    @Autowired
+    private CaseLogRecordMapper caseLogRecordMapper;
     @Override
     @Transactional
-    public AjaxResult getCaseDetailsById(Long id,String userName) {
+    public AjaxResult getCaseDetailsById(Long id, String userName) {
         CaseApplication caseApplication = new CaseApplication();
         caseApplication.setId(id);
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
@@ -52,10 +47,12 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
             caseAffiliate.setCaseAppliId(id);
             List<CaseAffiliate> caseAffiliates = caseAffiliateMapper.selectCaseAffiliate(caseAffiliate);
             for (CaseAffiliate affiliate : caseAffiliates) {
-                String name = affiliate.getName();
-                //判断当前登录人和案件关联人姓名是否一致
-                if (name.equals(userName)) {  //一致,将案件关联人的身份类型赋给当前登录人
-                    caseDetailVO.setIdentityType(affiliate.getIdentityType());
+                if (affiliate.getName() != null) {
+                    String name = affiliate.getName();
+                    //判断当前登录人和案件关联人姓名是否一致
+                    if (name.equals(userName)) {  //一致,将案件关联人的身份类型赋给当前登录人
+                        caseDetailVO.setIdentityType(affiliate.getIdentityType());
+                    }
                 }
                 if (affiliate.getIdentityType() == 1) {  //申请人
                     caseDetailVO.setApplicantName(affiliate.getName());
@@ -64,13 +61,13 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
                 }
                 //根据案件id查询案件证据材料
                 List<CaseAttach> evidenceMaterialList = caseAttachMapper.queryAnnexPathByCaseId(id);
-                if (evidenceMaterialList!=null&&evidenceMaterialList.size()>0){
+                if (evidenceMaterialList != null && evidenceMaterialList.size() > 0) {
                     for (CaseAttach caseAttach : evidenceMaterialList) {
-                        String path =caseAttach.getAnnexName();
+                        String path = caseAttach.getAnnexName();
                         String prefix = "/profile";
                         int startIndex = path.indexOf(prefix);
                         startIndex += prefix.length();
-                        String extractedPath = "/uploadPath"+path.substring(startIndex);
+                        String extractedPath = "/uploadPath" + path.substring(startIndex);
                         caseAttach.setAnnexPath(extractedPath);
                     }
                 }
@@ -116,7 +113,6 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     }
 
 
-
     @Override
     public List<CaseEvidenceVO> getCaseListAll(String identityNum) {
         List<Integer> caseStatusList = Arrays.asList(3, 4, 5, 9);
@@ -127,12 +123,41 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
     public AjaxResult evidenceConfirmation(CaseApplication caseApplication) {
         caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_TRIAL);
         int i = caseApplicationMapper.submitCaseApplication(caseApplication);
-        if (i>0){
+        if (i > 0) {
             return AjaxResult.success("证据确认成功");
         }
         return AjaxResult.error("暂无需要确认的证据");
     }
 
+    @Override
+    public AjaxResult caseCrossexamination(CaseApplication caseApplication
+            , Integer objectionAddEviden, Integer openCourtHear, Integer pendingAppointArbotrar) {
+        //查询案件详细信息
+        CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
+        if (caseApplication1 != null) {
+            int caseStatus = caseApplication1.getCaseStatus();
+            caseApplication1.setObjectionAddEviden(objectionAddEviden);
+            caseApplication1.setOpenCourtHear(openCourtHear);
+            caseApplication1.setPendingAppointArbotrar(pendingAppointArbotrar);
+            //修改案件状态
+            caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
+            int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
+            if (i>0){
+                //案件日志表里添加数据
+                CaseLogRecord caseLogRecord = new CaseLogRecord();
+                caseLogRecord.setCaseAppliId(caseApplication1.getId());
+                caseLogRecord.setCaseNode(caseStatus);
+                String createBy = caseApplication1.getCreateBy();
+                if (createBy!=null){
+                    caseLogRecord.setCreateBy(createBy);
+                }
+                caseLogRecordMapper.insertCaseLogRecord(caseLogRecord);
+                return AjaxResult.success("提交成功");
+            }
+        }
+        return 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) {