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

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

@@ -72,10 +72,10 @@ public class CaseApplicationController  extends BaseController {
     }
 
     /**
-     * 提交立案数据
+     * 提交立案申请
      */
     @PreAuthorize("@ss.hasPermi('caseApplication:submit')")
-    @Log(title = "提交立案数据", businessType = BusinessType.UPDATE)
+    @Log(title = "提交立案申请", businessType = BusinessType.UPDATE)
     @PostMapping("/submitCaseApplication")
     public AjaxResult submitCaseApplication(@Validated @RequestBody CaseApplication caseApplication)
     {
@@ -194,6 +194,18 @@ public class CaseApplicationController  extends BaseController {
         return toAjax(caseApplicationService.pendingAppointArbotrar(caseApplication));
     }
 
+    /**
+     * 提交立案审查
+     */
+    @PreAuthorize("@ss.hasPermi('caseApplication:submitCaseApplicationCheck')")
+    @Log(title = "提交立案审查", businessType = BusinessType.UPDATE)
+    @PostMapping("/submitCaseApplicationCheck")
+    public AjaxResult submitCaseApplicationCheck(@Validated @RequestBody CaseApplication caseApplication)
+    {
+
+        return toAjax(caseApplicationService.submitCaseApplicationCheck(caseApplication));
+    }
+
 
 
 

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

@@ -33,4 +33,6 @@ public interface ICaseApplicationService {
     int verificationArbitrateRecord(CaseApplication caseApplication);
 
     int checkArbitrateRecord(CaseApplication caseApplication);
+
+    int submitCaseApplicationCheck(CaseApplication caseApplication);
 }

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

@@ -88,7 +88,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     @Transactional
     public int submitCaseApplication(CaseApplication caseApplication) {
         //提交立案申请
-        caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT);
+        caseApplication.setCaseStatus(CaseApplicationConstants.CASE_CHECK);
         int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
         return rows;
     }
@@ -287,6 +287,22 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return rows;
     }
 
+    @Override
+    @Transactional
+    public int submitCaseApplicationCheck(CaseApplication caseApplication) {
+        //提交立案审查
+        int rows = 0;
+        Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
+        if(agreeOrNotCheck.intValue()==1){//同意审核
+            caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_PAYMENT);
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }else if(agreeOrNotCheck.intValue()==2){//拒绝审核
+            caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }
+        return rows;
+    }
+
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {

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

@@ -110,7 +110,6 @@
         <if test="claimInterestOwed != null ">#{claimInterestOwed},</if>
         <if test="claimLiquidDamag != null ">#{claimLiquidDamag},</if>
         <if test="feePayable != null ">#{feePayable},</if>
-        <if test="paidExpenses != null ">#{paidExpenses},</if>
         <if test="beginVideoDate != null ">#{beginVideoDate},</if>
         <if test="onlineVideoPerson != null  and onlineVideoPerson != ''">#{onlineVideoPerson},</if>