Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into wq1

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;
+
 
 
 }

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

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml

@@ -23,6 +23,10 @@
     <result column="position_xorg" jdbcType="DOUBLE" property="positionXorg" />
     <result column="position_yorg" jdbcType="DOUBLE" property="positionYorg" />
     <result column="file_download_url" jdbcType="LONGVARCHAR" property="fileDownloadUrl" />
+    <result column="sign_status_apply" jdbcType="INTEGER" property="signStatusApply" />
+    <result column="sign_status_response" jdbcType="INTEGER" property="signStatusResponse" />
+    <result column="sign_status_mediator" jdbcType="INTEGER" property="signStatusMediator" />
+    <result column="seal_status" jdbcType="INTEGER" property="sealStatus" />
   </resultMap>