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 | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 8effcfd..8bcf50a 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -6,7 +6,6 @@
import com.product.common.collect.ListUtils;
import com.product.common.collect.MapUtils;
import com.product.common.lang.DateUtils;
-import com.product.core.config.Global;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldMetaEntity;
@@ -17,6 +16,7 @@
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.core.transfer.Transactional;
import com.product.file.config.CmnConst;
+import com.product.file.config.DocumentCode;
import com.product.file.service.ide.IDocumentService;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
@@ -81,14 +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");
baseDao.add(fseDocumentHistory);
-
+
uuidList.add(documentUUID);
fileNameList.add(file_name);
}
@@ -480,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
@@ -491,7 +492,7 @@
fse.setValue("document_collector", SpringMVCContextHolder.getCurrentUserId());
return baseDao.add(fse);
}
-
+
/**
* 鏂囨。鍙栨秷鏀惰棌
* @param documentUUID
@@ -499,6 +500,65 @@
*/
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
+ * @return
+ */
+ public DataTableEntity findDocumentHistory(String documentUUID) {
+ StringBuilder sql = new StringBuilder();
+ sql.append("SELECT A.*,B.file_name");
+ sql.append("FROM product_oa_document_history A \n");
+ sql.append("LEFT JOIN product_oa_document_history B ON B.uuid = A.document_uuid \n");
+ sql.append("WHERE A.document_uuid = ?");
+ sql.append("ORDER BY A.version_number");
+ return baseDao.listTable(sql.toString(), new Object[] {documentUUID});
+ }
+
+ /**
+ * 鏂囨。鏈�鏂扮増鏈繚瀛�
+ * @param fse
+ * @return
+ */
+ @Transactional
+ public boolean documentSaveNewVersion(FieldSetEntity fse) {
+ // 鑾峰彇鏂囨。鏁版嵁鍜屾渶澶х紪鍙�
+ StringBuilder sql = new StringBuilder();
+ sql.append("SELECT A.*, IFNULL(B.max_version_number, 'v0')AS max_version_number \n");
+ sql.append("FROM product_oa_document A \n");
+ sql.append("LEFT JOIN ( \n");
+ sql.append(" SELECT document_uuid, MAX(version_number) AS max_version_number \n");
+ sql.append(" FROM product_oa_document_history B \n");
+ sql.append(" WHERE document_uuid = ? \n");
+ sql.append(" GROUP BY document_uuid \n");
+ sql.append(") B ON B.document_uuid = A.uuid \n");
+ sql.append("WHERE uuid = ? \n");
+ FieldSetEntity fseDocument = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[] {fse.getString("document_uuid"),fse.getString("document_uuid")}, false);
+ if(fseDocument == null) {
+ throw new BaseException(DocumentCode.DOCUMENT_DATA_NO_EXIST.getValue(), DocumentCode.DOCUMENT_DATA_NO_EXIST.getText());
+ }
+ 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"
+ int number = Integer.parseInt(numberStr); // 灏嗗瓧绗︿覆杞�
+ // 鏁板瓧鍔犱竴
+ number += 1;
+
+ // 閲嶆柊鏋勫缓瀛楃涓诧紙杩欓噷鎴戜滑鍋囪鍓嶇紑鎬绘槸"v"锛�
+ return "v" + number;
}
@Override
@@ -565,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");
@@ -581,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 (");
@@ -603,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