From 03af9393e509898af90e11910ccb848c71704fa0 Mon Sep 17 00:00:00 2001 From: 18756 <1875631620@qq.com> Date: 星期一, 26 八月 2024 15:36:30 +0800 Subject: [PATCH] 文档功能优化8.26 --- src/main/java/com/product/file/service/DocumentService.java | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java index d5ac785..4c81669 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -564,17 +564,25 @@ @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