From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
index a8411f4..040f8cf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java
@@ -2,6 +2,8 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
@@ -30,18 +32,31 @@
@ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class)
@PostMapping("pageworkguide")
public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
return communityService.pageWorkGuide(pageActWorkGuideDTO);
}
@ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class)
@GetMapping("detailworkguide")
public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
- @RequestParam(value = "conmunityId", required = false) Long communityId) {
- Long conmunityId = communityId;
+ @RequestParam(value = "communityId", required = false) Long communityId) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
if (loginUserInfo != null) {
- conmunityId = loginUserInfo.getCommunityId();
+ communityId = loginUserInfo.getCommunityId();
}
- return communityService.detailWorkGuide(workGuideId, conmunityId);
+ return communityService.detailWorkGuide(workGuideId, communityId);
+ }
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class)
+ @PostMapping("list")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ pageActWorkGuideDTO.setAreaCode(this.getAreaCode());
+ return communityService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+ @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideDetailAppletsVO.class)
+ @GetMapping("list/classify")
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) {
+ return communityService.listWorkGuideByClassifyId(classifyId);
}
}
--
Gitblit v1.7.1