18756
2024-08-28 ebdb4a8a09dc26219af5115c2e6609aaf972c89c
src/main/java/com/product/file/service/DocumentService.java
@@ -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;
@@ -636,13 +636,13 @@
        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(),param.toArray());
        return dataTableEntity;
@@ -652,21 +652,29 @@
    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(" SELECT b.*,a.applayCount ");
        sb.append(" FROM (");
        sb.append(" SELECT borrower,count(borrower) as applayCount");
        sb.append(" FROM product_oa_document_borrow ");
        sb.append(" group by borrower");
        sb.append(" ) a LEFT JOIN ");
        sb.append(" (");
        sb.append(" SELECT a.borrower,a.show_name,a.applayFileCount ");
        sb.append(" FROM (");
        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( 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");
        sb.append(" left JOIN product_oa_document_borrow_sub b");
        sb.append(" on b.borrow_uuid=w.uuid");
        sb.append(" JOIN product_oa_document t");
        sb.append(" left JOIN product_oa_document t");
        sb.append(" on b.sub_uuid=t.uuid");
        sb.append(" JOIN product_sys_staffs s");
        sb.append(" left JOIN product_sys_staffs s");
        sb.append(" on w.borrower=s.user_id");
        sb.append(" GROUP BY w.borrower,s.show_name");
        sb.append(" )a");
        sb.append(" order by a.applayCount,a.applayFileCount asc");
        sb.append(" )a )b");
        sb.append(" on a.borrower=b.borrower ");
        sb.append(" order by a.applayCount,b.applayFileCount asc");
        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(),param.toArray());
        return dataTableEntity;
    }