SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

短信重发修改

Browse Source
This commit is contained in:
18792927508
2024-04-18 11:18:13 +08:00
parent a03a23f2c1
commit 7c3044811e
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java
+6 -5
View File
@@ -2419,6 +2419,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public AjaxResult mediation(MsCaseApplicationReq req) throws EsignDemoException, InterruptedException { public AjaxResult mediation(MsCaseApplicationReq req) throws EsignDemoException, InterruptedException {
req.setSealFlag(null);
// 查询案件是否存在 // 查询案件是否存在
MsCaseApplication application = msCaseApplicationMapper.selectByPrimaryKey(req.getId()); MsCaseApplication application = msCaseApplicationMapper.selectByPrimaryKey(req.getId());
if (application == null) { if (application == null) {
@@ -2709,7 +2710,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
if (caseFlow != null) { if (caseFlow != null) {
application.setCaseFlowId(caseFlow.getId()); application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setCaseStatusName(caseFlow.getCaseStatusName());
msCaseApplicationMapper.updateByPrimaryKey(application); msCaseApplicationMapper.updateByPrimaryKeySelective(application);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
} }
@@ -2748,7 +2749,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId()); application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setCaseStatusName(caseFlow.getCaseStatusName());
application.setMediaResult(mediaResult); application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application); msCaseApplicationMapper.updateByPrimaryKeySelective(application);
} }
return AjaxResult.success(); return AjaxResult.success();
} else if (mediaResult == 3) { } else if (mediaResult == 3) {
@@ -2760,7 +2761,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId()); application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setCaseStatusName(caseFlow.getCaseStatusName());
application.setMediaResult(mediaResult); application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application); msCaseApplicationMapper.updateByPrimaryKeySelective(application);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
// 新增结束日志 // 新增结束日志
@@ -2802,7 +2803,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId()); application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setCaseStatusName(caseFlow.getCaseStatusName());
application.setMediaResult(mediaResult); application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application); msCaseApplicationMapper.updateByPrimaryKeySelective(application);
} }
return AjaxResult.success(); return AjaxResult.success();
@@ -3051,7 +3052,7 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
application.setCaseFlowId(caseFlow.getId()); application.setCaseFlowId(caseFlow.getId());
application.setCaseStatusName(caseFlow.getCaseStatusName()); application.setCaseStatusName(caseFlow.getCaseStatusName());
application.setMediaResult(mediaResult); application.setMediaResult(mediaResult);
msCaseApplicationMapper.updateByPrimaryKey(application); msCaseApplicationMapper.updateByPrimaryKeySelective(application);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), ""); CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(), "");
if (mediaResult == 2 || mediaResult == 3 || mediaResult == 4) { if (mediaResult == 2 || mediaResult == 3 || mediaResult == 4) {
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+2 -4
View File
@@ -522,7 +522,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
return AjaxResult.error("未找到案件被申请操作人"); return AjaxResult.error("未找到案件被申请操作人");
} }
MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(caseId); MsCaseApplication caseApplication = msCaseApplicationMapper.selectByPrimaryKey(caseId);
Integer organizeFlag = caseApplication.getOrganizeFlag();
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
if(appOpt.get().getUserId()!=null && appOpt.get().getUserId().equals(userId)){ if(appOpt.get().getUserId()!=null && appOpt.get().getUserId().equals(userId)){
@@ -533,7 +533,6 @@ public class MsSignSealServiceImpl implements MsSignSealService {
List<MsSealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(mssealSignRecord); List<MsSealSignRecord> sealSignRecords = sealSignRecordMapper.selectSealSignRecord(mssealSignRecord);
if (sealSignRecords != null && sealSignRecords.size() > 0) { if (sealSignRecords != null && sealSignRecords.size() > 0) {
String signFlowid = sealSignRecords.get(0).getSignFlowId(); String signFlowid = sealSignRecords.get(0).getSignFlowId();
if(organizeFlag!=null){
SealSignRecord sealSignRecord = new SealSignRecord(); SealSignRecord sealSignRecord = new SealSignRecord();
sealSignRecord.setPensonAccount(appOpt.get().getPhone()); sealSignRecord.setPensonAccount(appOpt.get().getPhone());
sealSignRecord.setPensonName(appOpt.get().getName()); sealSignRecord.setPensonName(appOpt.get().getName());
@@ -549,7 +548,6 @@ public class MsSignSealServiceImpl implements MsSignSealService {
String urlapply = signUrlData.get("shortUrl").getAsString(); String urlapply = signUrlData.get("shortUrl").getAsString();
sealSignRecordres.setSealUrl(urlapply); sealSignRecordres.setSealUrl(urlapply);
} }
}
return AjaxResult.success(sealSignRecordres); return AjaxResult.success(sealSignRecordres);
}else { }else {
return AjaxResult.error(); return AjaxResult.error();
@@ -674,7 +672,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
signStatusMediator!=null&&signStatusMediator.equals(1)){ signStatusMediator!=null&&signStatusMediator.equals(1)){
// 根据流程id查找下一个流程节点 // 根据流程id查找下一个流程节点
MsCaseFlow nextFlow=null; MsCaseFlow nextFlow=null;
if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag()==1) { if(caseApplicationselect.getSealFlag()!=null&&caseApplicationselect.getSealFlag().equals(1)) {
// 需要用印 // 需要用印
nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId());
}else { }else {
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/shortmessage/impl/ShortMessageServiceImpl.java
+9 -2
View File
@@ -121,11 +121,18 @@ public class ShortMessageServiceImpl implements ShortMessageService {
List<String> recordParamList = recordParamContentMap.get(record.getId()); List<String> recordParamList = recordParamContentMap.get(record.getId());
if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){ if(recordParamContentMap.containsKey(record.getId()) && templateParamMap.containsKey(record.getMsSmsTemplateId())){
List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId()); List<MsSmsTemplateParam> templateParamList = templateParamMap.get(record.getMsSmsTemplateId());
ArrayList<MsSmsTemplateParam> copyParamList = new ArrayList<>();
for (int i = 0; i < templateParamList.size(); i++) { for (int i = 0; i < templateParamList.size(); i++) {
MsSmsTemplateParam templateParam = templateParamList.get(i); MsSmsTemplateParam templateParam = templateParamList.get(i);
templateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i)); MsSmsTemplateParam msSmsTemplateParam =new MsSmsTemplateParam();
msSmsTemplateParam.setParam(templateParam.getParam());
msSmsTemplateParam.setSmsTemplateId(templateParam.getSmsTemplateId());
msSmsTemplateParam.setParamName(templateParam.getParamName());
msSmsTemplateParam.setId(templateParam.getId());
msSmsTemplateParam.setParamValue(recordParamContentMap.get(record.getId()).get(i));
copyParamList.add(msSmsTemplateParam);
} }
record.setTemplateParams(templateParamList); record.setTemplateParams(copyParamList);
} }
// 按顺序替换占位符 // 按顺序替换占位符