product-server-file
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
杜洪波
2024-08-27 5e2771f2bef70f5f598b221509dd1ea9cc7e8191 
 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;


@@ -566,19 +566,18 @@




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




            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 {


            String document_name = fse.getString("document_name");


            sb.append(" where d.file_name like '%"+document_name+"%'");


           product_oa_document = baseDao.listTable(sb.toString());


            product_oa_document = baseDao.listTable(sb.toString(),param.toArray());






        }