From a60c46a13f3b07223eea1f4325aeb458c54be6e5 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期三, 28 八月 2024 09:08:07 +0800
Subject: [PATCH] 文档功能8.28
---
src/main/java/com/product/file/service/DocumentService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index fa8ad64..a630423 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -636,13 +636,13 @@
StringBuilder sb=new StringBuilder();
List<String> param=new ArrayList<>();
sb.append(" SELECT b.* FROM (");
- sb.append(" SELECT t.uuid,t.file_name,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
+ sb.append(" SELECT t.uuid,t.file_name,t.file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
sb.append(" FROM product_oa_document_borrow_sub b");
sb.append(" JOIN product_oa_document t");
sb.append(" on b.sub_uuid=t.uuid");
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");
+ sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.file_size");
sb.append(" )b order by b.applyCount asc");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
return dataTableEntity;
@@ -655,14 +655,14 @@
sb.append(" SELECT a.borrower,a.show_name,a.applayCount,a.applayFileCount ");
sb.append(" FROM (");
sb.append(" SELECT w.borrower,s.show_name,");
- sb.append(" (select count(borrower) from product_oa_document_borrow group by borrower ) as applayCount,");
+ sb.append(" count( borrower ) AS applayCount,");
sb.append(" count(sub_uuid) as applayFileCount ");
sb.append(" FROM product_oa_document_borrow w ");
- sb.append(" JOIN product_oa_document_borrow_sub b");
+ sb.append(" left JOIN product_oa_document_borrow_sub b");
sb.append(" on b.borrow_uuid=w.uuid");
- sb.append(" JOIN product_oa_document t");
+ sb.append(" left JOIN product_oa_document t");
sb.append(" on b.sub_uuid=t.uuid");
- sb.append(" JOIN product_sys_staffs s");
+ sb.append(" left JOIN product_sys_staffs s");
sb.append(" on w.borrower=s.user_id");
sb.append(" GROUP BY w.borrower,s.show_name");
sb.append(" )a");
--
Gitblit v1.9.2