From f6ba5de2578c58a738f35b29a708c523ccb518ba Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 05 十二月 2024 09:20:07 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java index 751d022..e1ade6d 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java @@ -17,6 +17,7 @@ import com.doumee.service.business.ApproveService; import com.doumee.service.business.MemberService; import com.doumee.service.business.VisitsService; +import com.doumee.service.business.impl.hksync.HkSyncNoticeServiceImpl; import com.doumee.service.system.NoticesService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -46,6 +47,8 @@ @Autowired private VisitsService visitsService; + @Autowired + private HkSyncNoticeServiceImpl hkSyncNoticeService; @Autowired private NoticesService noticesService; @@ -90,6 +93,8 @@ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "isDetail", value = " 鏄惁鏌ヨ璇︾粏 1鏄紱0鍚�", required = true), }) public ApiResponse<InternalHomeVO> taskCenterHead(@RequestParam Integer isDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo loginUserInfo = getLoginUser(token); + hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername()); return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail)); } @@ -98,6 +103,7 @@ @PostMapping("/taskCenterHeadPC") public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo loginUserInfo = getLoginUser(token); + hkSyncNoticeService.syncHkNotices(loginUserInfo.getUsername()); noticesDTO.setMemberId(loginUserInfo.getMemberId()); noticesDTO.setUserId(loginUserInfo.getId()); return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO)); @@ -138,6 +144,10 @@ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "queryType", value = "鏌ヨ绫诲瀷锛�1=鍦ㄥ洯浜烘暟锛�2=鎶ヨ〃鏁版嵁锛�3=寰呭姙浜嬮」锛�4=瓒呮椂棰勮", required = true), }) public ApiResponse<PCWorkPlatformDataVO> pCWorkPlatformData (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + if(queryType==Constants.THREE){ + //鍚屾娴峰悍浠e姙鏁版嵁 + hkSyncNoticeService.syncHkNotices(this.getLoginUser(token).getUsername()); + } PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token)); return ApiResponse.success("鏌ヨ鎴愬姛",pcWorkPlatformDataVO); } -- Gitblit v1.9.3