Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-fil...

杜洪波

2024-08-23 9a6140574003ec25e95e0248785843c3598168c4

Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0

 src/main/java/com/product/file/controller/DocumentController.java

@@ -488,6 +488,31 @@
        return  OK_List(applayFileSort);
    }

    /**
     * 获取借阅详情信息
     * @param request
     */

    @RequestMapping(value = "/getApplayInfo/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String getApplayInfo(HttpServletRequest request){
        //获取参数
        FieldSetEntity fse = null;
        Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
        if (bean != null) {
            RequestParameterEntity reqp = (RequestParameterEntity) bean;
            fse = reqp.getFormData();
        }
        //判断参数是否为空
        if (fse == null) {
            SpringMVCContextHolder
                    .getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
            return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(), DocumentCode.DOCUMENT_FORM_NODATA.getText());
        }
        FieldSetEntity applayInfo = documentService.getApplayInfo(fse);
        return OK_List(applayInfo);
    }

}



 src/main/java/com/product/file/service/DocumentService.java

@@ -504,9 +504,15 @@
    @Override
    public DataTableEntity getApplyDocument(FieldSetEntity fse) throws BaseException {

        String document_name = fse.getString("document_name");
        String filter="file_name like '%"+document_name+"'%";
        DataTableEntity product_oa_document = baseDao.listTable("product_oa_document",filter);
        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);
        }else {
            product_oa_document = baseDao.listTable("product_oa_document");
        }


        return product_oa_document;
    }
@@ -595,4 +601,11 @@
        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString());
        return dataTableEntity;
    }

    @Override
    public FieldSetEntity getApplayInfo(FieldSetEntity fes) throws BaseException {
        String uuid = fes.getString("uuid");
        FieldSetEntity product_oa_document_borrow = baseDao.getFieldSetEntity("product_oa_document_borrow", uuid, false);
        return product_oa_document_borrow;
    }
}

 src/main/java/com/product/file/service/ide/IDocumentService.java

@@ -143,4 +143,13 @@
   * @throws BaseException
   */
  DataTableEntity getApplayUserSort() throws BaseException;

  /**
   * 获取借阅详情信息
   * @param fes
   * @return
   * @throws BaseException
   */
  FieldSetEntity getApplayInfo(FieldSetEntity fes) throws  BaseException;

}