From 8e235b61359ccfbc698346937dc0768f6641d5f2 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Fri, 8 Mar 2024 11:05:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E8=A7=A3?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/MsCaseApplicationServiceImpl.java | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
index 974c55b..5cc602d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
@@ -2485,11 +2485,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
+ application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application);
}
-
- application.setMediaResult(mediaResult);
- msCaseApplicationMapper.updateByPrimaryKeySelective(application);
return AjaxResult.success();
}else if(mediaResult.intValue()==3){
//未达成调解但不再争议
@@ -2500,14 +2498,12 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if(caseFlow != null){
application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName());
+ application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application);
// 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
}
-
- application.setMediaResult(mediaResult);
- msCaseApplicationMapper.updateByPrimaryKeySelective(application);
return AjaxResult.success();
}else if(mediaResult.intValue()==4){
//未达成调解但同意引入仲裁
@@ -2532,6 +2528,19 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
.header("signstr", signStr)
.body(paramsbody)
.execute();
+ // 修改案件状态为结束
+ Example flowExample = new Example(MsCaseFlow.class);
+ flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
+ MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample);
+ if(caseFlow != null){
+ // 新增日志
+ CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"");
+ application.setCaseFlowId(caseFlow.getId());
+ application.setCaseStatusName(caseFlow.getCaseStatusName());
+ application.setMediaResult(mediaResult);
+ msCaseApplicationMapper.updateByPrimaryKey(application);
+ }
+
return AjaxResult.success();
}else if(mediaResult.intValue()==5){
// 达成和解
From df108c15ebf257a089d1068f4ef855796ca97c80 Mon Sep 17 00:00:00 2001
From: qitz <18810291185@163.com>
Date: Mon, 11 Mar 2024 10:03:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=BE=E5=90=8D?=
=?UTF-8?q?=E7=94=A8=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/entity/dept/MsSealSignRecord.java | 21 +++++++++++++++++++
.../dept/MsSealSignRecordMapper.xml | 4 ++++
2 files changed, 25 insertions(+)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java
index 2bfa6f9..ddb7722 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java
@@ -144,6 +144,27 @@ public class MsSealSignRecord {
@Column(name = "position_ypsn_medi")
private double positionYpsnMedi;
+ /**
+ * 申请人签名状态
+ */
+ @Column(name = "sign_status_apply")
+ private Integer signStatusApply;
+ /**
+ * 被申请人签名状态
+ */
+ @Column(name = "sign_status_response")
+ private Integer signStatusResponse;
+ /**
+ * 调解员签名状态
+ */
+ @Column(name = "sign_status_mediator")
+ private Integer signStatusMediator;
+ /**
+ * 用印状态
+ */
+ @Column(name = "seal_status")
+ private Integer sealStatus;
+
}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml
index 25f189d..b204a97 100644
--- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml
@@ -23,6 +23,10 @@
+
+
+
+