product-server-file
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
18756
2024-08-27 d06b8d892fd1f350defdffc1a6481aefd0e46d06 
 src/main/java/com/product/file/service/DocumentService.java


@@ -85,9 +85,9 @@


            //创建文档版本数据容器


            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");


            fseDocumentHistory.setValue("document_uuid", documentUUID);


            fseDocumentHistory.setValue("attachment_uuid", attachment.getUUID());


            fseDocumentHistory.setValue("version_number", "v1");


            baseDao.add(fseDocumentHistory);




            uuidList.add(documentUUID);


@@ -383,12 +383,12 @@


            sql.append(" and tricode_parent = ? ");


            //加载文件路径


            DataTableEntity dataTableEntity = documentDirectoryService.getDirectoryStructure(fse);


            object.put("PRODUCT_OA_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));


            object.put("product_oa_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity));


        }


        //sql.append(" GROUP BY tricode,tricode_parent,directory_name");


        DataTableEntity data = baseDao.listTable(sql.toString(), param.toArray());




        object.put("PRODUCT_OA_directory_sub", BaseUtil.dataTableEntityToJson(data));


        object.put("product_oa_directory_sub", BaseUtil.dataTableEntityToJson(data));


        baseDao.listInternationDataTable(data, null);




        return object;


@@ -564,17 +564,24 @@


    @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();


        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());




        }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(),param.toArray());






        }






        return product_oa_document;


        return  product_oa_document;


    }




    @Override


@@ -627,26 +634,28 @@


    @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(" SELECT t.uuid,t.file_name,t.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(" 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");


        sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.file_size");


        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   count(borrower)  from  product_oa_document_borrow group by borrower ) as  applayCount,");


        sb.append(" SELECT w.borrower,s.show_name,");


        sb.append(" count( borrower )  AS applayCount,");


        sb.append(" count(sub_uuid) as applayFileCount ");


        sb.append(" FROM product_oa_document_borrow  w ");


        sb.append(" JOIN product_oa_document_borrow_sub b");


@@ -658,7 +667,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;


    }