From af03e00a9a225b81dd072a225b9b84e77680f7c9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 26 四月 2022 10:20:59 +0800
Subject: [PATCH] 花城E+防疫修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java                |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java |   12 +++++-------
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 8290b8e..836d866 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -5,6 +5,7 @@
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.civil.*;
 import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.dtos.community.acid.ComActAcidMemberDTO;
 import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
 import com.panzhihua.common.model.dtos.community.reserve.*;
 import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
@@ -25,6 +26,7 @@
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
 import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
 import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
 import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
@@ -9666,4 +9668,50 @@
 
     @GetMapping("/comAreaTownCommunity/areaTownCommunity")
     R areaTownCommunity(@RequestParam("name")String name);
+
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param commonPage 查询实体
+     * @return 所有数据
+     */
+    @PostMapping("/comActAcidMember/queryAll")
+    R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("/comActAcidMember/{id}")
+    R selectOneComActAcidMember(@PathVariable("id") Long id);
+
+    /**
+     * 新增数据
+     *
+     * @param comActAcidMemberVO 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("/comActAcidMember")
+    R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+    /**
+     * 修改数据
+     *
+     * @param comActAcidMemberVO 实体对象
+     * @return 修改结果
+     */
+    @PostMapping("/comActAcidMember/update")
+    R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键结合
+     * @return 删除结果
+     */
+    @GetMapping("/comActAcidMember/del")
+    R deleteComActAcidMember(@RequestParam("id") Long id);
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java
index 715a280..69bd162 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidMemberApi.java
@@ -36,7 +36,7 @@
      */
     @PostMapping("queryAll")
     public R selectAll(@RequestBody ComActAcidMemberDTO commonPage) {
-        return this.comActAcidMemberService.pageList(commonPage);
+        return this.communityService.selectAllComActAcidMember(commonPage);
     }
 
     /**
@@ -47,7 +47,7 @@
      */
     @GetMapping("{id}")
     public R selectOne(@PathVariable("id") Long id) {
-        return R.ok(this.comActAcidMemberService.getById(id));
+        return communityService.selectOneComActAcidMember(id);
     }
 
     /**
@@ -58,7 +58,7 @@
      */
     @PostMapping
     public R insert(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
-        return this.comActAcidMemberService.insert(comActAcidMemberVO);
+        return communityService.insertComActAcidMember(comActAcidMemberVO);
     }
 
     /**
@@ -69,9 +69,7 @@
      */
     @PostMapping("/update")
     public R update(@RequestBody ComActAcidMemberVO comActAcidMemberVO) {
-        ComActAcidMember comActAcidMember=new ComActAcidMember();
-        BeanUtils.copyProperties(comActAcidMemberVO,comActAcidMember);
-        return R.ok(this.comActAcidMemberService.updateById(comActAcidMember));
+        return communityService.updateComActAcidMember(comActAcidMemberVO);
     }
 
     /**
@@ -82,6 +80,6 @@
      */
     @GetMapping("del")
     public R delete(@RequestParam("id") Long id) {
-        return R.ok(this.comActAcidMemberService.removeById(id));
+        return communityService.deleteComActAcidMember(id);
     }
 }

--
Gitblit v1.7.1