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

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

@@ -324,7 +324,7 @@ public class CaseApplicationController extends BaseController {
         if(CollectionUtil.isEmpty(batchCaseApplication.getIds())|| batchCaseApplication.getAgreeOrNotCheck()==null){
             return error("参数校验失败");
         }
-        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getRejectReason()));
+        return success(caseApplicationService.submitCaseApplicationCheck(batchCaseApplication.getIds(),batchCaseApplication.getAgreeOrNotCheck(),batchCaseApplication.getCaseCheckReject()));
     }
 
     /**

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

@@ -21,5 +21,5 @@ public class BatchCaseApplication {
      */
     private Integer  opinion;
     /** 驳回原因 */
-    private String rejectReason;
+    private String caseCheckReject;
 }

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

@@ -45,7 +45,7 @@ public interface ICaseApplicationService {
 
     AjaxResult checkArbitrateRecord(CaseApplication caseApplication);
 
-    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason);
+    int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String caseCheckReject);
 
     CaseApplication selectCaseApplicationConfirm(CaseApplication caseApplication);
 

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

@@ -1886,7 +1886,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     @Override
     @Transactional
-    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String rejectReason) {
+    public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck,String caseCheckReject) {
         //提交立案审查
         int rows = 0;
         for (Long id : ids) {
@@ -1902,8 +1902,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                 ArbitrateRecord arbitrateRecordsel = new ArbitrateRecord();
                 arbitrateRecordsel.setCaseAppliId(id);
                 ArbitrateRecord arbitrateRecordnew = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordsel);
-                arbitrateRecordnew.setCaseCheckReject(rejectReason);
+                if(arbitrateRecordnew!=null){
-                arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew);
+                    arbitrateRecordnew.setCaseCheckReject(caseCheckReject);
+                    arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordnew);
+                }else {
+                    arbitrateRecordsel.setCaseCheckReject(caseCheckReject);
+                    arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecordsel);
+                }
+
 
             }
             // 新增日志

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

@@ -32,6 +32,7 @@
         <if test="arbitrateThink != null and arbitrateThink != ''">arbitrate_think,</if>
 
         <if test="checkOpinion != null and checkOpinion != ''">check_opinion,</if>
+        <if test="caseCheckReject != null and caseCheckReject != ''">case_check_reject,</if>
         <if test="createBy != null  and createBy != ''">create_by,</if>
         case_focus,
         case_facts,
@@ -47,6 +48,7 @@
         <if test="verificaOpinion != null and verificaOpinion != ''">#{verificaOpinion},</if>
         <if test="arbitrateThink != null and arbitrateThink != ''">#{arbitrateThink},</if>
         <if test="checkOpinion != null and checkOpinion != ''">#{checkOpinion},</if>
+        <if test="caseCheckReject != null and caseCheckReject != ''">#{caseCheckReject},</if>
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
         #{caseFocus},
         #{caseFacts},