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

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

@@ -250,11 +250,12 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Override
     @Transactional
     public int updateHeardate(CaseApplication caseApplication) {
-        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+//        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
 
         // 新增日志
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.PENDING_OPENCOURT_HEAR,"");
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
         return rows;
     }
 
@@ -2071,7 +2072,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {
-        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
+//        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
+        caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
 
         //发送短信通知
@@ -2151,7 +2153,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
             }
         }
         // 新增日志
-        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.CHECK_ARBITRATION_METHOD,"");
+        CaseLogUtils.insertCaseLog(caseApplication.getId(),CaseApplicationConstants.MODIFY_HEARDATE,"");
 
         return rows;
 

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

@@ -58,11 +58,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
             if (arbitratMethod == 2) {
                 caseApplication1.setArbitratMethod(1);  // 更改仲裁方式
                 //修改案件状态为待开庭审理
-//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
                 //修改案件状态为待修改开庭时间
-                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
                 // 新增日志
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
 
             } else {
                 caseApplication1.setArbitratMethod(2);
@@ -81,11 +81,11 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
 
             } else {
                 //修改案件状态为待开庭审理
-//                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
+                caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
                 //修改案件状态为待修改开庭时间
-                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
+//                caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
                 // 新增日志
-                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
+                CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
 
             }
         }