Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改了查询委托书时，不传文件类型的时候直接返回docx，用作于文书系统

Browse Source
This commit is contained in:
杨海航
2025-04-02 11:30:22 +08:00
parent caa7757cad
commit 89073cd746
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -936,7 +936,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
Entrustment entrustment = this.getById(entrustId); Entrustment entrustment = this.getById(entrustId);
switch (whatBook) { switch (whatBook) {
case "entrust": case "entrust":
retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ("docx".equals(docType) ? ".docx" : ".pdf"); retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + (StringUtils.isNotBlank(docType) ? "." + docType : ".docx");
break; break;
case "identItemBook": case "identItemBook":
retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx"; retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
@@ -3450,8 +3450,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
.or() .or()
.like("c.case_name", keywords)) .like("c.case_name", keywords))
.eq("status", status) .eq("status", status)
.orderByDesc("CAST(SUBSTRING_INDEX(accept_no, '-', 1) AS UNSIGNED)", // 按年份降序 .last("ORDER BY CAST(SUBSTRING_INDEX(e.accept_no, '-', 1) AS UNSIGNED) DESC, " +
"CAST(SUBSTRING_INDEX(accept_no, '-', -1) AS UNSIGNED)") // 按流水号降序 "CAST(SUBSTRING_INDEX(e.accept_no, '-', -1) AS UNSIGNED) DESC") // 按年份降序，再按流水号降序
); );
List<EntrustmentVO> records = voPage.getRecords(); List<EntrustmentVO> records = voPage.getRecords();