20241223 更新

1.修改生成的鉴定事项确认书以委托编号命名

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java

@@ -458,11 +458,12 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         }
         CaseEvent caseEvent = caseEventService.getOne(Wrappers.<CaseEvent>query()
                 .eq("id", entrustment.getCaseId()));
-        String templatePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getAcceptNo();
+        String entrustmentNo = entrustment.getEntrustmentNo();
+        String templatePath = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustmentNo;
         String templateName = AppStartupRunner.getCfg(CommonConstants.DLP_CODE_ENTRUSTMENT_IDENTIFY_ITEMS_CONFIRM_LETTER_TEMPLATE);
-        String originalFilename = "鉴定事项确认书-" + entrustment.getAcceptNo();
+        String originalFilename = "鉴定事项确认书-" + entrustmentNo;
         String fileType = ".docx";
-        String QRContent = entrustment.getAcceptNo();
+        String QRContent = entrustmentNo;
         List<String> listNameCollection = new ArrayList<>();
         listNameCollection.add("materialList");
         listNameCollection.add("drugList");
@@ -951,7 +952,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ".pdf";
                 break;
             case "identItemBook":
-                retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getAcceptNo() + ".docx";
+                retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
                 break;
             case "identfyBook":
                 retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定文书-" + entrustment.getAcceptNo() + ".docx";