yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pch 2024-12-26 22:07:59 +08:00
commit 5844b7c19c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/only/controller/admin/only/onlyofController.java
View File

@ -173,6 +173,7 @@ public class onlyofController {
public void download(String name, String cDate,HttpServletResponse response) { public void download(String name, String cDate,HttpServletResponse response) {
cDate = cDate.equals("") ? cDate : cDate + "\\"; cDate = cDate.equals("") ? cDate : cDate + "\\";
// System.out.println("download: "+name+"---"+response+"---"+uuid); // System.out.println("download: "+name+"---"+response+"---"+uuid);
System.out.println("cDate:"+cDate);
try { try {
FileUtil.downLoadFile(name,filePath+cDate,response); FileUtil.downLoadFile(name,filePath+cDate,response);
} catch (IOException e) { } catch (IOException e) {
@ -205,12 +206,13 @@ public class onlyofController {
@GetMapping("/editStatus") @GetMapping("/editStatus")
@Operation(summary = "文件状态") @Operation(summary = "文件状态")
@PreAuthorize("@ss.hasPermission('only:onlyof:editStatus')") @PreAuthorize("@ss.hasPermission('only:onlyof:editStatus')")
public ResponseEntity<Object> getDoucmentEditStatus(String name) throws ParseException { public ResponseEntity<Object> getDoucmentEditStatus(String name,String cDate) throws ParseException {
cDate = (cDate != null && !cDate.isEmpty()) ? cDate + "\\" : cDate;
// System.out.println("editStatus"); // System.out.println("editStatus");
String url = officeUrl+officeCommand; String url = officeUrl+officeCommand;
Map<String,String> map = new HashMap<String,String>(); Map<String,String> map = new HashMap<String,String>();
map.put("c", "forcesave"); map.put("c", "forcesave");
String docFileMd5 = Md5Utils.getFileMd5(new File(filePath+name)); String docFileMd5 = Md5Utils.getFileMd5(new File(filePath+cDate+name));
if (StringUtils.isBlank(docFileMd5)) { if (StringUtils.isBlank(docFileMd5)) {
// throw new DocumentException(ErrorCodeEnum.DOC_FILE_MD5_ERROR); // throw new DocumentException(ErrorCodeEnum.DOC_FILE_MD5_ERROR);
} }

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/hygl/HyglController.java
View File

@ -76,6 +76,7 @@ public class HyglController {
@Operation(summary = "获得会议管理分页") @Operation(summary = "获得会议管理分页")
@PreAuthorize("@ss.hasPermission('home:hygl:query')") @PreAuthorize("@ss.hasPermission('home:hygl:query')")
public CommonResult<PageResult<HyglRespVO>> getHyglPage(@Valid HyglPageReqVO pageReqVO) { public CommonResult<PageResult<HyglRespVO>> getHyglPage(@Valid HyglPageReqVO pageReqVO) {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
PageResult<HyglDO> pageResult = hyglService.getHyglPage(pageReqVO); PageResult<HyglDO> pageResult = hyglService.getHyglPage(pageReqVO);
// PageResult<HyglDO> pageResult = hyglService.getHyglPage(getLoginUserId(), pageReqVO); // PageResult<HyglDO> pageResult = hyglService.getHyglPage(getLoginUserId(), pageReqVO);
return success(BeanUtils.toBean(pageResult, HyglRespVO.class)); return success(BeanUtils.toBean(pageResult, HyglRespVO.class));

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/rcgl/RcglController.java
View File

@ -75,6 +75,7 @@ public class RcglController {
@Operation(summary = "获得领导日程安排分页") @Operation(summary = "获得领导日程安排分页")
@PreAuthorize("@ss.hasPermission('home:rcgl:query')") @PreAuthorize("@ss.hasPermission('home:rcgl:query')")
public CommonResult<PageResult<RcglRespVO>> getRcglPage(@Valid RcglPageReqVO pageReqVO) { public CommonResult<PageResult<RcglRespVO>> getRcglPage(@Valid RcglPageReqVO pageReqVO) {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
PageResult<RcglDO> pageResult = rcglService.getRcglPage(pageReqVO); PageResult<RcglDO> pageResult = rcglService.getRcglPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RcglRespVO.class)); return success(BeanUtils.toBean(pageResult, RcglRespVO.class));
} }