From a0fc229c0df1d0bd87b7638805b810e8031c8942 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 21 七月 2021 16:42:33 +0800
Subject: [PATCH] 社区后台基础数据库bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 99 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 13 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 2d1a11c..e18060f 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,10 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
@@ -27,10 +24,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -126,13 +120,22 @@
R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
- * 活动报名名单
+ * 分页活动报名名单
*
* @param activitySignVO 查询参数
* @return 报名人员集合
*/
@PostMapping("listactivitysign")
R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
/**
* 新增社区动态
@@ -1433,6 +1436,15 @@
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
/**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
+
+ /**
* 社区后台实有单位管理列表
*
* @param pageComMngRealCompanyDTO
@@ -1440,6 +1452,15 @@
*/
@PostMapping("/common/data/company/page")
R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台实有单位统计
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/company/statistics")
+ R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId);
/**
* 社区后台添加修改实有单位
@@ -1646,6 +1667,15 @@
R listVillage(ComMngVillageVO comMngVillageVO);
/**
+ * 根据房屋id查询实有房屋
+ *
+ * @param villageId 查询条件
+ * @return 查询结果
+ */
+ @PostMapping("/getVillageById")
+ R getVillageById(@RequestParam(value = "villageId")Long villageId);
+
+ /**
* 批量导入实有房屋
*
* @param list 实有房屋数据
@@ -1739,6 +1769,15 @@
*/
@PostMapping("/common/data/population/getList")
R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getListByVillageId")
+ R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
/**
* 创建调查问卷
@@ -2330,7 +2369,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+ R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
/**
* 办事指南_分页
@@ -2933,6 +2972,24 @@
R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);
/**
+ * 插入字典
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDiction")
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+ /**
+ * 插入字典项
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDictionItem")
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+ /**
* 根据字典key查询字典项
*
* @param key
@@ -3118,11 +3175,11 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- @GetMapping("/screen/getScreenEvent")
- R getScreenEvent(@RequestParam("communityId") Long communityId);
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
@@ -3589,4 +3646,20 @@
*/
@GetMapping("/neighbor/getNeighborTopicByApp")
R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 综治后台-查询社区列表
+ * @return 社区列表
+ */
+ @GetMapping("/eventgrid/community/list")
+ R getCommunityLists();
+
+ /**
+ * 分页查询退役军人列表
+ *
+ * @param comExServicemanDTO 请求参数
+ * @return 退役军人列表
+ */
+ @PostMapping("/population/page/exServiceman")
+ R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);
}
--
Gitblit v1.7.1