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/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){ // 达成和解 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 @@ + + + +