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

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

@@ -357,6 +357,18 @@ public class CaseApplicationController extends BaseController {
     public AjaxResult creatTrialRecord(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
         return caseApplicationService.creatTrialRecord(arbitrateRecord);
     }
+
+    /**
+     * 记录庭审笔录
+     * @param arbitrateRecord
+     * @return
+     */
+    @PostMapping("/creatTrialRecordnew")
+//    @PreAuthorize("@ss.hasPermi('caseManagement:list:creatTrialRecord')")
+    public AjaxResult creatTrialRecordnew(@Validated @RequestBody ArbitrateRecord arbitrateRecord){
+        return caseApplicationService.creatTrialRecordnew(arbitrateRecord);
+    }
+
     /**
      * 案件锁定或者解锁
      * @param caseApplication

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

@@ -128,4 +128,6 @@ public interface ICaseApplicationService {
      * @return
      */
     AjaxResult arbitratorCheckArbitrateRecord(CaseApplication caseApplication);
+
+    AjaxResult creatTrialRecordnew(ArbitrateRecord arbitrateRecord);
 }

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

@@ -2174,6 +2174,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         return success();
     }
 
+
+
     @Override
     @Transactional
     public int submitCaseApplicationCheck(List<Long> ids, Integer agreeOrNotCheck) {
@@ -2530,6 +2532,29 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
 
     }
 
+    @Override
+    @Transactional
+    public AjaxResult creatTrialRecordnew(ArbitrateRecord arbitrateRecordselect) {
+        //生成仲裁结果
+        CaseApplication caseApplicationupdate = new CaseApplication();
+        caseApplicationupdate.setId(arbitrateRecordselect.getCaseAppliId());
+        caseApplicationupdate.setIsAbsence(arbitrateRecordselect.getIsAbsence());
+        caseApplicationupdate.setAppliIsAbsen(arbitrateRecordselect.getAppliIsAbsen());
+        caseApplicationMapper.submitCaseApplication(caseApplicationupdate);
+
+        //先判断案件是否已经提交过仲裁结果
+        ArbitrateRecord arbitrateRecordsele = arbitrateRecordMapper.selectArbitrateRecord(arbitrateRecordselect);
+        if (arbitrateRecordsele != null) {
+            arbitrateRecordselect.setId(arbitrateRecordsele.getId());
+            int i = arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordselect);
+        } else {
+            //提交仲裁结果
+            int i = arbitrateRecordMapper.insertArbitrateRecord(arbitrateRecordselect);
+        }
+        return success();
+
+    }
+
     @Override
     public CaseApplication selectSignSealUrl(CaseApplication caseApplication) throws EsignDemoException {
         Gson gson = new Gson();