From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java
index d170453..ad5b701 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidDangerMemberApi.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidDangerMemberDTO;
+import com.panzhihua.common.model.dtos.community.acid.PageDangerMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,7 +39,7 @@
* @param commonPage 查询实体
* @return 所有数据
*/
- @PostMapping("queryAll")
+ @PostMapping("/queryAll")
public R selectAll(@RequestBody ComActAcidDangerMemberDTO commonPage) {
return this.comActAcidDangerMemberService.pageList(commonPage);
}
@@ -86,4 +87,14 @@
public R delete(@RequestParam("id") Long id) {
return R.ok(this.comActAcidDangerMemberService.removeById(id));
}
+
+ /**
+ * 分页查询风险人员
+ * @param pageDangerMemberDTO
+ * @return
+ */
+ @PostMapping("/page")
+ public R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO) {
+ return comActAcidDangerMemberService.pageDangerMember(pageDangerMemberDTO);
+ }
}
--
Gitblit v1.7.1