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

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

 //    @PreAuthorize("@ss.hasPermi('caseApplication:checkArbitrateRecord')")
     @Log(title = "仲裁员审核裁决书", businessType = BusinessType.UPDATE)
     @PostMapping("/arbitrator/checkArbitrateRecord")
+//    @PostMapping("/arbitratorCheckArbitrateRecord")
     public AjaxResult arbitratorCheckArbitrateRecord(@Validated @RequestBody CaseApplication caseApplication) {
 
         return caseApplicationService.arbitratorCheckArbitrateRecord(caseApplication);

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

     private String verificaOpinion;
     /** 审核裁决书意见 */
     private String checkOpinion;
+    /** 仲裁员审核裁决书意见 */
+    private String arbitraCheckOpinion;
     /** 裁决书附件id */
     private Integer annexId;
 

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

      * @return
      */
     @Override
+    @Transactional
     public AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication) {
         // 同意后状态改为待部门长审核仲裁文书（CHECK_ARBITRATION = 12），拒绝改为待秘书核验仲裁文书（VERPRIF_ARBITRATION = 11）
-
-        return null;
+        int rows = 0;
+        ArbitrateRecord arbitrateRecord = caseApplication.getArbitrateRecord();
+        arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord);
+        Integer agreeOrNotCheck = caseApplication.getAgreeOrNotCheck();
+        if (agreeOrNotCheck.intValue() == 1) {
+            caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION);
+            // 新增日志
+            insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION, "");
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        } else if (agreeOrNotCheck.intValue() == 2) {//拒绝审核
+            caseApplication.setCaseStatus(CaseApplicationConstants.VERPRIF_ARBITRATION);
+            // 新增日志
+            insertCaseLog(caseApplication.getId(), CaseApplicationConstants.VERPRIF_ARBITRATION, "");
+            rows = caseApplicationMapper.submitCaseApplication(caseApplication);
+        }
+        return success();
     }
 
     @Override

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

             <if test="rulingFollows != null and rulingFollows != ''">ruling_follows = #{rulingFollows},</if>
             <if test="verificaOpinion != null and verificaOpinion != ''">verifica_opinion = #{verificaOpinion},</if>
             <if test="checkOpinion != null and checkOpinion != ''">check_opinion = #{checkOpinion},</if>
+            <if test="arbitraCheckOpinion != null and arbitraCheckOpinion != ''">arbitra_check_opinion = #{arbitraCheckOpinion},</if>
             <if test="annexId != null ">annex_id = #{annexId},</if>
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="caseFocus != null  and caseFocus != ''">case_focus = #{caseFocus},</if>