From de75467367c6119b6060bc7eb7a9ae5c5c8d4b1d Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期三, 28 八月 2024 10:25:53 +0800 Subject: [PATCH] 历史文档查询 --- src/main/java/com/product/file/service/DocumentService.java | 118 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java index a630423..afdd8b2 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -502,60 +502,76 @@ 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 documentUUID + * @return + */ + public DataTableEntity findDocumentHistory(String documentUUID) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT A.*,B.file_name\n"); + sql.append("FROM product_oa_document_history A \n"); + sql.append("LEFT JOIN product_oa_document B ON B.uuid = A.document_uuid \n"); + sql.append("WHERE A.document_uuid = ?\n"); + 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); + /** + * 鏂囨。鏈�鏂扮増鏈繚瀛� + * + * @param fse + * @return + */ + @Transactional + public boolean documentSaveNewVersion(FieldSetEntity fse) { + // 鑾峰彇鏂囨。鏁版嵁鍜屾渶澶х紪鍙� + StringBuilder sql = new StringBuilder(); + sql.append("SELECT A.*, IFNULL(B.max_version_number, '0')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"); + String documentUuid = fse.getString("document_uuid"); + FieldSetEntity fseDocument = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[]{documentUuid, documentUuid}, false); + if (fseDocument == null) { + throw new BaseException(DocumentCode.DOCUMENT_DATA_NO_EXIST.getValue(), DocumentCode.DOCUMENT_DATA_NO_EXIST.getText()); + } - fse.setValue("version_number", versionNUmberAddne(fseDocument.getString("max_version_number"))); - return baseDao.saveFieldSetEntity(fse); - } + String attachmentUuid = fse.getString("attachment_uuid"); + FieldSetEntity fieldSetEntity = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_ATTACHMENTS, attachmentUuid, false); + fseDocument.setValue("file_size", fieldSetEntity.getString(CmnConst.ATTACHMENT_SIZE)); + fseDocument.setValue("file_name", fieldSetEntity.getString("file_name")); + fseDocument.setValue("attachments_uuid", attachmentUuid); + fseDocument.setValue("latest_version", fseDocument.getInteger("max_version_number") + 1); - /** - * 鏂囨。鐗堟湰+1 - * @param originNumber - * @return - */ - public String versionNUmberAddne(String originNumber) { - String numberStr = originNumber.substring(1); // 鍘绘帀鍓嶇紑"v" - int number = Integer.parseInt(numberStr); // 灏嗗瓧绗︿覆杞� - // 鏁板瓧鍔犱竴 - number += 1; + baseDao.saveFieldSetEntity(fseDocument); + + //鍒涘缓鏂囨。鐗堟湰鏁版嵁瀹瑰櫒 + FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY); + BaseUtil.createCreatorAndCreationTime(fseDocumentHistory); + fseDocumentHistory.setValue("document_uuid", documentUuid); + fseDocumentHistory.setValue("attachment_uuid", attachmentUuid); + fseDocumentHistory.setValue("version_number", fseDocument.getObject("latest_version")); + return baseDao.saveFieldSetEntity(fseDocumentHistory); + } + + /** + * 鏂囨。鐗堟湰+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; -- Gitblit v1.9.2