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

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

         if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){
             return error("参数校验失败");
         }
-        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck()));
+        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getRejectReason()));
     }
 
     /**

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

      */
     private String applicantOpinion;
 
+    /**
+     * 立案审查驳回原因
+     */
+    private String caseCheckReject;
+    /**
+     * 仲裁员确认裁决书驳回
+     */
+    private String arbitrateReject;
+    /**
+     * 部门长确认裁决书驳回
+     */
+    private String deptorReject;
+
 
 
 

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

      * 1同意，0拒绝
      */
     private Integer  opinion;
+    /** 驳回原因 */
+    private String rejectReason;
 }

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

 
     AjaxResult checkArbitrateRecord(CaseApplication caseApplication);
 
-    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck);
+    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason);
 
     CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
 

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

 
     @Override
     @Transactional
-    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck) {
+    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason) {
         //提交立案审查
         int rows = 0;
         for (Long id : ids) {
             } else if (agreeOrNotCheck == 2) {//拒绝审核
                 caseApplication.setCaseStatus(CaseApplicationConstants.CASE_APPLICATION);
                 rows += caseApplicationMapper.submitCaseApplication(caseApplication);
+                ArbitrateRecord arbitrateRecordsel = new ArbitrateRecord();
+                arbitrateRecordsel.setCaseAppliId(id);
+                ArbitrateRecord arbitrateRecordnew = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordsel);
+                arbitrateRecordnew.setCaseCheckReject(rejectReason);
+                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew);
+
             }
             // 新增日志
             insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_PAYMENT, "");

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

             <if test="caseFacts != null  and caseFacts != ''">case_facts = #{caseFacts},</if>
             <if test="respondentOpinion != null  and respondentOpinion != ''">respondent_opinion = #{respondentOpinion},</if>
             <if test="applicantOpinion != null  and applicantOpinion != ''">applicant_opinion = #{applicantOpinion},</if>
+            <if test="caseCheckReject != null  and caseCheckReject != ''">case_check_reject = #{caseCheckReject},</if>
+            <if test="arbitrateReject != null  and arbitrateReject != ''">arbitrate_reject = #{arbitrateReject},</if>
+            <if test="deptorReject != null  and deptorReject != ''">deptor_reject = #{deptorReject},</if>
             update_time = sysdate()
         </set>
         where id = #{id}
 
     <select id="selectArbitrateRecord" parameterType="ArbitrateRecord" resultMap="ArbitrateRecordResult">
         SELECT a.id ,a.case_appli_id ,a.eviden_determi ,a.fact_determi ,a.case_sketch ,a.arbitrate_think ,a.ruling_follows ,
-        a.verifica_opinion ,a.check_opinion,a.annex_id,a.case_focus,a.case_facts,a.respondent_opinion,a.applicant_opinion
+        a.verifica_opinion ,a.check_opinion,a.annex_id,a.case_focus,a.case_facts,a.respondent_opinion,a.applicant_opinion,
+        a.case_check_reject ,a.arbitrate_reject,a.deptor_reject
         from arbitrate_record a
         <where>
             <if test="caseAppliId != null ">