diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index daf8014..eb94d57 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -1033,6 +1033,11 @@ public class MsSignSealServiceImpl implements MsSignSealService { String orgnNamePsnAcc = sealSignRecordsel.getOrgnNamePsnAcc(); String pensonAccountRes = sealSignRecordsel.getPensonAccountRes(); String pensonAccountMedi = sealSignRecordsel.getPensonAccountMedi(); + String pensonName = sealSignRecordsel.getPensonName(); + String orgnNamePsnName = sealSignRecordsel.getOrgnNamePsnName(); + String pensonNameRes = sealSignRecordsel.getPensonNameRes(); + String pensonNameMedi = sealSignRecordsel.getPensonNameMedi(); + Date dateOperate = new Date(operateTime); Integer signStatusApply = sealSignRecordsel.getSignStatusApply(); Integer signStatusResponse = sealSignRecordsel.getSignStatusResponse(); @@ -1042,6 +1047,10 @@ public class MsSignSealServiceImpl implements MsSignSealService { Long caseAppliId = sealSignRecordsel.getCaseAppliId(); MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseAppliId); Integer mediaResult = caseApplicationselect.getMediaResult(); + MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId()); + Integer caseNode = currentFlow.getNodeId(); + String caseStatusName = currentFlow.getCaseStatusName(); + if("SIGN_MISSON_COMPLETE".equals(action) && signResult==2){ if(mediaResult.intValue()==1){ @@ -1050,6 +1059,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { //申请人签名 sealSignRecordsel.setSignStatusApply(1); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(pensonName); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); if(signStatusResponse!=null&&signStatusResponse.intValue()==1&& signStatusMediator!=null&&signStatusMediator.intValue()==1){ // 根据流程id查找下一个流程节点 @@ -1068,6 +1084,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { //被申请人签名 sealSignRecordsel.setSignStatusResponse(1); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(pensonNameRes); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); if(signStatusApply!=null&&signStatusApply.intValue()==1&& signStatusMediator!=null&&signStatusMediator.intValue()==1){ // 根据流程id查找下一个流程节点 @@ -1086,6 +1109,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { //调解员签名 sealSignRecordsel.setSignStatusMediator(1); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(pensonNameMedi); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); if(signStatusApply!=null&&signStatusApply.intValue()==1&& signStatusResponse!=null&&signStatusResponse.intValue()==1){ // 根据流程id查找下一个流程节点 @@ -1104,6 +1134,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { sealSignRecordsel.setSealStatus(1); sealSignRecordsel.setSignFlowStatus(3); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(orgnNamePsnName); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); // 根据流程id查找下一个流程节点 MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId().intValue()); @@ -1163,6 +1200,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { //申请人签名 sealSignRecordsel.setSignStatusApply(1); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(pensonName); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); if(signStatusResponse!=null&&signStatusResponse.intValue()==1){ MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue()); MsCaseApplication application = new MsCaseApplication(); @@ -1222,6 +1266,13 @@ public class MsSignSealServiceImpl implements MsSignSealService { //被申请人签名 sealSignRecordsel.setSignStatusResponse(1); sealSignRecordMapper.updateByPrimaryKeySelective(sealSignRecordsel); + MsCaseLogRecord operLog = new MsCaseLogRecord(); + operLog.setCreateNickName(pensonNameRes); + operLog.setCaseStatusName(caseStatusName); + operLog.setCaseAppliId(caseAppliId); + operLog.setCaseNode(caseNode); + operLog.setCreateTime(dateOperate); + caseLogRecordMapper.insert(operLog); if(signStatusApply!=null&&signStatusApply.intValue()==1){ MsCaseFlow nextFlow = caseFlowMapper.nextFlow1(caseApplicationselect.getCaseFlowId().intValue()); MsCaseApplication application = new MsCaseApplication(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java index f213fb7..76bbf20 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java @@ -355,7 +355,7 @@ public class SignAward { " \"signConfig\": {\n" + " \"availableSignClientTypes\": \"1\"\n" + " },\n" + - " \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" + +// " \"notifyUrl\": \"" + signSealCallbackUrl + "\",\n" + " \"autoFinish\": true\n" + " },\n" +