From 5e0141e95646882d9975a57094c01a35a7b78375 Mon Sep 17 00:00:00 2001 From: zm <2369059705qq.com> Date: 星期五, 30 八月 2024 17:47:36 +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 | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java index c76415f..5649627 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -634,24 +634,27 @@ @Override public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException { - DataTableEntity product_oa_document = new DataTableEntity(); - StringBuilder sb = new StringBuilder(); - 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 "); - List<String> param = new ArrayList<>(); - if (!ObjectUtil.isNotEmpty(fse.getString("document_name"))) { - product_oa_document = baseDao.listTable(sb.toString(), param.toArray()); + String sub_uuid = fse.getString("sub_uuid"); + String sub_uuid_replace = sub_uuid.replace("\"", ""); + String[] sub_uuid_split = sub_uuid_replace.split(","); + String sub_uuids=""; + for (int i = 0; i < sub_uuid_split.length; i++) { - } else { - String document_name = fse.getString("document_name"); - sb.append(" where d.file_name like '%" + document_name + "%'"); - product_oa_document = baseDao.listTable(sb.toString(), param.toArray()); - - + if(i==sub_uuid_split.length-1){ + sub_uuids=sub_uuids+"\""+sub_uuid_split[i]+"\""; + }else { + sub_uuids=sub_uuids+"\""+sub_uuid_split[i]+"\","; + } } - return product_oa_document; + List<String> param = new ArrayList<>(); + StringBuilder sb=new StringBuilder(); + sb.append(" SELECT a.*,f.show_name"); + sb.append(" FROM product_sys_attachments a "); + sb.append(" LEFT JOIN product_sys_staffs f "); + sb.append(" on a.created_by =f.user_id "); + sb.append(" where a.uuid in ("+sub_uuids+")"); + DataTableEntity product_sys_attachments = baseDao.listTable(sb.toString(),param.toArray()); + return product_sys_attachments; } @Override @@ -706,13 +709,13 @@ StringBuilder sb = new StringBuilder(); List<String> param = new ArrayList<>(); sb.append(" SELECT b.* FROM ("); - sb.append(" SELECT t.uuid,t.file_name,t.file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount"); + sb.append(" SELECT t.uuid,t.file_name,t.attachment_size as file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount"); sb.append(" FROM product_oa_document_borrow_sub b"); - sb.append(" JOIN product_oa_document t"); + sb.append(" JOIN product_sys_attachments t"); sb.append(" on b.sub_uuid=t.uuid"); sb.append(" JOIN product_sys_staffs s "); 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,t.file_size"); + sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.attachment_size"); sb.append(" )b order by b.applyCount asc"); DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray()); return dataTableEntity; @@ -737,7 +740,7 @@ sb.append(" FROM product_oa_document_borrow w "); sb.append(" left JOIN product_oa_document_borrow_sub b"); sb.append(" on b.borrow_uuid=w.uuid"); - sb.append(" left JOIN product_oa_document t"); + sb.append(" left JOIN product_sys_attachments t"); sb.append(" on b.sub_uuid=t.uuid"); sb.append(" left JOIN product_sys_staffs s"); sb.append(" on w.borrower=s.user_id"); -- Gitblit v1.9.2