From ca46aed30739be09fbbdb413ff7d2f843934efda Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十一月 2024 09:26:27 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 4dddf78..751d022 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
@@ -8,6 +8,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.dto.NoticesDTO;
@@ -83,13 +84,23 @@
- @ApiOperation(value = "浠诲姟涓績澶撮儴", notes = "H5")
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - H5", notes = "H5")
@GetMapping("/taskCenterHead")
@ApiImplicitParams({
@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) {
- return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeData(getLoginUser(token).getMemberId(),isDetail));
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataH5(getLoginUser(token).getMemberId(),isDetail));
+ }
+
+
+ @ApiOperation(value = "浠诲姟涓績澶撮儴 - PC", notes = "PC")
+ @PostMapping("/taskCenterHeadPC")
+ public ApiResponse<InternalHomeVO> taskCenterHeadPC(@RequestBody NoticesDTO noticesDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ noticesDTO.setMemberId(loginUserInfo.getMemberId());
+ noticesDTO.setUserId(loginUserInfo.getId());
+ return ApiResponse.success("鏌ヨ鎴愬姛",approveService.getHomeDataPC(noticesDTO));
}
@@ -98,8 +109,11 @@
public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo loginUserInfo = getLoginUser(token);
pageWrap.getModel().setMemberId(loginUserInfo.getMemberId());
+// pageWrap.getModel().setUserId(loginUserInfo.getId());
return ApiResponse.success(noticesService.taskCanterPage(pageWrap));
}
+
+
@ApiOperation("鏍囪宸茶")
@GetMapping("/signRead")
@@ -116,4 +130,15 @@
}
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+
+ @ApiOperation("PC宸ヤ綔鍙�")
+ @GetMapping("/pCWorkPlatformData")
+ @ApiImplicitParams({
+ @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) {
+ PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token));
+ return ApiResponse.success("鏌ヨ鎴愬姛",pcWorkPlatformDataVO);
+ }
}
--
Gitblit v1.9.3