From cb021d80b68aee4c16d6bd42c349308ad2c20e78 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:07:51 +0800
Subject: [PATCH] 调整预约登记明细导出excel格式
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 280 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 221 insertions(+), 59 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 c995b6c..3807451 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
@@ -2,6 +2,22 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
+import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
+import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import io.swagger.annotations.ApiOperation;
+import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -217,63 +233,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.ComActActivityVO;
-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.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.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;
@@ -3195,7 +3154,7 @@
* @return 删除结果
*/
@PostMapping("common/data/special/delete")
- R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);
/**
* 办事指南_新增
@@ -3603,6 +3562,16 @@
*/
@PostMapping("/common/data/population/house/delete")
R deleteHouses(@RequestBody List<Long> Ids);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param houseEditAdminDTO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/insert")
+ R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);
/**
* 实有房屋统计
@@ -6139,6 +6108,16 @@
R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
/**
+ * 查询房屋二级级联菜单后台
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/second/listBack")
+ public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
* 微心愿处理人列表
* @param communityId 社区id
* @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
@@ -6359,9 +6338,10 @@
/**
* 获取所有产品分类
* @return
+ * @param merchantId
*/
@GetMapping("/convenient/product-category/all")
- R getAllProductCategory();
+ R getAllProductCategory(@RequestParam("merchantId") Long merchantId);
/**
* 获取该社区商家数量大于0的分类
@@ -6473,4 +6453,186 @@
*/
@GetMapping("/convenient/product/shelf-num")
R getProductShelfNum(@RequestParam("merchantId") Long merchantId);
+
+ /**
+ * 群团组织成员列表-小程序分页查询
+ * @param pageClusterMemberDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/applets")
+ R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);
+
+ /**
+ * 群团组织列表-小程序查询社区群团组织列表
+ * @param communityId 社区id
+ * @return 社区群团组织列表
+ */
+ @GetMapping("/cluster/list/applets")
+ R listClusterApplets(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 分页查询群团组织列表
+ * @param pageClusterAdminDto 请求参数
+ * @return 群团组织列表
+ */
+ @PostMapping("/cluster/page/admin")
+ R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);
+
+ /**
+ * 新增群团组织
+ * @param addClusterAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/add/admin")
+ R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);
+
+ /**
+ * 修改群团组织
+ * @param editClusterAdminDto 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/cluster/edit/admin")
+ R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);
+
+ /**
+ * 删除群团组织
+ * @param id 组织id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/delete/admin")
+ R deleteClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织详情
+ * @param id 组织id
+ * @return 群团组织详情
+ */
+ @GetMapping("/cluster/detail/admin")
+ R detailClusterAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询群团组织成员列表
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 群团组织成员列表
+ */
+ @PostMapping("/cluster/member/page/admin")
+ R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 新增群团组织成员
+ * @param addClusterMemberAdminDto 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/cluster/member/add/admin")
+ R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);
+
+ /**
+ * 编辑群团组织成员
+ * @param editClusterMemberAdminDto 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/cluster/member/edit/admin")
+ R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);
+
+ /**
+ * 删除群团组织成员
+ * @param id 组织成员id
+ * @return 删除结果
+ */
+ @GetMapping("/cluster/member/delete/admin")
+ R deleteClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 群团组织成员详情
+ * @param id 组织成员id
+ * @return 群团组织成员详情
+ */
+ @GetMapping("/cluster/member/detail/admin")
+ R detailClusterMemberAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 查询系统民族列表
+ * @return 民族列表
+ */
+ @GetMapping("/cluster/member/nation/list/admin")
+ R memberNationListAdmin();
+
+ /**
+ * 群团组织成员导入
+ * @param list 导入数据
+ * @param communityId 社区id
+ * @param userId 操作用户id
+ * @return 导入结果
+ */
+ @PostMapping("/cluster/member/import/admin")
+ R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ /**
+ * 群团组织导出数据查询
+ * @param pageClusterMemberAdminDto 请求参数
+ * @return 导出数据结果集
+ */
+ @PostMapping("/cluster/member/export/admin")
+ R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);
+
+ /**
+ * 社区后台分页查询微心愿
+ * @param comActMicroWishVO 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("pagemicrowishAdmin")
+ R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+ /**
+ * 小程序四长四员查询居民列表
+ */
+ @PostMapping("/comActFourMember/member")
+ R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);
+
+ /**
+ *居民数据详情
+ */
+ @GetMapping("/comActFourMember/memberDetail")
+ R comActFourMemberMemberDetail(@RequestParam("id")Long id);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/user/delete")
+ R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 新增实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/insert")
+ public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 编辑实有房屋信息
+ *
+ * @param comMngPopulationHouseUserVO
+ * 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/user/edit")
+ public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * 请求参数
+ * @return 删除结果
+ */
+ @GetMapping("/common/data/population/house/user/detail")
+ public R detailHousesUser(@RequestParam("id") Long id);
}
--
Gitblit v1.7.1