7 Revize

Autor SHA1 Zpráva Datum
  qitz a64aa29a4e Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into qtz1 před 2 roky
  qitz 4502b8128f 优化查询日志 před 2 roky
  wangqiong123 9f52637abd Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev před 2 roky
  18792927508 8a7cf059fd 在线修改 před 2 roky
  wangqiong123 21e86a4c47 Merge branch 'wq1' of SH-Arbitrate/Mediation-Backend into dev před 2 roky
  18792927508 a9bf9379ba 调节申请书修改 před 2 roky
  qtz 983edd6dd9 Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev před 2 roky

+ 8
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java Zobrazit soubor

@@ -3771,6 +3771,13 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
3771 3771
                 }
3772 3772
             }
3773 3773
 
3774
+        }else {
3775
+            caseAttach = MsCaseAttach.builder()
3776
+                    .caseAppliId(application.getId())
3777
+                    .annexName(orgFileName+".docx")
3778
+                    .annexPath(resultFilePath.replace(RuoYiConfig.getProfile(),Constants.RESOURCE_PREFIX))
3779
+                    .annexType(annexType)
3780
+                    .build();
3774 3781
         }
3775 3782
         //保存到附件表里,先删除之前的在保存
3776 3783
         if(caseAttach != null) {
@@ -3791,10 +3798,9 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
3791 3798
         if (file.exists()) {
3792 3799
            // 调用onlyoffice
3793 3800
             try {
3794
-                onlyOfficeUrl=  onlyOfficeUrl+ "?caseId="+caseId;
3795 3801
                 Map<String, Object> params = new HashMap<>();
3796 3802
                 params.put("file", file);
3797
-                String postResult = HttpUtil.post(onlyOfficeUrl, params);
3803
+                String postResult = HttpUtil.post(onlyOfficeUrl+ "/"+String.valueOf(caseId), params);
3798 3804
                 if(StrUtil.isNotEmpty(postResult)){
3799 3805
                     // 转为jsonArray
3800 3806
                     JSONArray jsonArray = JSONArray.parseArray(postResult);

+ 7
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Zobrazit soubor

@@ -569,7 +569,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
569 569
                     caseNodeTime= DateUtil.format(record.getCreateTime(), DatePattern.NORM_DATETIME_FORMATTER);
570 570
                 }
571 571
                 Integer caseNode = record.getCaseNode();
572
-                contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
572
+                String createBy = record.getCreateBy();
573
+                if(StrUtil.isNotEmpty(createBy)){
574
+                    contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime);
575
+                }else{
576
+                    contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("于").append(caseNodeTime);
577
+                }
578
+
573 579
                 if(StrUtil.isNotEmpty(record.getContent())){
574 580
                     contentBuilder.append(record.getContent());
575 581
                 }else if(caseNode.intValue() == 0){