From 5e2771f2bef70f5f598b221509dd1ea9cc7e8191 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期二, 27 八月 2024 17:25:19 +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 | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 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..fa8ad64 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -81,15 +81,15 @@
fseDocument.setValue(CmnConst.FILE_TYPE, file_type);
//淇濆瓨鏁版嵁
String documentUUID = baseDao.add(fseDocument);
-
+
//鍒涘缓鏂囨。鐗堟湰鏁版嵁瀹瑰櫒
FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
- fseDocument.setValue("document_uuid", documentUUID);
- fseDocument.setValue("attachment_uuid", attachment.getUUID());
- fseDocument.setValue("version_number", "v1");
+ fseDocumentHistory.setValue("document_uuid", documentUUID);
+ fseDocumentHistory.setValue("attachment_uuid", attachment.getUUID());
+ fseDocumentHistory.setValue("version_number", "v1");
baseDao.add(fseDocumentHistory);
-
+
uuidList.add(documentUUID);
fileNameList.add(file_name);
}
@@ -383,12 +383,12 @@
sql.append(" and tricode_parent = ? ");
//鍔犺浇鏂囦欢璺緞
DataTableEntity dataTableEntity = documentDirectoryService.getDirectoryStructure(fse);
- object.put("PRODUCT_OA_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
+ object.put("product_oa_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));
}
//sql.append(" GROUP BY tricode,tricode_parent,directory_name");
DataTableEntity data = baseDao.listTable(sql.toString(), param.toArray());
- object.put("PRODUCT_OA_directory_sub", BaseUtil.dataTableEntityToJson(data));
+ object.put("product_oa_directory_sub", BaseUtil.dataTableEntityToJson(data));
baseDao.listInternationDataTable(data, null);
return object;
@@ -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,40 +541,47 @@
}
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
public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {
- 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+"'%";
- product_oa_document = baseDao.listTable("product_oa_document",filter);
+ DataTableEntity product_oa_document = new DataTableEntity();
+ StringBuilder sb=new StringBuilder();
+ sb.append(" select d.*,f.show_name ");
+ sb.append(" from product_oa_document d ");
+ sb.append(" left join product_sys_staffs f ");
+ sb.append(" on d.created_by=f.user_id ");
+ List<String> param=new ArrayList<>();
+ if(!ObjectUtil.isNotEmpty(fse.getString("document_name"))){
+ product_oa_document = baseDao.listTable(sb.toString(),param.toArray());
+
}else {
- product_oa_document = baseDao.listTable("product_oa_document");
+ String document_name = fse.getString("document_name");
+ sb.append(" where d.file_name like '%"+document_name+"%'");
+ product_oa_document = baseDao.listTable(sb.toString(),param.toArray());
+
+
}
-
-
- return product_oa_document;
+ return product_oa_document;
}
@Override
@@ -625,8 +632,9 @@
}
@Override
- public DataTableEntity getApplayFileSort() throws BaseException {
+ public DataTableEntity getApplyFileSort() throws BaseException {
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(" FROM product_oa_document_borrow_sub b");
@@ -636,16 +644,17 @@
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(" )b order by b.applyCount asc");
- DataTableEntity dataTableEntity = baseDao.listTable(sb.toString());
+ DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
return dataTableEntity;
}
@Override
- public DataTableEntity getApplayUserSort() throws BaseException {
+ 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(" FROM (");
- sb.append(" SELECT w.borrower,");
+ 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(sub_uuid) as applayFileCount ");
sb.append(" FROM product_oa_document_borrow w ");
@@ -658,12 +667,12 @@
sb.append(" GROUP BY w.borrower,s.show_name");
sb.append(" )a");
sb.append(" order by a.applayCount,a.applayFileCount asc");
- DataTableEntity dataTableEntity = baseDao.listTable(sb.toString());
+ DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
return dataTableEntity;
}
@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