From a518ef8df36abe8d80733797d4e1322af79a4c34 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 26 八月 2024 15:47:06 +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/controller/DocumentController.java | 4 ++--
src/main/java/com/product/file/service/DocumentService.java | 54 ++++++++++++++++++++++++++++++++----------------------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java
index e0d9787..3e38041 100644
--- a/src/main/java/com/product/file/controller/DocumentController.java
+++ b/src/main/java/com/product/file/controller/DocumentController.java
@@ -414,7 +414,7 @@
return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
}
}
-
+
/**
* 鏂囨。鍘嗗彶鐗堟湰
* @param request
@@ -435,7 +435,7 @@
return this.error(DocumentCode.DOCUMENT_OPERATE_FAIL.getValue(), DocumentCode.DOCUMENT_OPERATE_FAIL.getText() + e.getMessage());
}
}
-
+
/**
* 鏂囨。鏈�鏂扮増鏈繚瀛�
* @param request
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 9f76b4b..a65f30e 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -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,48 @@
}
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();
+ List<String> param=new ArrayList<>();
+ if(!ObjectUtil.isNotEmpty(fse.getString("document_name"))){
+
+ 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 ");
+ 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());
+
+
}
-
-
- return product_oa_document;
+ return product_oa_document;
}
@Override
@@ -627,6 +635,7 @@
@Override
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 +645,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 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,7 +668,7 @@
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;
}
--
Gitblit v1.9.2