From 3658f395a3638816793712e0cf9b371a6aace59e Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 08 十月 2024 11:01:52 +0800
Subject: [PATCH] 统计借阅文件数量
---
src/main/java/com/product/file/service/DocumentService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index d3baa3a..9b6469d 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -143,11 +143,12 @@
StringBuffer sql = new StringBuffer();
sql.append("SELECT \n");
- sql.append(" A.*,B.show_name name, \n");
+ sql.append(" E.route_name,A.*,B.show_name name, \n");
sql.append(" CONCAT(CONVERT(a.file_size / 1024, decimal(10,2)), 'KB') file_size_kb, \n");
sql.append(" CASE WHEN D.document_uuid IS NOT NULL THEN '1' ELSE '0' END AS is_collection, \n");
sql.append(" (SELECT case when COUNT(*)=0 then 1 else COUNT(*) end FROM product_oa_document_history where product_oa_document_history.document_uuid=A.uuid) -1 history_count ");
- sql.append("FROM( \n");
+ sql.append(" ,if(A.turn_button is null,'鍚�','鏄�') turn");
+ sql.append(" FROM( \n");
if ("!borrow".equals(directory_uuid)) {
//鍊熼槄鏂囦欢澶规煡璇㈡枃浠剁壒娈婂鐞�
sql.append("SELECT\n");
@@ -183,6 +184,8 @@
sql.append("LEFT JOIN product_sys_staffs B ON B.user_id = A.created_by \n");
sql.append("LEFT JOIN product_sys_attachments C ON C.uuid = B.staff_avatar \n");
sql.append("LEFT JOIN product_oa_document_collection D ON D.document_uuid = A.uuid AND D.created_by = ?");
+ sql.append("LEFT JOIN product_sys_function_buttons E ON E.uuid = A.turn_button ");
+
DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid, SpringMVCContextHolder.getCurrentUserId()},
fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
baseDao.listInternationDataTable(documentData, null);
@@ -401,7 +404,7 @@
*/
private FieldSetEntity recursionRole(String directory_uuid){
FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
- if (FieldSetEntity.isEmpty(org)){
+ if (FieldSetEntity.isEmpty(org)&&!StringUtils.isEmpty(directory_uuid)){
FieldSetEntity directoryFs = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
FieldSetEntity parentFs = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{directoryFs.getString("tricode_parent")},false);
org=recursionRole(parentFs.getUUID());
@@ -732,7 +735,7 @@
sb.append(" JOIN product_sys_staffs s ");
sb.append(" on t.created_by=s.user_id");
sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.attachment_size");
- sb.append(" )b order by b.applyCount asc");
+ sb.append(" )b order by b.applyCount DESC");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
return dataTableEntity;
}
@@ -763,7 +766,7 @@
sb.append(" GROUP BY w.borrower,s.show_name");
sb.append(" )a )b");
sb.append(" on a.borrower=b.borrower ");
- sb.append(" order by a.applayCount,b.applayFileCount asc");
+ sb.append(" order by a.applayCount,b.applayFileCount DESC");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
return dataTableEntity;
}
--
Gitblit v1.9.2