From 5b1f8540b5843578a80e4aa34e371f1a5b40f31e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 17 八月 2023 16:53:01 +0800
Subject: [PATCH] 修改最美志愿者编辑报错id为空

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  140 +++++++++++++++++++++++++---------------------
 1 files changed, 75 insertions(+), 65 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 5f962ad..9d911d5 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
@@ -26,6 +26,7 @@
 import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
 import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
@@ -218,68 +219,6 @@
 import com.panzhihua.common.model.vos.DictionaryVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.BatchhouseVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
-import com.panzhihua.common.model.vos.community.ComActColumnVO;
-import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
-import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComPropertyVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
-import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
-import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
-import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
-import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -2265,6 +2204,19 @@
     R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
 
     /**
+     * 查询省下所有区域 tree结构
+     *
+     * @param provinceAdcode
+     *            省份code
+     * @param areaCode
+     * @return 查询结果
+     */
+    @GetMapping("/common/data/area/basiclevel")
+    R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
+                        @RequestParam(value = "areaCode", required = false) String areaCode,
+                        @RequestParam(value = "appId", required = false) String appId);
+
+    /**
      * 分页查询街道
      *
      * @param pageComStreetDTO
@@ -3429,7 +3381,7 @@
      * @return 详情
      */
     @GetMapping("/detailworkguide")
-    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
+    R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);
 
     /**
      * 办事指南_分页
@@ -11230,7 +11182,6 @@
     /**
      * 通过洗车订单查询银联订单
      *
-     * @param Id
      * @return
      */
     @GetMapping("/unionpay/detail")
@@ -11240,7 +11191,6 @@
     /**
      * 通过银联订单查询洗车订单
      *
-     * @param Id
      * @return
      */
     @GetMapping("/unionpay/unionpayDetail")
@@ -11259,4 +11209,64 @@
           @RequestParam("money") String money);
 
 
+
+
+
+
+    /*********************************************************************************************************
+     *
+     *
+     *                   最美志愿者
+     *
+     *
+     * *********************************************************************************************************/
+    @GetMapping("/MostBeautifu/queryById")
+    public R queryById2(@RequestParam("id") String Id);
+
+
+    /**
+     * 分页查询
+     * @param name
+     * @param unmountType
+     * @return
+     */
+    @GetMapping("/MostBeautifu/getqueryList")
+    public R queryList(@RequestParam("pageNum") int pageNum,
+                       @RequestParam("pageSize")int pageSize,
+                       @RequestParam(value = "name", required = false) String name,
+                       @RequestParam(value = "unmountType", required = false) String unmountType);
+
+
+
+    /**
+     * 新增
+     * @param mostBeautifulVolunteerVO
+     * @return
+     */
+    @PostMapping("/MostBeautifu/addMostBeautiful")
+    public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+    /**
+     * 更新
+     * @param mostBeautifulVolunteerVO
+     * @return
+     */
+    @PostMapping("/MostBeautifu/upMostBeautiful")
+    public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+    /**
+     * 删除
+     * @param Id
+     * @return
+     */
+    @DeleteMapping("/MostBeautifu/delectVuId")
+    public R deleteById(@RequestParam("id")  String Id);
+
+
+
+
+
+
 }

--
Gitblit v1.7.1