From 8dbe3af8b9fafb718dde249543cc14db1e0046a2 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 28 八月 2024 16:19:20 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/file/service/DocumentService.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index afdd8b2..6335b39 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -551,6 +551,14 @@
fseDocument.setValue("latest_version", fseDocument.getInteger("max_version_number") + 1);
baseDao.saveFieldSetEntity(fseDocument);
+
+ // 鍒涘缓鏂囨。鎿嶄綔鏃ュ織淇℃伅
+ FieldSetEntity fseDocumentLog = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_LOG);
+ BaseUtil.createCreatorAndCreationTime(fseDocumentLog);
+ fseDocumentLog.setValue("document_uuid", documentUuid);
+ fseDocumentLog.setValue("opetype", "鏂板");
+ fseDocumentLog.setValue("ope_document", fieldSetEntity.getString("file_name"));
+ fseDocumentLog.setValue("state", "鏂板浜哰"+ fieldSetEntity.getString("file_name") +"]鏈�鏂扮増鏈�");
//鍒涘缓鏂囨。鐗堟湰鏁版嵁瀹瑰櫒
FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
@@ -668,7 +676,14 @@
public DataTableEntity getApplyUserSort() throws BaseException {
StringBuilder sb=new StringBuilder();
List<String> param=new ArrayList<>();
- sb.append(" SELECT a.borrower,a.show_name,a.applayCount,a.applayFileCount ");
+ sb.append(" SELECT b.*,a.applayCount ");
+ sb.append(" FROM (");
+ sb.append(" SELECT borrower,count(borrower) as applayCount");
+ sb.append(" FROM product_oa_document_borrow ");
+ sb.append(" group by borrower");
+ sb.append(" ) a LEFT JOIN ");
+ sb.append(" (");
+ sb.append(" SELECT a.borrower,a.show_name,a.applayFileCount ");
sb.append(" FROM (");
sb.append(" SELECT w.borrower,s.show_name,");
sb.append(" count( borrower ) AS applayCount,");
@@ -681,8 +696,9 @@
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");
- sb.append(" order by a.applayCount,a.applayFileCount asc");
+ sb.append(" )a )b");
+ sb.append(" on a.borrower=b.borrower ");
+ sb.append(" order by a.applayCount,b.applayFileCount asc");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
return dataTableEntity;
}
--
Gitblit v1.9.2