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

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

@@ -159,6 +159,17 @@ public class CaseApplicationController  extends BaseController {
         return toAjax(caseApplicationService.pendTralSure(caseApplication));
     }
 
+    /**
+     * 核验裁决书
+     */
+    @PreAuthorize("@ss.hasPermi('caseApplication:verificationArbitrateRecord')")
+    @Log(title = "核验裁决书", businessType = BusinessType.UPDATE)
+    @PostMapping("/verificationArbitrateRecord")
+    public AjaxResult verificationArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication)
+    {
+        return toAjax(caseApplicationService.verificationArbitrateRecord(caseApplication));
+    }
+
 
 
     /**

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

@@ -29,4 +29,6 @@ public interface ICaseApplicationService {
     int pendTralCheck(CaseApplication caseApplication);
 
     int pendTralSure(CaseApplication caseApplication);
+
+    int verificationArbitrateRecord(CaseApplication caseApplication);
 }

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

@@ -258,6 +258,17 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return rows;
     }
 
+    @Override
+    @Transactional
+    public int verificationArbitrateRecord(CaseApplication caseApplication) {
+        caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
+        int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+        arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+        return rows;
+
+    }
+
     @Override
     @Transactional
     public int pendTralSure(CaseApplication caseApplication) {
@@ -318,6 +329,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+
+
     @Override
     @Transactional
     public int pendingAppointArbotrar(CaseApplication caseApplication) {

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

@@ -33,8 +33,8 @@
         <if test="factDetermi != null and factDetermi != ''">#{factDetermi},</if>
         <if test="caseSketch != null and caseSketch != ''">#{caseSketch},</if>
         <if test="rulingFollows != null and rulingFollows != ''">#{rulingFollows},</if>
-        <if test="verifica_opinion != null and verifica_opinion != ''">#{verifica_opinion},</if>
-        <if test="check_opinion != null and check_opinion != ''">#{check_opinion},</if>
+        <if test="verificaOpinion != null and verificaOpinion != ''">#{verifica_opinion},</if>
+        <if test="checkOpinion != null and checkOpinion != ''">#{check_opinion},</if>
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
         sysdate()
         )

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

@@ -48,7 +48,7 @@
         c.update_by ,c.update_time
         from case_application c
         <where>
-            <if test="caseStatus != null and caseStatus != ''">
+            <if test="caseStatus != null">
                 AND c.case_status = #{caseStatus}
             </if>
             <if test="caseNum != null and caseNum != ''">