From 2d93efd310612e24b99c8a487102638cfa3fbadf Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 23 八月 2024 16:29:24 +0800
Subject: [PATCH] 文档借阅功能8.23
---
src/main/java/com/product/file/controller/DocumentController.java | 11 +++++------
src/main/java/com/product/file/service/ide/IDocumentService.java | 6 +++---
src/main/java/com/product/file/service/DocumentService.java | 15 +++++++--------
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/product/file/controller/DocumentController.java b/src/main/java/com/product/file/controller/DocumentController.java
index 905f65c..56caa13 100644
--- a/src/main/java/com/product/file/controller/DocumentController.java
+++ b/src/main/java/com/product/file/controller/DocumentController.java
@@ -5,7 +5,6 @@
import com.alibaba.fastjson.JSONObject;
import com.product.core.config.CoreConst;
import com.product.core.controller.support.AbstractBaseController;
-import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.entity.RequestParameterEntity;
@@ -25,7 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
-import java.util.function.DoubleConsumer;
+
/**
* Copyright LX-BASE
@@ -371,7 +370,7 @@
return this.error(DocumentCode.DOCUMENT_LOG_FAIL.getValue(), DocumentCode.DOCUMENT_LOG_FAIL.getText());
}
}
-
+
/**
* 鏂囨。鏀惰棌
* @param request
@@ -472,7 +471,7 @@
@RequestMapping(value = "/getApplayFileSort/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String getApplayFileSort(){
- DataTableEntity applayFileSort = documentService.getApplayFileSort();
+ DataTableEntity applayFileSort = documentService.getApplyFileSort();
return OK_List(applayFileSort);
}
@@ -484,7 +483,7 @@
@RequestMapping(value = "/getApplayUserSort/{version}", method = RequestMethod.POST)
@ApiVersion(1)
public String getApplayUserSort(){
- DataTableEntity applayFileSort = documentService.getApplayUserSort();
+ DataTableEntity applayFileSort = documentService.getApplyUserSort();
return OK_List(applayFileSort);
}
@@ -509,7 +508,7 @@
.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
}
- FieldSetEntity applayInfo = documentService.getApplayInfo(fse);
+ FieldSetEntity applayInfo = documentService.getApplyInfo(fse);
return OK_List(applayInfo);
}
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 8effcfd..89a7bce 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;
@@ -81,14 +80,14 @@
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());
baseDao.add(fseDocumentHistory);
-
+
uuidList.add(documentUUID);
fileNameList.add(file_name);
}
@@ -480,7 +479,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 +490,7 @@
fse.setValue("document_collector", SpringMVCContextHolder.getCurrentUserId());
return baseDao.add(fse);
}
-
+
/**
* 鏂囨。鍙栨秷鏀惰棌
* @param documentUUID
@@ -565,7 +564,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 +580,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 +602,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;
diff --git a/src/main/java/com/product/file/service/ide/IDocumentService.java b/src/main/java/com/product/file/service/ide/IDocumentService.java
index 2e06cfb..87a2577 100644
--- a/src/main/java/com/product/file/service/ide/IDocumentService.java
+++ b/src/main/java/com/product/file/service/ide/IDocumentService.java
@@ -135,14 +135,14 @@
* @throws BaseException
*/
- DataTableEntity getApplayFileSort() throws BaseException;
+ DataTableEntity getApplyFileSort() throws BaseException;
/**
* 鑾峰彇鍊熼槄浜烘帓鍚�
* @return
* @throws BaseException
*/
- DataTableEntity getApplayUserSort() throws BaseException;
+ DataTableEntity getApplyUserSort() throws BaseException;
/**
* 鑾峰彇鍊熼槄璇︽儏淇℃伅
@@ -150,6 +150,6 @@
* @return
* @throws BaseException
*/
- FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException;
+ FieldSetEntity getApplyInfo(FieldSetEntity fes) throws BaseException;
}
--
Gitblit v1.9.2