Merge branch 'qtz5' of SH-Arbitrate/Arbitrate-Backend into dev

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

@@ -28,10 +28,10 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.List;
@@ -353,6 +353,9 @@ public class CaseApplicationController extends BaseController {
     }
 
 
+
+    
+
     /**
      * 发送房间号短信
      */

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

@@ -30,8 +30,8 @@ public class CaseArbitrateController extends BaseController {
     @PutMapping("/method")
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
-            , Integer opinion){
-        return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
+            , Integer opinion, Integer arbitratMethod){
+        return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion,arbitratMethod);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -38,6 +38,18 @@ public class SysUser extends BaseEntity
     /** 用户昵称 */
     @Excel(name = "用户名称")
     private String nickName;
+
+    /** 用户昵称和待办数量 */
+    private String nickNameAndNum;
+
+    public String getNickNameAndNum() {
+        return nickNameAndNum;
+    }
+
+    public void setNickNameAndNum(String nickNameAndNum) {
+        this.nickNameAndNum = nickNameAndNum;
+    }
+
     /** 用户身份证号 */
     @Excel(name = "身份证号")
     private String idCard;

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -89,7 +89,7 @@ public class SysUserServiceImpl implements ISysUserService {
                 int casenum = caseApplicationMapper.selectCasenum(userId.toString());
                 String nickName = sysUser.getNickName();
                 String nickNamenew = nickName + "(待办案件数量" + casenum + "个)";
-                sysUser.setNickName(nickNamenew);
+                sysUser.setNickNameAndNum(nickNamenew);
             }
 
         }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -56,6 +56,10 @@ public class CaseApplication  extends BaseEntity {
 
     /** 被申请人是否书面审理 */
     private Integer respondentIsWrittenHear;
+    /** 开庭方式是否一致 */
+    private Integer arbitraMethodIssame;
+    /** 仲裁方式说明 */
+    private String arbitratMethodIllustrate;
 
 
     /** 案件申请表ID */

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

@@ -4,14 +4,15 @@ import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.CaseApplicationPay;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 public class CasePayListVO {
     /**
-     * 订单总金额 单位:分
+     * 订单总金额
      */
-    private int totalFee;
+    private BigDecimal totalFee;
 
     /**
      * 案件总条数

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

@@ -13,5 +13,5 @@ public interface ICaseArbitrateService {
 
     AjaxResult  writtenHear(CaseIds caseIds);
 
-    AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion);
+    AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion, Integer arbitratMethod);
 }

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

@@ -174,7 +174,45 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 // 超级管理员和仲裁委（部门长）案件，可查看所有案件 √
                 if ("超级管理员".equals(role.getRoleName())
                 ) {
-                    return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
+                    List<CaseApplication> caseApplicationlist = caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
+                    if(caseApplicationlist!=null&&caseApplicationlist.size()>0){
+                        for(CaseApplication caseApplicationsel : caseApplicationlist){
+                            Integer caseStatus = caseApplicationsel.getCaseStatus();
+                            if(caseStatus.intValue() == CaseApplicationConstants.CHECK_ARBITRATION_METHOD){
+                                Integer applicantIsWrittenHear = caseApplicationsel.getApplicantIsWrittenHear();
+                                Integer respondentIsWrittenHear = caseApplicationsel.getRespondentIsWrittenHear();
+                                if(applicantIsWrittenHear!=null&&respondentIsWrittenHear!=null){
+                                    if(applicantIsWrittenHear.intValue()==respondentIsWrittenHear.intValue()){
+                                        caseApplicationsel.setArbitraMethodIssame(1);
+                                        if(applicantIsWrittenHear.intValue()==1&&respondentIsWrittenHear.intValue()==1){
+                                            caseApplicationsel.setArbitratMethod(2);
+                                        }else {
+                                            caseApplicationsel.setArbitratMethod(1);
+                                        }
+                                    }else {
+                                        caseApplicationsel.setArbitraMethodIssame(2);
+                                        String applicantarbitratMethod = "";
+                                        String respondentbitratMethod = "";
+                                        if(applicantIsWrittenHear.intValue()==1){
+                                            applicantarbitratMethod = "书面审理";
+                                        }else {
+                                            applicantarbitratMethod = "开庭审理";
+                                        }
+                                        if(respondentIsWrittenHear.intValue()==1){
+                                            respondentbitratMethod = "书面审理";
+                                        }else {
+                                            respondentbitratMethod = "开庭审理";
+                                        }
+                                        String arbitratMethodIllustrate = "当前案件开庭方式：申请人选择开庭方式为"+applicantarbitratMethod+
+                                                "被申请人选择开庭方式为"+respondentbitratMethod+"，请确定开庭方式。";
+                                        caseApplicationsel.setArbitratMethodIllustrate(arbitratMethodIllustrate);
+                                    }
+                                }
+
+                            }
+                        }
+                    }
+                    return caseApplicationlist;
                 }
                 if ("仲裁委".equals(role.getRoleName())
                         || "部门长".equals(role.getRoleName())) {
@@ -223,7 +261,45 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
             // 根据条件查询申请人，被申请人，仲裁员，法律顾问案件
 //            return caseApplicationMapper.selectCaseApplicationList(caseApplication);
-            return caseApplicationMapper.selectCaseApplicationList1(caseApplication);
+            List<CaseApplication> caseApplications = caseApplicationMapper.selectCaseApplicationList1(caseApplication);
+            if(caseApplications!=null&&caseApplications.size()>0){
+                for(CaseApplication caseApplicationsel : caseApplications){
+                    Integer caseStatus = caseApplicationsel.getCaseStatus();
+                    if(caseStatus.intValue() == CaseApplicationConstants.CHECK_ARBITRATION_METHOD){
+                        Integer applicantIsWrittenHear = caseApplicationsel.getApplicantIsWrittenHear();
+                        Integer respondentIsWrittenHear = caseApplicationsel.getRespondentIsWrittenHear();
+                        if(applicantIsWrittenHear!=null&&respondentIsWrittenHear!=null){
+                            if(applicantIsWrittenHear.intValue()==respondentIsWrittenHear.intValue()){
+                                caseApplicationsel.setArbitraMethodIssame(1);
+                                if(applicantIsWrittenHear.intValue()==1&&respondentIsWrittenHear.intValue()==1){
+                                    caseApplicationsel.setArbitratMethod(2);
+                                }else {
+                                    caseApplicationsel.setArbitratMethod(1);
+                                }
+                            }else {
+                                caseApplicationsel.setArbitraMethodIssame(2);
+                                String applicantarbitratMethod = "";
+                                String respondentbitratMethod = "";
+                                if(applicantIsWrittenHear.intValue()==1){
+                                    applicantarbitratMethod = "书面审理";
+                                }else {
+                                    applicantarbitratMethod = "开庭审理";
+                                }
+                                if(respondentIsWrittenHear.intValue()==1){
+                                    respondentbitratMethod = "书面审理";
+                                }else {
+                                    respondentbitratMethod = "开庭审理";
+                                }
+                                String arbitratMethodIllustrate = "当前案件开庭方式：申请人选择开庭方式为"+applicantarbitratMethod+
+                                        "被申请人选择开庭方式为"+respondentbitratMethod+"，请确定开庭方式。";
+                                caseApplicationsel.setArbitratMethodIllustrate(arbitratMethodIllustrate);
+                            }
+                        }
+
+                    }
+                }
+            }
+            return caseApplications;
 
     }
 
@@ -1077,15 +1153,6 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         BigDecimal feePayable = caseApplication.getCaseSubjectAmount().multiply(feeRate).setScale(2, RoundingMode.HALF_UP);
         caseApplication.setFeePayable(feePayable);
         caseApplication.setUpdateBy(getUsername());
-        Integer applicantIsWrittenHear = caseApplication.getApplicantIsWrittenHear();
-        if(applicantIsWrittenHear!=null&&applicantIsWrittenHear.intValue()==1){
-            //书面审理
-            caseApplication.setArbitratMethod(2);
-        }else {
-            //开庭审理
-            caseApplication.setArbitratMethod(1);
-        }
-
         // 立案申请状态直接修改主表信息
         if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
             // 修改内置字段

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

@@ -58,19 +58,17 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
 
     @Override
     @Transactional
-    public AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion) {
+    public AjaxResult examineArbitrateMethod(CaseApplication caseApplication, Integer opinion, Integer arbitratMethodNow) {
         //查询案件详细信息
         CaseApplication caseApplication1 = caseApplicationMapper.selectCaseApplication(caseApplication);
         if (caseApplication1 == null) {
             return AjaxResult.success();
         }
-        Integer arbitratMethod = caseApplication1.getArbitratMethod();
-        if (arbitratMethod == null) {
-            return AjaxResult.error("请先指定仲裁方式");
-        }
+        Integer arbitratMethodOriral = caseApplication.getArbitratMethod();
+
         String caseNum = caseApplication1.getCaseNum();
         if (opinion == 0) {   //拒绝
-            if (arbitratMethod == 2) {
+            if (arbitratMethodOriral == 2) {
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
                 //修改案件状态修改开庭时间
                 caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
@@ -87,15 +85,35 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
 
             }
-        } else {
-            if (arbitratMethod == 2) {
+        } else if (opinion == 1 ) {
+            if (arbitratMethodOriral == 2) {
                 //修改案件状态为待书面审理
+                caseApplication1.setArbitratMethod(2);
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
+                // 新增日志
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
+
+            } else {
+                //修改案件状态为待修改开庭时间
+                caseApplication1.setArbitratMethod(1);
+                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
+                //修改案件状态为待修改开庭时间
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
+                // 新增日志
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
+
+            }
+        }else if (opinion == 2) {
+            if (arbitratMethodNow == 2) {
+                //修改案件状态为待书面审理
+                caseApplication1.setArbitratMethod(2);
                 caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_WRIITEN_HEAR);
                 // 新增日志
                 CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
 
             } else {
                 //修改案件状态为待修改开庭时间
+                caseApplication1.setArbitratMethod(1);
                 caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
                 //修改案件状态为待修改开庭时间
 //                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);

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

@@ -247,14 +247,7 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
             //修改案件状态
             caseApplication1.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL_SUBMMIT);
 
-            Integer respondentIsWrittenHear = caseEvidenceDTO.getRespondentIsWrittenHear();
-            if(respondentIsWrittenHear.intValue()==1){
-                //书面审理
-                caseApplication1.setArbitratMethod(2);
-            }else {
-                //开庭审理
-                caseApplication1.setArbitratMethod(1);
-            }
+
             int i = caseApplicationMapper.submitCaseApplication(caseApplication1);
             if (i > 0) {
                 // 新增日志

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

@@ -252,7 +252,7 @@ public class CasePaymentServiceImpl implements ICasePaymentService {
             CaseApplication caseApplication1 = caseApplicationService.selectCaseApplication(caseApplication);
             BigDecimal feePayable = caseApplication1.getFeePayable();
             sum = sum.add(feePayable);
-            listVO.setTotalFee(sum.intValue());
+            listVO.setTotalFee(sum);
             caseApplicationPay.setCaseAppName(caseApplication1.getApplicantName());
             caseApplicationPay.setCaseResName(caseApplication1.getRespondentName());
             caseApplicationPay.setCaseNum(caseApplication1.getCaseNum());

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

@@ -60,7 +60,7 @@
         select DISTINCT(t1.id),t1.caseLogId,t1.case_num,t1.case_subject_amount,t1.register_date,t1.arbitrat_method,
         t1.arbitratMethodName,t1.case_status,t1.caseStatusName,t1.hear_date,t1.arbitrat_claims,
         t1.loan_start_date,t1.loan_end_date,t1.claim_princi_owed,t1.claim_interest_owed,t1.claim_liquid_damag,t1.fee_payable,
-        t1.begin_video_date,t1.online_video_person,t1.contract_number,t1.create_by,t1.create_time,t1.update_by,t1.update_time,
+        t1.begin_video_date,t1.online_video_person,t1.contract_number,t1.create_by,t1.create_time,t1.appli_iswrit_hear,t1.respon_isWrit_hear,t1.update_by,t1.update_time,
         t1.arbitrator_name,t1.name,t1.application_organ_id,t1.applicantName,t1.arbitrator_id,t1.identity_num,t1.identity_type,
         t1.filearbitra_url,t1.lock_status,t1.version,t1.updateSubmitStatus,t1.batch_number,t1.pendingStatus
         from(
@@ -85,7 +85,7 @@
                 c.hear_date ,c.arbitrat_claims ,
                 c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
                 ,c.fee_payable ,c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by
-                ,c.create_time,
+                ,c.create_time,c.appli_iswrit_hear,c.respon_isWrit_hear,
                 c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
                 as applicantName,
                 c.arbitrator_id,ca.identity_num ,ca.identity_type,c.filearbitra_url,c.lock_status,c.version,null as
@@ -153,7 +153,7 @@
                 c.hear_date ,c.arbitrat_claims ,
                 c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
                 ,c.fee_payable ,
-                c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,
+                c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.appli_iswrit_hear,c.respon_isWrit_hear,
                 c.update_by ,c.update_time , c.arbitrator_name,ca.name,ca.application_organ_id,ca.application_organ_name
                 as
                 applicantName,
@@ -216,7 +216,7 @@
                 c.online_video_person,
                 c.contract_number,
                 c.create_by,
-                c.create_time,
+                c.create_time,c.appli_iswrit_hear,c.respon_isWrit_hear,
                 c.update_by,
                 c.update_time,
                 c.arbitrator_name,
@@ -283,7 +283,7 @@
                 c.online_video_person,
                 c.contract_number,
                 c.create_by,
-                c.create_time,
+                c.create_time,c.appli_iswrit_hear,c.respon_isWrit_hear,
                 c.update_by,
                 c.update_time,
                 c.arbitrator_name,
@@ -351,7 +351,7 @@
             c.online_video_person,
             c.contract_number,
             c.create_by,
-            c.create_time,
+            c.create_time,c.appli_iswrit_hear,c.respon_isWrit_hear,
             c.update_by,
             c.update_time,
             c.arbitrator_name,
@@ -819,7 +819,7 @@
         c.hear_date ,c.arbitrat_claims ,
         c.loan_start_date ,c.loan_end_date ,c.claim_princi_owed ,c.claim_interest_owed ,c.claim_liquid_damag
         ,c.fee_payable ,
-        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.lock_status,
+        c.begin_video_date ,c.online_video_person ,c.contract_number ,c.create_by ,c.create_time ,c.appli_iswrit_hear,c.respon_isWrit_hear,c.lock_status,
         c.update_by ,c.update_time , c.arbitrator_name,ca.application_organ_id applicationOrganId
         ,ca.application_organ_name as applicantName,c.filearbitra_url,(select version from
         case_application_log where case_appli_id=c.id order by version desc limit 1) as version,(select

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

@@ -63,6 +63,7 @@
                 AND dept_name_firchar = #{deptNameFirchar}
             </if>
         </where>
+        order by create_time desc
     </select>
 
 

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

@@ -79,6 +79,7 @@
             </if>
             AND  del_flag =0
         </where>
+        ORDER BY create_time DESC
     </select>
 
 </mapper>