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

master
杨海航 1 month ago
parent caa7757cad
commit 89073cd746
  1. 8
      src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java

@ -936,7 +936,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
Entrustment entrustment = this.getById(entrustId);
switch (whatBook) {
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;
case "identItemBook":
retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
@ -2513,7 +2513,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
/**
* 处理推送数据并更新委托书和确认书
*
* @param entrustId 委托id
* @param entrustId 委托id
*/
private void processPushDataAndUpdateDoc(String entrustId) {
// 保存当前请求上下文到 RequestContextHolder
@ -3450,8 +3450,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
.or()
.like("c.case_name", keywords))
.eq("status", status)
.orderByDesc("CAST(SUBSTRING_INDEX(accept_no, '-', 1) AS UNSIGNED)", // 按年份降序
"CAST(SUBSTRING_INDEX(accept_no, '-', -1) AS UNSIGNED)") // 按流水号降序
.last("ORDER BY CAST(SUBSTRING_INDEX(e.accept_no, '-', 1) AS UNSIGNED) DESC, " +
"CAST(SUBSTRING_INDEX(e.accept_no, '-', -1) AS UNSIGNED) DESC") // 按年份降序,再按流水号降序
);
List<EntrustmentVO> records = voPage.getRecords();

Loading…
Cancel
Save