From 23c90bbf80577e8e3f4f227b5431a79fe5ebef6e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:20:57 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
index c54ec07..3eb15f9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/WorkGuideApi.java
@@ -2,7 +2,13 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.service_community.service.ComActWorkGuideClassifyService;
+import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.controller.BaseController;
@@ -23,6 +29,8 @@
public class WorkGuideApi extends BaseController {
@Resource
private ComActWorkGuideService workGuideService;
+ @Resource
+ private ComActWorkGuideClassifyService comActWorkGuideClassifyService;
/**
* 办事指南_新增
@@ -57,8 +65,8 @@
*/
@GetMapping("detailworkguide")
public R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId,
- @RequestParam("conmunityId") Long conmunityId) {
- return workGuideService.detailWorkGuide(workGuideId, conmunityId);
+ @RequestParam("communityId") Long communityId) {
+ return workGuideService.detailWorkGuide(workGuideId, communityId);
}
/**
@@ -85,4 +93,71 @@
return workGuideService.delectWorkGuide(workGuideId);
}
+ /**
+ * 分页查询办事执念-分类管理 addWorkGuideClassify 分页查询办事执念-分类管理
+ * @param comActWorkGuideClassifyVO 查询参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("workGuide/classify/apage")
+ public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+ return comActWorkGuideClassifyService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事执念-分类管理新增或修改 addWorkGuideClassify 办事执念-分类管理新增或修改
+ * @param comActWorkGuideClassifyVO 新增或修改参数
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @PostMapping("workGuide/classify/add")
+ public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
+ return comActWorkGuideClassifyService.addWorkGuideClassify(comActWorkGuideClassifyVO);
+ }
+
+ /**
+ * 办事执念-分类管理删除 addWorkGuideClassify 办事执念-分类管理删除
+ * @param workGuideClassifyId 办事执念-分类管理id
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("workGuide/classify/delete")
+ public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) {
+ return comActWorkGuideClassifyService.deleteWorkGuideClassify(workGuideClassifyId);
+ }
+
+ /**
+ * 办事指南-分类管理列表查询 getWorkGuideClassifyList 办事指南-分类管理列表查询
+ * @return R 返回结果
+ * @author txb
+ * @date 2021/8/31 15:03
+ */
+ @GetMapping("workGuide/classify/getList")
+ public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode) {
+ return comActWorkGuideClassifyService.getWorkGuideClassifyList(areaCode);
+ }
+
+ /**
+ * 办事指南列表-按分类查询
+ * @param pageActWorkGuideDTO 请求参数
+ * @return 办事指南分类列表
+ */
+ @PostMapping("listworkguide")
+ public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
+ return workGuideService.listWorkGuide(pageActWorkGuideDTO);
+ }
+
+ /**
+ * 根据办事指南分类id查询办事指南列表
+ * @param classifyId 办事指南分类id
+ * @return 办事指南列表数据
+ */
+ @GetMapping("listworkguide/classify")
+ public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) {
+ return workGuideService.listWorkGuideByClassifyId(classifyId);
+ }
+
}
--
Gitblit v1.7.1