|
|
@ -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"; |
|
|
@ -2513,7 +2513,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru |
|
|
|
/** |
|
|
|
/** |
|
|
|
* 处理推送数据并更新委托书和确认书 |
|
|
|
* 处理推送数据并更新委托书和确认书 |
|
|
|
* |
|
|
|
* |
|
|
|
* @param entrustId 委托id |
|
|
|
* @param entrustId 委托id |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private void processPushDataAndUpdateDoc(String entrustId) { |
|
|
|
private void processPushDataAndUpdateDoc(String entrustId) { |
|
|
|
// 保存当前请求上下文到 RequestContextHolder
|
|
|
|
// 保存当前请求上下文到 RequestContextHolder
|
|
|
@ -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(); |
|
|
|