From eca3b2b155c13a16cfeda2b10ce4f55eb1876975 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 23 八月 2024 17:29:55 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0
---
src/main/java/com/product/file/service/DocumentService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index f6609a9..8bcf50a 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -81,7 +81,7 @@
fseDocument.setValue(CmnConst.FILE_TYPE, file_type);
//淇濆瓨鏁版嵁
String documentUUID = baseDao.add(fseDocument);
-
+
//鍒涘缓鏂囨。鐗堟湰鏁版嵁瀹瑰櫒
FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
@@ -89,7 +89,7 @@
fseDocument.setValue("attachment_uuid", attachment.getUUID());
fseDocument.setValue("version_number", "v1");
baseDao.add(fseDocumentHistory);
-
+
uuidList.add(documentUUID);
fileNameList.add(file_name);
}
@@ -481,7 +481,7 @@
return baseDao.listTable("SELECT CONCAT(b.show_name, a.state) log,a.created_utc_datetime FROM PRODUCT_OA_document_log a LEFT JOIN product_sys_staffs b on a.created_by = b.user_id WHERE document_uuid = ? ORDER BY a.created_utc_datetime DESC",
new String[]{fieldSetEntity.getString(CmnConst.DOCUMENT_UUID)}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
}
-
+
/**
* 鏂囨。鏀惰棌
* @param fse
@@ -492,7 +492,7 @@
fse.setValue("document_collector", SpringMVCContextHolder.getCurrentUserId());
return baseDao.add(fse);
}
-
+
/**
* 鏂囨。鍙栨秷鏀惰棌
* @param documentUUID
@@ -625,7 +625,7 @@
}
@Override
- public DataTableEntity getApplayFileSort() throws BaseException {
+ public DataTableEntity getApplyFileSort() throws BaseException {
StringBuilder sb=new StringBuilder();
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");
@@ -641,7 +641,7 @@
}
@Override
- public DataTableEntity getApplayUserSort() throws BaseException {
+ public DataTableEntity getApplyUserSort() throws BaseException {
StringBuilder sb=new StringBuilder();
sb.append(" SELECT a.borrower,a.show_name,a.applayCount,a.applayFileCount ");
sb.append(" FROM (");
@@ -663,7 +663,7 @@
}
@Override
- public FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException {
+ public FieldSetEntity getApplyInfo(FieldSetEntity fes) throws BaseException {
String uuid = fes.getString("uuid");
FieldSetEntity product_oa_document_borrow = baseDao.getFieldSetEntity("product_oa_document_borrow", uuid, false);
return product_oa_document_borrow;
--
Gitblit v1.9.2