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

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

@@ -499,8 +499,8 @@ public class MsSignSealServiceImpl implements MsSignSealService {
             records.forEach(record->{
                 StringBuilder contentBuilder = new StringBuilder();
                 String caseNodeTime="";
-                if(record.getCaseNodeTime()!=null){
-                    caseNodeTime= DateUtil.format(record.getCaseNodeTime(), DatePattern.NORM_DATETIME_FORMATTER);
+                if(record.getCreateTime()!=null){
+                    caseNodeTime= DateUtil.format(record.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER);
                 }
 
                 contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
@@ -810,7 +810,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 break;
             case "确认调解书":
                 caseLogRecord.setCaseNodeName("确认调解书");
-                caseLogRecord.setContent("申请人、被申请人将进行确认调解书");
+                caseLogRecord.setContent("法律顾问将进行确认调解书");
                 break;
             case "签名":
                 caseLogRecord.setCaseNodeName("签名");
@@ -832,6 +832,18 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 caseLogRecord.setCaseNodeName("签收");
                 caseLogRecord.setContent("申请人、被申请人将进行签收");
                 break;
+            case "申请人签收":
+                caseLogRecord.setCaseNodeName("申请人签收");
+                caseLogRecord.setContent("申请人将进行签收");
+                break;
+            case "被申请人签收":
+                caseLogRecord.setCaseNodeName("被申请人签收");
+                caseLogRecord.setContent("被申请人将进行签收");
+                break;
+            case "结束":
+                caseLogRecord.setCaseNodeName("结束");
+                caseLogRecord.setContent("结束");
+                break;
             default:
                 caseLogRecord.setNextRoleName("没有下一节点角色");
 
@@ -931,7 +943,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 break;
             case "确认调解书":
                 caseLogRecord.setCaseNodeName("确认调解书");
-                caseLogRecord.setContent("申请人、被申请人正在进行确认调解书");
+                caseLogRecord.setContent("法律顾问正在进行确认调解书");
                 break;
             case "签名":
                 caseLogRecord.setCaseNodeName("签名");