Просмотр исходного кода

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

qtz 2 лет назад
Родитель
Сommit
244c3f0618

+ 16
- 4
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Просмотреть файл

499
             records.forEach(record->{
499
             records.forEach(record->{
500
                 StringBuilder contentBuilder = new StringBuilder();
500
                 StringBuilder contentBuilder = new StringBuilder();
501
                 String caseNodeTime="";
501
                 String caseNodeTime="";
502
-                if(record.getCaseNodeTime()!=null){
503
-                    caseNodeTime= DateUtil.format(record.getCaseNodeTime(), DatePattern.NORM_DATETIME_FORMATTER);
502
+                if(record.getCreateTime()!=null){
503
+                    caseNodeTime= DateUtil.format(record.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER);
504
                 }
504
                 }
505
 
505
 
506
                 contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
506
                 contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
810
                 break;
810
                 break;
811
             case "确认调解书":
811
             case "确认调解书":
812
                 caseLogRecord.setCaseNodeName("确认调解书");
812
                 caseLogRecord.setCaseNodeName("确认调解书");
813
-                caseLogRecord.setContent("申请人、被申请人将进行确认调解书");
813
+                caseLogRecord.setContent("法律顾问将进行确认调解书");
814
                 break;
814
                 break;
815
             case "签名":
815
             case "签名":
816
                 caseLogRecord.setCaseNodeName("签名");
816
                 caseLogRecord.setCaseNodeName("签名");
832
                 caseLogRecord.setCaseNodeName("签收");
832
                 caseLogRecord.setCaseNodeName("签收");
833
                 caseLogRecord.setContent("申请人、被申请人将进行签收");
833
                 caseLogRecord.setContent("申请人、被申请人将进行签收");
834
                 break;
834
                 break;
835
+            case "申请人签收":
836
+                caseLogRecord.setCaseNodeName("申请人签收");
837
+                caseLogRecord.setContent("申请人将进行签收");
838
+                break;
839
+            case "被申请人签收":
840
+                caseLogRecord.setCaseNodeName("被申请人签收");
841
+                caseLogRecord.setContent("被申请人将进行签收");
842
+                break;
843
+            case "结束":
844
+                caseLogRecord.setCaseNodeName("结束");
845
+                caseLogRecord.setContent("结束");
846
+                break;
835
             default:
847
             default:
836
                 caseLogRecord.setNextRoleName("没有下一节点角色");
848
                 caseLogRecord.setNextRoleName("没有下一节点角色");
837
 
849
 
931
                 break;
943
                 break;
932
             case "确认调解书":
944
             case "确认调解书":
933
                 caseLogRecord.setCaseNodeName("确认调解书");
945
                 caseLogRecord.setCaseNodeName("确认调解书");
934
-                caseLogRecord.setContent("申请人、被申请人正在进行确认调解书");
946
+                caseLogRecord.setContent("法律顾问正在进行确认调解书");
935
                 break;
947
                 break;
936
             case "签名":
948
             case "签名":
937
                 caseLogRecord.setCaseNodeName("签名");
949
                 caseLogRecord.setCaseNodeName("签名");