From df93d06ae2163b2e9217da5edce1e925265de0fe Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Tue, 5 Dec 2023 17:45:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BB=B2=E8=A3=81=E5=91=98?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=A3=81=E5=86=B3=E4=B9=A6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CaseApplicationController.java | 1 +
.../domain/ArbitrateRecord.java | 2 ++
.../impl/CaseApplicationServiceImpl.java | 19 +++++++++++++++++--
.../wisdomarbitrate/ArbitrateRecordMapper.xml | 1 +
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
index e3923c5..68712bb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java
@@ -288,6 +288,7 @@ public class CaseApplicationController extends BaseController {
// @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);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
index e1286e6..950c487 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/ArbitrateRecord.java
@@ -25,6 +25,8 @@ public class ArbitrateRecord extends BaseEntity {
private String verificaOpinion;
/** 审核裁决书意见 */
private String checkOpinion;
+ /** 仲裁员审核裁决书意见 */
+ private String arbitraCheckOpinion;
/** 裁决书附件id */
private Integer annexId;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
index 05ad237..88d78e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
@@ -2144,10 +2144,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
* @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
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml
index b25c6a9..f1bab8c 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/ArbitrateRecordMapper.xml
@@ -67,6 +67,7 @@
ruling_follows = #{rulingFollows},
verifica_opinion = #{verificaOpinion},
check_opinion = #{checkOpinion},
+ arbitra_check_opinion = #{arbitraCheckOpinion},
annex_id = #{annexId},
update_by = #{updateBy},
case_focus = #{caseFocus},
--
2.54.0