Merge branch 'qtz' of SH-Arbitrate/Mediation-Backend into dev

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

@@ -1352,8 +1352,23 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                                                     sealSignRecord.setPensonNameMedi(sysUser.getNickName());
                                                 }
 
-                                                sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent());
-                                                sealSignRecord.setPensonName(caseAffiliate.getNameAgent());
+                                                Integer organizeFlag = caseAffiliate.getOrganizeFlag();
+                                                if(organizeFlag!=null){
+                                                    if(organizeFlag.intValue()==1){
+                                                        sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent());
+                                                        sealSignRecord.setPensonName(caseAffiliate.getNameAgent());
+                                                    }else {
+                                                        String nameAgent = caseAffiliate.getNameAgent();
+                                                        if(StringUtils.isNotBlank(nameAgent)){
+                                                            sealSignRecord.setPensonAccount(caseAffiliate.getContactTelphoneAgent());
+                                                            sealSignRecord.setPensonName(caseAffiliate.getNameAgent());
+                                                        }else {
+                                                            sealSignRecord.setPensonAccount(caseAffiliate.getApplicationPhone());
+                                                            sealSignRecord.setPensonName(caseAffiliate.getApplicationName());
+                                                        }
+                                                    }
+                                                }
+
                                                 sealSignRecord.setPensonAccountRes(caseAffiliate.getRespondentPhone());
                                                 sealSignRecord.setPensonNameRes(caseAffiliate.getRespondentName());
 
@@ -1659,7 +1674,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                     request1.setTemplateParamSet(new String[]{caseAffiliate.getRespondentName(), application.getCaseNum()});
                     Boolean aBoolean1 = SmsUtils.sendSms(request1);
 
-                    // 修改案件状态为待签名
+                    // 修改案件状态为结束
                     Example flowExample = new Example(MsCaseFlow.class);
                     flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
                     MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample);
@@ -1674,8 +1689,19 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
                     return AjaxResult.success();
                 }else if(mediaResult.intValue()==3){
                     //未达成调解但不再争议
+                    // 修改案件状态为结束
+                    Example flowExample = new Example(MsCaseFlow.class);
+                    flowExample.createCriteria().andEqualTo("caseStatusName", "结束");
+                    MsCaseFlow caseFlow = caseFlowMapper.selectOneByExample(flowExample);
+                    if(caseFlow != null){
+                        application.setCaseFlowId(caseFlow.getId());
+                        application.setCaseStatusName(caseFlow.getCaseStatusName());
+                        msCaseApplicationMapper.updateByPrimaryKey(application);
+                    }
 
-
+                    application.setMediaResult(mediaResult);
+                    msCaseApplicationMapper.updateByPrimaryKeySelective(application);
+                    return AjaxResult.success();
                 }else if(mediaResult.intValue()==4){
                     //未达成调解但同意引入仲裁