From 2850d1729d5bc2338f8a38265f95bb0ed8ae33db Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 26 八月 2024 10:48:59 +0800
Subject: [PATCH] 文档功能优化8.26
---
src/main/java/com/product/file/service/DocumentService.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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..d5ac785 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
@@ -501,7 +501,7 @@
public boolean documentCancelCollection(String documentUUID) {
return baseDao.delete(CmnConst.PRODUCT_OA_DOCUMENT_COLLECTION, "document_uuid = ? AND document_collector = ?", new Object[] {documentUUID, SpringMVCContextHolder.getCurrentUserId()});
}
-
+
/**
* 鏌ヨ鏂囨。鍘嗗彶鐗堟湰
* @param documentUUID
@@ -516,7 +516,7 @@
sql.append("ORDER BY A.version_number");
return baseDao.listTable(sql.toString(), new Object[] {documentUUID});
}
-
+
/**
* 鏂囨。鏈�鏂扮増鏈繚瀛�
* @param fse
@@ -541,24 +541,24 @@
}
fseDocument.setValue("attachments_uuid", fse.getString("attachment_uuid"));
baseDao.saveFieldSetEntity(fseDocument);
-
+
fse.setValue("version_number", versionNUmberAddne(fseDocument.getString("max_version_number")));
return baseDao.saveFieldSetEntity(fse);
}
-
+
/**
* 鏂囨。鐗堟湰+1
* @param originNumber
* @return
*/
public String versionNUmberAddne(String originNumber) {
- String numberStr = originNumber.substring(1); // 鍘绘帀鍓嶇紑"v"
+ String numberStr = originNumber.substring(1); // 鍘绘帀鍓嶇紑"v"
int number = Integer.parseInt(numberStr); // 灏嗗瓧绗︿覆杞�
- // 鏁板瓧鍔犱竴
- number += 1;
-
- // 閲嶆柊鏋勫缓瀛楃涓诧紙杩欓噷鎴戜滑鍋囪鍓嶇紑鎬绘槸"v"锛�
- return "v" + number;
+ // 鏁板瓧鍔犱竴
+ number += 1;
+
+ // 閲嶆柊鏋勫缓瀛楃涓诧紙杩欓噷鎴戜滑鍋囪鍓嶇紑鎬绘槸"v"锛�
+ return "v" + number;
}
@Override
@@ -567,7 +567,7 @@
DataTableEntity product_oa_document;
if(ObjectUtil.isNotEmpty(fse.getString("document_name"))){
String document_name = fse.getString("document_name");
- String filter="file_name like '%"+document_name+"'%";
+ String filter="file_name like '%"+document_name+"%'";
product_oa_document = baseDao.listTable("product_oa_document",filter);
}else {
product_oa_document = baseDao.listTable("product_oa_document");
@@ -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