From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 二月 2022 14:07:48 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java | 96
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java | 34
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java | 80
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerServiceService.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 33
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml | 45
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java | 36
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java | 33
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java | 39
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java | 107
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectScheduleService.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java | 19
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java | 27
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml | 39
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 11
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleApi.java | 89
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java | 124
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java | 115
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java | 112
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectScheduleApi.java | 95
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java | 66
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java | 82
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java | 176 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java | 22
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectMemberDao.java | 28
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java | 145
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java | 146
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 431 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java | 17
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleRecordDao.java | 38
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java | 132
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java | 119
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml | 38
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java | 106
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java | 116
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java | 134
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRafflePrizeServiceImpl.java | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectScheduleApi.java | 93
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java | 42
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml | 28
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java | 49
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.java | 36
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 111
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java | 59
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java | 50
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java | 60
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRafflePrizeDao.java | 35
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml | 14
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java | 100
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java | 70
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java | 66
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java | 105
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java | 84
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleDao.java | 37
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java | 124
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRafflePrizeService.java | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml | 54
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java | 30
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectScheduleServiceImpl.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml | 108
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRafflePrizeApi.java | 88
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java | 109
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java | 37
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java | 118
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml | 26
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectScheduleDao.java | 16
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml | 24
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml | 41
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java | 156 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java | 61
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java | 25
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java | 21
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleService.java | 54
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java | 7
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java | 74
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleRecordService.java | 31
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java | 77
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ProjectRelationVO.java | 23
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java | 157 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java | 131
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java | 43
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml | 22
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java | 29
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerServiceApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml | 115
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java | 21
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java | 93
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java | 97
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java | 91
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java | 163 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java | 87
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java | 103
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java | 92
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java | 96
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java | 31
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 129
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java | 128
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java | 77
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 4
145 files changed, 8,942 insertions(+), 55 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java
new file mode 100644
index 0000000..f5fed00
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActColumnApi.java
@@ -0,0 +1,103 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 分类列表(ComActColumn)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-20 17:28:14
+ */
+@Slf4j
+@Api(tags = {"分类管理"})
+@RestController
+@RequestMapping("comActColumn")
+public class ComActColumnApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActColumnSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActColumnSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActColumnVO comActColumnVO) {
+ comActColumnVO.setStatus(1);
+ comActColumnVO.setCreateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());
+ }
+ return communityService.comActColumnInsert(comActColumnVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActColumnVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActColumnVO comActColumnVO) {
+ comActColumnVO.setUpdateTime(new Date());
+ if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
+ comActColumnVO.setUpdateBy(this.getLoginUserInfo().getName());
+ }
+ return this.communityService.comActColumnUpdate(comActColumnVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActColumnDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java
new file mode 100644
index 0000000..0fe3832
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActRaffleApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 抽奖活动表(ComActRaffle)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@Slf4j
+@Api(tags = {"抽奖活动"})
+@RestController
+@RequestMapping("comActRaffle")
+public class ComActRaffleApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.selectAllComActRaffle(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = ComActRaffleVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActRaffle(id,this.getUserId());
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
+ comActRaffleVO.setCommunityId(this.getCommunityId());
+ comActRaffleVO.setCreateBy(this.getUserId());
+ return this.communityService.insertComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.communityService.updateComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActRaffle(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java
new file mode 100644
index 0000000..927e5aa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialMemberApi.java
@@ -0,0 +1,92 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:47
+ */
+@Slf4j
+@Api(tags = {"社会组织成员"})
+@RestController
+@RequestMapping("comActSocialMember")
+public class ComActSocialMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActSocialMemberSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActSocialMemberSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberInsert(comActSocialMember);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberUpdate(comActSocialMember);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialMemberDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java
new file mode 100644
index 0000000..46eb2c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialOrgApi.java
@@ -0,0 +1,96 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.ComActVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zzj
+ */
+@Slf4j
+@Api(tags = {"社会组织"})
+@RestController
+@RequestMapping("/comActSocialOrg")
+public class ComActSocialOrgApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ if(this.getCommunityId()!=null){
+ R r=communityService.detailCommunity(this.getCommunityId());
+ if(R.isOk(r)){
+ ComActVO comActVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
+ if(comActVO!=null){
+ commonPage.setStreetId(comActVO.getStreetId());
+ }
+ }
+ }
+ return this.communityService.comActSocialOrgSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id){
+ return this.communityService.comActSocialOrgSelectOne(id);
+ }
+ /**
+ * 新增数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增社会组织")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ comActSocialOrg.setCommunityId(this.getCommunityId());
+ return this.communityService.comActSocialOrgInsert(comActSocialOrg);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialOrg 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改社会组织")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
+ return this.communityService.comActSocialOrgUpdate(comActSocialOrg);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除社会组织")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialOrgDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java
new file mode 100644
index 0000000..8676493
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectApi.java
@@ -0,0 +1,100 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表控制层
+ *
+ * @author zzj
+ * @since 2021-12-22 14:02:48
+ */
+@Slf4j
+@Api(tags = {"项目管理"})
+@RestController
+@RequestMapping("comActSocialProject")
+public class ComActSocialProjectApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProject(commonPage);
+ }
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.getAppletComActSocialProject(id);
+ }
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @ApiOperation(value = "根据项目id分页获取关联项目")
+ @PostMapping("/getRelation")
+ public R getRelation(@RequestBody CommonPage commonPage){
+ return communityService.getRelationComActSocialProject(commonPage);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody SocialProjectVO socialProjectVO) {
+ return communityService.insertComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody SocialProjectVO socialProjectVO) {
+ return communityService.updateComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProject(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java
new file mode 100644
index 0000000..3769b77
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectMemberApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+@Slf4j
+@Api(tags = {"项目成员管理"})
+@RestController
+@RequestMapping("comActSocialProjectMember")
+public class ComActSocialProjectMemberApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询所有数据")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectMember(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectMember(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectMember(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
new file mode 100644
index 0000000..644be07
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectPublicityApi.java
@@ -0,0 +1,103 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:55
+ */
+@Slf4j
+@Api(tags = {"项目宣传管理"})
+@RestController
+@RequestMapping("comActSocialProjectPublicity")
+public class ComActSocialProjectPublicityApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectPublicity(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectPublicity(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectPublicity(id);
+ }
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("多条删除数据")
+ @PostMapping("delBatch")
+ public R delBatch(@RequestBody List<Long> ids) {
+ return communityService.delBatchComActSocialProjectPublicity(ids);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java
new file mode 100644
index 0000000..e026c6f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialProjectScheduleApi.java
@@ -0,0 +1,91 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+@Slf4j
+@Api(tags = {"项目进度管理"})
+@RestController
+@RequestMapping("comActSocialProjectSchedule")
+public class ComActSocialProjectScheduleApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectSchedule(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectSchedule(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectSchedule(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
new file mode 100644
index 0000000..2c7aa83
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerApi.java
@@ -0,0 +1,132 @@
+package com.panzhihua.applets.api;
+
+import com.alibaba.excel.EasyExcel;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Slf4j
+@RestController
+@RequestMapping("/comactsocialworker")
+@Api(tags = {"社工"})
+public class ComActSocialWorkerApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+// @Value("${excel.comactsocialworkerUrl}")
+// private String comactsocialworkerUrl;
+ /**
+ * 新增社工
+ * @param {classNameFirstLower}AddDTO 添加社工传递对象
+ * @return 新增结果
+ */
+ @PostMapping()
+ @ApiOperation(value = "新增社工", response = R.class)
+ R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
+ comActSocialWorkerAddDTO.setUserId(getUserId());
+ comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
+ return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
+ }
+
+ /**
+ * 修改
+ * @param comActSocialWorkerEditDTO 修改社工传递对象
+ * @return 修改结果
+ */
+ @PutMapping()
+ @ApiOperation(value = "编辑社工", response = R.class)
+ R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
+ comActSocialWorkerEditDTO.setUserId(getUserId());
+ return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
+ }
+
+ /**
+ * 分页查找
+ * @param pageComActSocialWorkerDTO 查找社工传递对象
+ * @return 查找结果
+ */
+ @GetMapping()
+ @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
+ R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
+ ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
+ pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
+ return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
+ }
+
+ /**
+ * 删除
+ * @param comActSocialWorkerDeleteDTO 删除社工传递对象
+ * @return 删除结果
+ */
+ @DeleteMapping()
+ @ApiOperation(value = "删除社工", response = R.class)
+ R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO){
+ ClazzUtils.setIfStringIsEmpty(comActSocialWorkerDeleteDTO);
+ return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
+ }
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "查询社工详细信息")
+ R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
+ return communityService.comActSocialWorkerDetails(id);
+ }
+
+ /**
+ * 导入社工名单
+ * @return
+ */
+ @ApiOperation(value = "导入社工名单")
+ @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+ public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String fileName = file.getOriginalFilename(); //获取文件名
+ log.info("传入文件名字【{}】",fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("导入模板失败【{}】", e.getMessage());
+ return R.fail("信息有误");
+ }
+ return R.ok();
+ }
+
+
+// @GetMapping("/getTemplate")
+// @ApiOperation("获取模板")
+// public R getTemplate(){
+// return R.ok(comactsocialworkerUrl);
+// }
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java
new file mode 100644
index 0000000..6ddd83b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActSocialWorkerServiceApi.java
@@ -0,0 +1,70 @@
+package com.panzhihua.applets.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:42
+ */
+@RestController
+@RequestMapping("comActSocialWorkerService")
+@Api(tags = {"社工服务"})
+public class ComActSocialWorkerServiceApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setUserId(this.getUserId());
+ return this.communityService.selectAllComActSocialWorkerService(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActSocialWorkerService(id);
+ }
+
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO) {
+ return communityService.updateComActSocialWorkerService(comActSocialWorkerServiceVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
index 63946e3..2fff881 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/StreetApi.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,18 +52,20 @@
@PostMapping("addstreet")
public R pageStreet(@RequestBody ComStreetVO comStreetVO) {
R r = communityService.addStreet(comStreetVO);
-// if (R.isOk(r)) {
-// AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
-// administratorsUserVO.setAccount(comStreetVO.getAccount());
-// administratorsUserVO.setPassword(comStreetVO.getPassword());
-// administratorsUserVO.setType(4);
-// administratorsUserVO.setAreaId(null);
-// administratorsUserVO.setStatus(1);
-// administratorsUserVO.setRoleId(999999999l);
-// administratorsUserVO.setUserId(this.getUserId());
-// administratorsUserVO.setCommunityId(this.getCommunityId());
-// userService.addUserBackstage(administratorsUserVO);
-// }
+ R<ComStreetVO> r = communityService.addStreet(comStreetVO);
+ if (R.isOk(r)) {
+ AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
+ administratorsUserVO.setAccount(comStreetVO.getAccount());
+ administratorsUserVO.setPassword(comStreetVO.getPassword());
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAreaId(null);
+ administratorsUserVO.setStatus(1);
+ administratorsUserVO.setSocialType(1);
+ administratorsUserVO.setRoleId(777777777L);
+ administratorsUserVO.setUserId(this.getUserId());
+ administratorsUserVO.setStreetId(r.getData().getStreetId());
+ userService.addUserBackstageProperty(administratorsUserVO);
+ }
return r;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index a631de2..e104862 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -137,6 +137,10 @@
*/
public static final String CONVENIENT_MERCHANT_ROLE_KEY = "convenient_merchant_platform";
/**
+ * 街道超级管理员
+ */
+ public static final String STREET_ROLE_KEY="street_member";
+ /**
* 首页商城是否展示（1.是 2.否）
*/
public static final Integer IS_SHOP_OPEN = 2;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java
new file mode 100644
index 0000000..736af4f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java
@@ -0,0 +1,61 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 便民服务导入监听
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+public class ComActSocialWorkerExcelListen extends AnalysisEventListener<ComActSocialWorkerExcelVO> {
+
+ private CommunityService communityService;
+
+ private Long communityId;
+
+ public ComActSocialWorkerExcelListen(CommunityService communityService, Long communityId) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ }
+
+
+ private static final int BATCH_COUNT = 5000;
+ private List<ComActSocialWorkerExcelVO> list = new ArrayList<>();
+
+ @Override
+ public void invoke(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO, AnalysisContext analysisContext) {
+ list.add(comActSocialWorkerExcelVO);
+ // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+ if (list.size() >= BATCH_COUNT) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ //清空list
+ list.clear();
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+ log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);//确保最后遗留的数据保存在数据库中
+ if (!R.isOk(r)) {
+ throw new ServiceException(r.getMsg());
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java
new file mode 100644
index 0000000..4de3034
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java
@@ -0,0 +1,70 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActSocialExportVO {
+ /**
+ * 姓名 列: name
+ */
+ @ExcelProperty(value = "姓名")
+ private String name;
+ /**
+ * 联系电话 列: telephone
+ */
+ @ExcelProperty(value = "联系电话",index = 4)
+ private String telephone;
+ /**
+ * 性别0女1男 列: gen
+ */
+ @ExcelProperty(value = "性别",index = 2)
+ private Integer gen;
+ /**
+ * 出生日期 列: birthday
+ */
+ @ExcelProperty(value = "出生日期",index = 3)
+ private String birthday;
+ /**
+ * 社工证编号 列: social_worker_code
+ */
+ @ExcelProperty(value = "社工证号码",index = 1)
+ private String socialWorkerCode;
+
+ /**
+ * 所属街道 列: street_id
+ */
+ @ExcelProperty(value = "所属街道",index = 5)
+ private Long streetId;
+ /**
+ * 所属社区 列: community_id
+ */
+ @ExcelProperty(value = "所属社区",index = 6)
+ private Long communityId;
+
+ /**
+ * 技能领域 列: skill_field
+ */
+ @ExcelProperty(value = "技能领域",index = 9)
+ private String skillField;
+ /**
+ * 业务范围 列: business_scope
+ */
+ @ExcelProperty(value = "业务范围",index = 10)
+ private String businessScope;
+
+ /**
+ * 所属组织ID 列: social_org_id
+ */
+ @ExcelProperty(value = "所属机构",index = 7)
+ private Long socialOrgId;
+
+ /**
+ * 社工资质 列: social_qua
+ */
+ @ExcelProperty(value = "社工资质",index = 8)
+ private Long socialQua;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
new file mode 100644
index 0000000..79ad4d4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
@@ -0,0 +1,124 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+import javax.validation.constraints.Digits;
+import javax.validation.constraints.*;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import org.hibernate.validator.constraints.Length;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("创建社工请求参数")
+public class ComActSocialWorkerAddDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+ @NotBlank() @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+ @NotBlank() @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private Long streetId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String skillTypeName;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java
new file mode 100644
index 0000000..9288b01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java
@@ -0,0 +1,30 @@
+package com.panzhihua.common.model.dtos.civil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 删除表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("删除社工请求参数")
+public class ComActSocialWorkerDeleteDTO {
+
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java
new file mode 100644
index 0000000..0fceba1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java
@@ -0,0 +1,112 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.*;
+import java.math.*;
+import java.util.Date;
+
+/**
+ * 编辑表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("编辑社工请求参数")
+public class ComActSocialWorkerEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private Long streetId;
+
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java
new file mode 100644
index 0000000..6216b67
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+public class ComActSocialWorkerExcelVO {
+
+ /**
+ * 姓名 列: name
+ */
+ @ExcelProperty(value = "姓名",index = 0)
+ private String name;
+ /**
+ * 身份证 列: social_worker_code
+ */
+ @ExcelProperty(value = "身份证号码",index = 1)
+ private String idCard;
+
+ /**
+ * 性别0女1男 列: gen
+ */
+ @ExcelProperty(value = "性别0女1男",index = 2)
+ private String gen;
+ /**
+ * 入职时间
+ */
+ @ExcelProperty(value = "入职时间",index = 3)
+ private Date joinTime;
+ /**
+ * 联系电话 列: telephone
+ */
+ @ExcelProperty(value = "联系电话",index = 4)
+ private String telephone;
+
+ /**
+ * 学历 列: street_id
+ */
+ @ExcelProperty(value = "学历",index = 5)
+ private String education;
+ /**
+ * 所属社区 列: community_id
+ */
+ @ExcelProperty(value = "所属社区",index = 6)
+ private String communityId;
+
+ /**
+ * 政治面貌
+ */
+ @ExcelProperty(value = "政治面貌",index = 7)
+ private String politicalOutlook;
+
+
+ /**
+ * 民族 列: social_qua
+ */
+ @ExcelProperty(value = "民族",index = 8)
+ private String nation;
+ /**
+ * 社工证
+ */
+ @ExcelProperty(value = "社工证",index = 9)
+ private String credential;
+ /**
+ * 住址
+ */
+ @ExcelProperty(value = "住址",index = 10)
+ private String address;
+ /**
+ * 年龄
+ */
+ @ExcelProperty(value = "年龄",index = 11)
+ private Integer age;
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
new file mode 100644
index 0000000..acd6b0b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java
@@ -0,0 +1,145 @@
+package com.panzhihua.common.model.dtos.civil;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.*;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("查询社工请求参数")
+public class PageComActSocialWorkerDTO {
+
+ @ApiModelProperty(value = "分页-当前页数,默认：1", example = "1", position = 1)
+ private Long pageNum = 1L;
+
+ @ApiModelProperty(value = "分页-每页记录数,默认：10", example = "10", position = 2)
+ private Long pageSize = 10L;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "ID", hidden = false, example = "1")
+ private Long id;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
+ private Long socialOrgId;
+
+
+ @Length(max=32)
+ @ApiModelProperty(value = "姓名", hidden = false, example = "")
+ private String name;
+
+
+ @Length(max=32)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String telephone;
+
+
+ @Length(max=1)
+ @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
+ private String gen;
+
+ @Length(max=32)
+ @ApiModelProperty(value = "所属街道", hidden = false, example = "")
+ private String streetId;
+
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
+ private Long communityId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "创建人", hidden = false, example = "1")
+ private Long createBy;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "更新人", hidden = false, example = "1")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+ @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
+ private String userName;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ @ApiModelProperty(value = "关键字搜索")
+ private String keyword;
+
+ @ApiModelProperty(value = "年龄开始")
+ private Integer ageBegin;
+
+ @ApiModelProperty(value = "年龄结束")
+ private Integer ageEnd;
+
+ @ApiModelProperty("活动id")
+ private Long activityId;
+
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
index 23be99d..2713cc2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java
@@ -61,4 +61,8 @@
private Long communityId;
@ApiModelProperty("商家id")
private Long merchantId;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+ @ApiModelProperty("分类2")
+ private Integer type2;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
new file mode 100644
index 0000000..234259a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java
@@ -0,0 +1,93 @@
+package com.panzhihua.common.model.vos;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActSocialMemberVO {
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 社会组织id
+ */
+ @ApiModelProperty(value = "社会组织id")
+ private Long orgId;
+
+ /**
+ * 职位
+ */
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 账号
+ */
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ /**
+ * 密码
+ */
+ @ApiModelProperty(value = "密码")
+ private String password;
+
+ /**
+ * 状态1启用 0停用
+ */
+ @ApiModelProperty(value = "状态1启用 0停用")
+ private Integer status;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 所属组织
+ */
+ @ApiModelProperty(value = "所属组织")
+ private String orgName;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
index a847501..7dbd3a0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -184,6 +184,9 @@
@ApiModelProperty("是否社区工作人员 1.是 2.否")
private Integer isCommunityWorker;
+ @ApiModelProperty("是否社工 1.是 2.否")
+ private Integer isSocialWorker;
+
@ApiModelProperty("实名认证地址")
private String address;
@@ -196,4 +199,9 @@
private String appSecret;
@ApiModelProperty("areaCode")
private String areaCode;
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
+ private Integer userType;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java
new file mode 100644
index 0000000..6736868
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java
@@ -0,0 +1,115 @@
+package com.panzhihua.common.model.vos.civil;
+
+import java.util.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("社工详细返回参数")
+public class ComActSocialWorkerDetailsVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "所属组织ID")
+ private Long socialOrgId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "联系电话")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男")
+ private Integer gen;
+
+ @ApiModelProperty(value = "所属街道")
+ private Long streetId;
+
+ @ApiModelProperty(value = "所属社区")
+ private Long communityId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillTypeName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
new file mode 100644
index 0000000..978687a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
@@ -0,0 +1,119 @@
+package com.panzhihua.common.model.vos.civil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Data
+@ApiModel("社工返回参数")
+public class ComActSocialWorkerVO {
+
+ @ApiModelProperty(value = "ID")
+ private Long id;
+
+ @ApiModelProperty(value = "所属组织ID")
+ private String socialOrgId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "联系电话")
+ private String telephone;
+
+ @ApiModelProperty(value = "性别0女1男")
+ private String gen;
+
+ @ApiModelProperty(value = "所属街道")
+ private String streetId;
+
+ @ApiModelProperty(value = "所属社区")
+ private String communityId;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ @ApiModelProperty(value = "分类名称")
+ private String skillTypeName;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 6f2ff35..202342e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -180,7 +180,7 @@
@ApiModelProperty("活动参加志愿者人员集合")
private List<ActivitySignVO> activityVolunteerList;
- @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+ @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
private Integer type;
@ApiModelProperty("活动创建时间")
@@ -245,4 +245,13 @@
private String activityType;
private String areaCode;
+
+ @ApiModelProperty("项目Id")
+ private Long projectId;
+
+ @ApiModelProperty("项目名称")
+ private String projectName;
+
+ @ApiModelProperty("社工数")
+ private Integer socialCount;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java
new file mode 100644
index 0000000..fa92a21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnLevelVO.java
@@ -0,0 +1,66 @@
+package com.panzhihua.common.model.vos.community;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel
+public class ComActColumnLevelVO {
+ private Long id;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String name;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 修改人
+ */
+ @ApiModelProperty(value = "修改人")
+ private String updateBy;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "修改时间")
+ private Date updateTime;
+
+ /**
+ * 状态 0禁用 1启用
+ */
+ @ApiModelProperty(value = "状态 0禁用 1启用")
+ private Integer status;
+
+ /**
+ * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
+ */
+ @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
+ private Integer type;
+
+ private Long communityId;
+
+ @ApiModelProperty(value = "父类id")
+ private Long parentId;
+ @ApiModelProperty(value = "二级目录集合")
+ List<ComActColumnVO> comActColumnVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
index 59d6f4a..09dbe23 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActColumnVO.java
@@ -51,11 +51,13 @@
private Integer status;
/**
- * 分类类型 1服务类型分类 2技能分类 3通知公告
+ * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
*/
- @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
+ @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
private Integer type;
private Long communityId;
+ @ApiModelProperty(value = "父类id")
+ private Long parentId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
index b874f70..37fae3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -242,4 +242,37 @@
@ApiModelProperty("权限id")
private Long roleId;
+
+ @ApiModelProperty("状态")
+ private Integer status;
+
+ @ApiModelProperty("成立方式 1社区孵化 2民政注册")
+ private Integer buildType;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("服务类型")
+ private Long serviceType;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("服务类型名称")
+ private String serviceName;
+
+ @ApiModelProperty("所属机构名称")
+ private String streetName;
+
+ @ApiModelProperty("是否三社 0否1是")
+ private Integer isSociety;
+
+ /**
+ * 描述
+ */
+ @ApiModelProperty("描述")
+ private String description;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java
new file mode 100644
index 0000000..48b57ab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkBaseInfo.java
@@ -0,0 +1,31 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("大屏首页数据")
+public class BigScreenHmkBaseInfo {
+ @ApiModelProperty("项目管理")
+ private BigScreenHmkProjectInfo bigScreenHmkProjectInfo;
+ @ApiModelProperty("项目数")
+ private Integer projectCount;
+ @ApiModelProperty("活动数")
+ private Integer activityCount;
+ @ApiModelProperty("社工数")
+ private Integer socialWorkerCount;
+ @ApiModelProperty("居民数")
+ private Integer userCount;
+ @ApiModelProperty("社会组织数")
+ private Integer socialOrgCount;
+ @ApiModelProperty("服务次数")
+ private Integer serviceCount;
+ @ApiModelProperty("社会组织管理")
+ private BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo;
+ @ApiModelProperty("社工分析数据")
+ private BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java
new file mode 100644
index 0000000..10e4de9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectInfo.java
@@ -0,0 +1,25 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目数据")
+public class BigScreenHmkProjectInfo {
+ @ApiModelProperty("项目数")
+ private Integer count;
+ @ApiModelProperty("项目类型饼状图")
+ private List<BigScreenHmkProjectTypeInfo> typeInfoList;
+ @ApiModelProperty("项目活动类型饼状图")
+ private List<BigScreenHmkProjectTypeInfo> activityTypeInfoList;
+ @ApiModelProperty("已分派")
+ private Integer assigned;
+ @ApiModelProperty("待分派")
+ private Integer assign;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java
new file mode 100644
index 0000000..81d2908
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkProjectTypeInfo.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目饼状图")
+public class BigScreenHmkProjectTypeInfo {
+ @ApiModelProperty("名字")
+ private String name;
+ @ApiModelProperty("数量")
+ private Integer count;
+ @ApiModelProperty("百分比")
+ private Integer percent;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java
new file mode 100644
index 0000000..7c6d487
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialOrgInfo.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社会组织饼状图")
+public class BigScreenHmkSocialOrgInfo {
+ @ApiModelProperty("总数")
+ private Integer count;
+ @ApiModelProperty("服务数")
+ private Integer serviceCount;
+ @ApiModelProperty("组织分类图")
+ List<BigScreenHmkProjectTypeInfo> typeInfoList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java
new file mode 100644
index 0000000..923cc01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenHmkSocialWorkerInfo.java
@@ -0,0 +1,19 @@
+package com.panzhihua.common.model.vos.community.bigscreen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("社工基础数据")
+public class BigScreenHmkSocialWorkerInfo {
+ @ApiModelProperty("社工年龄分布")
+ private List<BigScreenHmkProjectTypeInfo> socialWorkerAge;
+ @ApiModelProperty("社工技能分析")
+ private List<BigScreenHmkProjectTypeInfo> socialWorkerSkill;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java
new file mode 100644
index 0000000..d1431f3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeCount.java
@@ -0,0 +1,21 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("礼品统计")
+public class ComActRafflePrizeCount {
+ @ApiModelProperty("总数")
+ private Integer total;
+ @ApiModelProperty("剩下")
+ private Integer surplus;
+ @ApiModelProperty("礼品列表")
+ private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java
new file mode 100644
index 0000000..b5c2d69
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRafflePrizeVO.java
@@ -0,0 +1,59 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+@Data
+@ApiModel("抽奖活动奖品表")
+public class ComActRafflePrizeVO implements Serializable {
+
+ private static final long serialVersionUID = 706879121724104929L;
+
+ private Long id;
+
+ /**
+ * 奖品名称
+ */
+ @ApiModelProperty(value = "奖品名称")
+ private String name;
+
+ /**
+ * 总数
+ */
+ @ApiModelProperty(value = "总数")
+ private Integer total;
+
+ /**
+ * 剩余
+ */
+ @ApiModelProperty(value = "剩余")
+ private Integer surplus;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 抽奖活动id
+ */
+ @ApiModelProperty(value = "抽奖活动id")
+ private Long raffleId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java
new file mode 100644
index 0000000..ebb4e2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleRecordVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:01
+ */
+@Data
+@ApiModel("抽奖活动中奖记录表")
+public class ComActRaffleRecordVO implements Serializable {
+
+ private static final long serialVersionUID = 201328912468431601L;
+
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 奖品id
+ */
+ @ApiModelProperty(value = "奖品id")
+ private Long prizeId;
+
+ /**
+ * 核销人
+ */
+ @ApiModelProperty(value = "核销人")
+ private Long staffId;
+
+ /**
+ * 核销时间
+ */
+ @ApiModelProperty(value = "核销时间")
+ private Date staffTime;
+
+ @ApiModelProperty(value = "0 已参加 1待兑奖 2已兑奖 3已失效")
+ private Integer status;
+
+ @ApiModelProperty(value = "抽奖id")
+ private Long raffleId;
+
+ @ApiModelProperty(value = "核销人名称")
+ private String staffName;
+
+ @ApiModelProperty(value = "奖品名称")
+ private String prizeName;
+
+ @ApiModelProperty(value = "奖品图片")
+ private String image;
+
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "姓名")
+ private String username;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
new file mode 100644
index 0000000..feb45ef
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/raffle/ComActRaffleVO.java
@@ -0,0 +1,157 @@
+package com.panzhihua.common.model.vos.community.raffle;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 抽奖活动表(ComActRaffle)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:19
+ */
+@Data
+@ApiModel("抽奖活动表")
+public class ComActRaffleVO implements Serializable {
+
+ private static final long serialVersionUID = -19557136291047637L;
+
+ private Long id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 开始时间
+ */
+ @ApiModelProperty(value = "开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date stopTime;
+
+ /**
+ * 开奖时间
+ */
+ @ApiModelProperty(value = "开奖时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date lotteryTime;
+
+ /**
+ * 兑奖开始时间
+ */
+ @ApiModelProperty(value = "兑奖开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStartTime;
+
+ /**
+ * 兑奖结束时间
+ */
+ @ApiModelProperty(value = "兑奖结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date raffleStopTime;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty(value = "工作时间")
+ private String workTime;
+
+ /**
+ * 地址
+ */
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String phone;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 状态 0未开始 1报名中 2待开奖 3已开奖
+ */
+ @ApiModelProperty(value = "状态 0未开始 1报名中 2待开奖 3已开奖")
+ private Integer status;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "奖品数量")
+ private Integer prizeCount;
+
+ @ApiModelProperty(value = "参与人数")
+ private Integer joinCount;
+
+ @ApiModelProperty(value = "中奖人数")
+ private Integer raffleCount;
+
+ @ApiModelProperty(value = "待兑换奖品数量")
+ private Integer waitRaffleCount;
+
+ @ApiModelProperty(value = "创建人名称")
+ private String createName;
+
+ @ApiModelProperty(value = "奖品集合")
+ private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
+
+ @ApiModelProperty(value = "中奖情况")
+ private ComActRaffleRecordVO comActRaffleRecordVO;
+
+ @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
+ private Integer joinStatus;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java
new file mode 100644
index 0000000..b536bda
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectMemberVO.java
@@ -0,0 +1,82 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 项目人员(ComActSocialProjectMember)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:42
+ */
+@Data
+@ApiModel("项目人员")
+public class ComActSocialProjectMemberVO implements Serializable {
+
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 类型 1社工 2志愿者
+ */
+ @ApiModelProperty(value = "类型 1社工 2志愿者")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ /**
+ * 所属社区
+ */
+ @ApiModelProperty(value = "社区名称")
+ private String communityName;
+
+ @ApiModelProperty(value = "人员Id")
+ private Long paramId;
+
+ @ApiModelProperty(value = "ids")
+ private List<Long> ids;
+
+ private Long communityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
new file mode 100644
index 0000000..5160d9e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectPublicityVO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:54
+ */
+@Data
+@ApiModel("项目宣传表")
+public class ComActSocialProjectPublicityVO {
+
+
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 封面图
+ */
+ @ApiModelProperty(value = "封面图")
+ private String image;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 是否置顶 0否 1是
+ */
+ @ApiModelProperty(value = "是否置顶")
+ private Integer isTop;
+
+ @ApiModelProperty(value = "项目名称")
+ private String name;
+
+ @ApiModelProperty(value="责任方")
+ private String responsibility;
+
+ @ApiModelProperty(value = "街道名字")
+ private String streetName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java
new file mode 100644
index 0000000..fe19606
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialProjectScheduleVO.java
@@ -0,0 +1,50 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:15
+ */
+@Data
+@ApiModel("项目进度表")
+public class ComActSocialProjectScheduleVO{
+
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java
new file mode 100644
index 0000000..5fbdddd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/ComActSocialWorkerServiceVO.java
@@ -0,0 +1,84 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:41
+ */
+@Data
+@ApiModel("社工服务表")
+public class ComActSocialWorkerServiceVO implements Serializable {
+
+ private Long id;
+
+ /**
+ * 社工id
+ */
+ @ApiModelProperty(value = "社工id")
+ private Long workerId;
+
+ /**
+ * 发起人id
+ */
+ @ApiModelProperty(value = "发起人id")
+ private Long senderId;
+
+ /**
+ * 服务状态 0待执行 1已完成
+ */
+ @ApiModelProperty(value = "服务状态 0待执行 1已完成")
+ private Integer status;
+
+ /**
+ * 内容id
+ */
+ @ApiModelProperty(value = "内容id")
+ private Long serviceId;
+
+ /**
+ * 服务类型 1微心愿 2随手拍
+ */
+ @ApiModelProperty(value = "服务类型 1微心愿 2随手拍")
+ private Integer serviceType;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 汇报内容
+ */
+ @ApiModelProperty(value = "汇报内容")
+ private String resultContent;
+
+ /**
+ * 汇报图片
+ */
+ @ApiModelProperty(value = "汇报图片")
+ private String resultUrl;
+
+ /**
+ * 得分
+ */
+ @ApiModelProperty(value = "得分")
+ private Integer score;
+
+ @ApiModelProperty("发起人姓名")
+ private String senderName;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java
new file mode 100644
index 0000000..3ee36bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/social/SocialProjectVO.java
@@ -0,0 +1,146 @@
+package com.panzhihua.common.model.vos.community.social;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("项目实体")
+public class SocialProjectVO {
+
+ private Long id;
+
+ /**
+ * 项目名称
+ */
+ @ApiModelProperty(value = "项目名称")
+ private String name;
+
+ /**
+ * 项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他
+ */
+ @ApiModelProperty(value = "项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他")
+ private Integer type;
+
+ /**
+ * 项目状态 1初创项目 2公开发布 3运作中 4 已结束
+ */
+ @ApiModelProperty(value = "项目状态 1初创项目 2公开发布 3运作中 4 已结束")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 责任方
+ */
+ @ApiModelProperty(value = "责任方")
+ private String responsibility;
+
+ /**
+ * 父项目id
+ */
+ @ApiModelProperty(value = "父项目id")
+ private Long parentId;
+
+ /**
+ * 附件
+ */
+ @ApiModelProperty(value = "附件")
+ private String url;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String image;
+
+ /**
+ * 介绍
+ */
+ @ApiModelProperty(value = "介绍")
+ private String content;
+
+ /**
+ * 项目等级
+ */
+ @ApiModelProperty(value = "项目等级")
+ private Integer level;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 社区名字
+ */
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ /**
+ * 街道名字
+ */
+ @ApiModelProperty(value = "街道名字")
+ private String streetName;
+
+ /**
+ * 街道电话
+ */
+ @ApiModelProperty(value = "街道电话")
+ private String streetPhone;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long columnId;
+
+ /**
+ * 二级分类id
+ */
+ @ApiModelProperty(value = "二级分类id")
+ private Long secondColumnId;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String columnName;
+
+ /**
+ * 二级分类
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String secondColumnName;
+
+ @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
+ private Integer responsibilityType;
+
+ @ApiModelProperty(value = "责任方id")
+ private Long responsibilityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
index 296610e..3d87a0b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
@@ -87,4 +87,10 @@
@ApiModelProperty("跳转状态")
private Integer jumpType;
+
+ @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
+ private Integer policyType;
+
+ @ApiModelProperty("排序方式 正序 ASC")
+ private String sort;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
index b391f6a..c50b75c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -93,4 +93,12 @@
private String areaCode;
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "三社账户类型 1街道 2社会组织 3社会组织成员")
+ private Integer socialType;
+
+ @ApiModelProperty("社会组织id")
+ private Long orgId;
}
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 198ac25..ead47d9 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
@@ -1,10 +1,37 @@
package com.panzhihua.common.service.community;
+import java.io.Serializable;
+import java.util.Date;
import java.util.List;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
+import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.building.admin.*;
+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.*;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.model.vos.community.social.*;
+import io.swagger.annotations.ApiOperation;
+import com.panzhihua.common.model.vos.community.*;
+import org.springframework.beans.BeanUtils;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -264,11 +291,6 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-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;
@@ -1101,7 +1123,6 @@
*
* @param userId
* 用户id
- * @param status
* @return 活动列表
*/
@PostMapping("listactivity")
@@ -2231,7 +2252,7 @@
* @return 新增结果
*/
@PostMapping("/addstreet")
- R addStreet(@RequestBody ComStreetVO comStreetVOO);
+ R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
@@ -8450,4 +8471,400 @@
@PostMapping("/volunteer/import/admin")
R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+ @PostMapping("/screen/hmk/baseInfo")
+ R hmkBaseInfo(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/screen/hmk/partyProjectActivityLine")
+ R partyProjectActivityLine();
+
+ @PostMapping("/screen/hmk/projectActivityTop")
+ R projectActivityProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/{id}")
+ R comActSocialOrgSelectOne(@PathVariable("id") Long id);
+
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialOrg/selectByUserId")
+ R selectOneByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialMember/queryAll")
+ public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialMember/{id}")
+ public R comActSocialMemberSelectOne(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialMember")
+ public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 批量新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember/batch")
+ public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialMember/update")
+ public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialMember/del")
+ public R comActSocialMemberDelete(@RequestParam("id") Long id);
+
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialWorker/add")
+ R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/edit")
+ R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @PostMapping("/comActSocialWorker/page")
+ R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>
+
+ /**
+ * 删除社工
+ * @param comActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/comActSocialWorker/delete")
+ R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @PostMapping("/comActSocialWorker/{id}")
+ R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);
+
+ /**
+ * 批量导入社工
+ *
+ * @param list 社工集合
+ */
+ @PostMapping("/comActSocialWorker/input")
+ R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ *活动查询社工列表
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activity")
+ R activity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 社工查询活动
+ * @param commonPage
+ * @return
+ */
+ @PostMapping("/comActSocialWorker/activityList")
+ R activityList(@RequestBody CommonPage commonPage);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialWorkerService/queryAll")
+ R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialWorkerService/{id}")
+ R selectOneComActSocialWorkerService(@PathVariable("id") Long id);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialWorkerService/update")
+ R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProject/queryAll")
+ R selectAllComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProject/{id}")
+ R selectOneComActSocialProject(@PathVariable("id") Long id);
+
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @PostMapping("/comActSocialProject/getRelation")
+ R getRelationComActSocialProject(@RequestBody CommonPage commonPage);
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProject")
+ R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProject/update")
+ R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProject/del")
+ R deleteComActSocialProject(@RequestParam("id") Long id);
+ /**
+ * 小程序详情接口
+ * @param id
+ * @return
+ */
+ @GetMapping("/comActSocialProject/getApplet")
+ R getAppletComActSocialProject(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectMember/queryAll")
+ public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectMember/{id}")
+ public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectMember")
+ public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectMember/update")
+ public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectMember/del")
+ public R deleteComActSocialProjectMember(@RequestParam("id") Long id);
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectPublicity/queryAll")
+ public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
+ public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);
+
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectPublicity")
+ public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectPublicity/update")
+ public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/del")
+ public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectPublicity/delBatch")
+ public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("/comActSocialProjectSchedule/queryAll")
+ public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/comActSocialProjectSchedule/{id}")
+ public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping("/comActSocialProjectSchedule")
+ public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/comActSocialProjectSchedule/update")
+ public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("/comActSocialProjectSchedule/del")
+ public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);
+
+ /**
+ * 项目分类级联
+ * @param comActColumnVO
+ * @return
+ */
+ @PostMapping("/comActColumn/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);
+
+ @PostMapping("/comActRaffle/queryAll")
+ R selectAllComActRaffle(@RequestBody CommonPage commonPage);
+
+ @GetMapping("/comActRaffle/detail")
+ R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);
+
+ @PostMapping("/comActRaffle")
+ R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @PostMapping("/comActRaffle/update")
+ R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);
+
+ @GetMapping("/comActRaffle/del")
+ R deleteComActRaffle(@RequestParam("id") Long id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
index 7927a8a..9e1651e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -35,6 +35,11 @@
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
@@ -53,6 +58,7 @@
import com.panzhihua.common.model.vos.community.bigscreen.IndexInfo;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
+import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
@@ -555,4 +561,20 @@
}
return communityService.pageEventList(pageBaseDTO);
}
+ @ApiOperation(value = "河门口大屏首页", response = BigScreenHmkBaseInfo.class)
+ @PostMapping("/hmk/baseInfo")
+ public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
+ return communityService.hmkBaseInfo(commonPage);
+ }
+
+ @ApiOperation(value = "河门口大屏折线图", response = BigScreenActivityLine.class)
+ @GetMapping("/hmk/partyProjectActivityLine")
+ public R partyActivityLine(){
+ return communityService.partyProjectActivityLine();
+ }
+ @ApiOperation(value = "河门口活动积分排行", response = ComActActivityVO.class)
+ @PostMapping("/hmk/projectActivityTop")
+ public R projectActivityTop(@RequestBody CommonPage commonPage){
+ return communityService.projectActivityProject(commonPage);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
index ebaa799..6d55418 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActColumnApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.community_backstage.api;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
@@ -102,5 +103,14 @@
public R delete(@RequestParam("id") Long id) {
return this.communityService.comActColumnDelete(id);
}
+
+ /**
+ * 项目分类级联查询
+ */
+ @ApiOperation("项目分类级联查询")
+ @PostMapping("/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
+ return this.communityService.queryLevel(comActColumnVO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java
new file mode 100644
index 0000000..e165748
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleApi.java
@@ -0,0 +1,97 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 抽奖活动表(ComActRaffle)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@Slf4j
+@Api(tags = {"抽奖活动"})
+@RestController
+@RequestMapping("comActRaffle")
+public class ComActRaffleApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ commonPage.setCommunityId(this.getCommunityId());
+ return this.communityService.selectAllComActRaffle(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "详情",response = ComActRaffleVO.class)
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.selectOneComActRaffle(id,0L);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
+ comActRaffleVO.setCommunityId(this.getCommunityId());
+ comActRaffleVO.setCreateBy(this.getUserId());
+ return this.communityService.insertComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.communityService.updateComActRaffle(comActRaffleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.deleteComActRaffle(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java
new file mode 100644
index 0000000..22ae31c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActRaffleRecordApi.java
@@ -0,0 +1,33 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+@Slf4j
+@Api(tags = {"获奖记录"})
+@RestController
+@RequestMapping("comActRaffleRecord")
+public class ComActRaffleRecordApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java
new file mode 100644
index 0000000..b58582e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialMemberApi.java
@@ -0,0 +1,92 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:47
+ */
+@Slf4j
+@Api(tags = {"社会组织成员"})
+@RestController
+@RequestMapping("comActSocialMember")
+public class ComActSocialMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.communityService.comActSocialMemberSelectAll(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("详情")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.communityService.comActSocialMemberSelectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberInsert(comActSocialMember);
+ }
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.communityService.comActSocialMemberUpdate(comActSocialMember);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.communityService.comActSocialMemberDelete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java
index f0b6e7e..ef82829 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialOrgApi.java
@@ -32,9 +32,37 @@
@ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
@PostMapping("queryAll")
public R selectAll(@RequestBody CommonPage commonPage) {
- commonPage.setParamId(this.getCommunityId());
+ if(this.getLoginUserInfo().getCommunityId()!=null){
+ commonPage.setParamId(this.getCommunityId());
+ }
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
return this.communityService.comActSocialOrgSelectAll(commonPage);
}
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id){
+ return this.communityService.comActSocialOrgSelectOne(id);
+ }
+
+ /**
+ * 通过userId查询
+ * @return 单条数据
+ */
+ @ApiOperation("通过userId查询单条数据")
+ @GetMapping("/selectByUserId")
+ public R selectOneByUserId() {
+ return communityService.selectOneByUserId(this.getUserId());
+ }
+
/**
* 新增数据
*
@@ -44,7 +72,12 @@
@ApiOperation("新增社会组织")
@PostMapping
public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
- comActSocialOrg.setCommunityId(this.getCommunityId());
+ if(this.getLoginUserInfo().getCommunityId()!=null){
+ comActSocialOrg.setCommunityId(this.getLoginUserInfo().getCommunityId());
+ }
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ comActSocialOrg.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
return this.communityService.comActSocialOrgInsert(comActSocialOrg);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java
new file mode 100644
index 0000000..01668a1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectApi.java
@@ -0,0 +1,109 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表控制层
+ *
+ * @author zzj
+ * @since 2021-12-22 14:02:48
+ */
+@Slf4j
+@Api(tags = {"项目管理"})
+@RestController
+@RequestMapping("comActSocialProject")
+public class ComActSocialProjectApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProject(commonPage);
+ }
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.getAppletComActSocialProject(id);
+ }
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @ApiOperation(value = "根据项目id分页获取关联项目")
+ @PostMapping("/getRelation")
+ public R getRelation(@RequestBody CommonPage commonPage){
+ return communityService.getRelationComActSocialProject(commonPage);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation(value = "新增数据")
+ @PostMapping
+ public R insert(@RequestBody SocialProjectVO socialProjectVO) {
+ if(this.getLoginUserInfo().getStreetId()!=null){
+ socialProjectVO.setStreetId(this.getLoginUserInfo().getStreetId());
+ }
+ else {
+ socialProjectVO.setCommunityId(this.getCommunityId());
+ }
+ return communityService.insertComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation(value = "修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody SocialProjectVO socialProjectVO) {
+ return communityService.updateComActSocialProject(socialProjectVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation(value = "删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProject(id);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java
new file mode 100644
index 0000000..76cd7c0
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectMemberApi.java
@@ -0,0 +1,106 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+@Slf4j
+@Api(tags = {"项目成员管理"})
+@RestController
+@RequestMapping("comActSocialProjectMember")
+public class ComActSocialProjectMemberApi extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询所有数据")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectMember(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectMember(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ comActSocialProjectMemberVO.setCommunityId(this.getCommunityId());
+ return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+ /**
+ * 批量新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("批量新增数据")
+ @PostMapping("/batch")
+ public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember) {
+ comActSocialMember.setCommunityId(this.getCommunityId());
+ return this.communityService.comActSocialMemberInsertBatch(comActSocialMember);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectMember(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java
new file mode 100644
index 0000000..63874e3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectPublicityApi.java
@@ -0,0 +1,105 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:55
+ */
+@Slf4j
+@Api(tags = {"项目宣传管理"})
+@RestController
+@RequestMapping("comActSocialProjectPublicity")
+public class ComActSocialProjectPublicityApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectPublicity(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectPublicity(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectPublicity(id);
+ }
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("多条删除数据")
+ @PostMapping("delBatch")
+ public R delBatch(@RequestBody List<Long> ids) {
+ return communityService.delBatchComActSocialProjectPublicity(ids);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectScheduleApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectScheduleApi.java
new file mode 100644
index 0000000..f1d2200
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialProjectScheduleApi.java
@@ -0,0 +1,93 @@
+package com.panzhihua.community_backstage.api;
+
+
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+@Slf4j
+@Api(tags = {"项目进度管理"})
+@RestController
+@RequestMapping("comActSocialProjectSchedule")
+public class ComActSocialProjectScheduleApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private CommunityService communityService;
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @ApiOperation("分页查询")
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return communityService.selectAllComActSocialProjectSchedule(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @ApiOperation("通过主键查询单条数据")
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return communityService.selectOneComActSocialProjectSchedule(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @ApiOperation("新增数据")
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @ApiOperation("修改数据")
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @ApiOperation("删除数据")
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return communityService.deleteComActSocialProjectSchedule(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java
new file mode 100644
index 0000000..266a8bf
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActSocialWorkerApi.java
@@ -0,0 +1,156 @@
+package com.panzhihua.community_backstage.api;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
+import com.panzhihua.common.listen.ComCvtServeExcelListen;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-06-03
+ * */
+@Slf4j
+@RestController
+@RequestMapping("/comactsocialworker")
+@Api(tags = {"社工"})
+public class ComActSocialWorkerApi extends BaseController {
+
+ @Resource
+ private CommunityService communityService;
+
+ @Value("${excel.comactsocialworkerUrl}")
+ private String comactsocialworkerUrl;
+ /**
+ * 新增社工
+ * @param {classNameFirstLower}AddDTO 添加社工传递对象
+ * @return 新增结果
+ */
+ @PostMapping()
+ @ApiOperation(value = "新增社工", response = R.class)
+ R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
+ comActSocialWorkerAddDTO.setUserId(getUserId());
+ comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
+ return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
+ }
+
+ /**
+ * 修改
+ * @param comActSocialWorkerEditDTO 修改社工传递对象
+ * @return 修改结果
+ */
+ @PutMapping()
+ @ApiOperation(value = "编辑社工", response = R.class)
+ R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
+ comActSocialWorkerEditDTO.setUserId(getUserId());
+ return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
+ }
+
+ /**
+ * 分页查找
+ * @param pageComActSocialWorkerDTO 查找社工传递对象
+ * @return 查找结果
+ */
+ @GetMapping()
+ @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
+ R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
+ pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
+ return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
+ }
+
+ /**
+ * 删除
+ * @param comActSocialWorkerDeleteDTO 删除社工传递对象
+ * @return 删除结果
+ */
+ @DeleteMapping()
+ @ApiOperation(value = "删除社工", response = R.class)
+ R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO){
+ return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
+ }
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @GetMapping("/{id}")
+ @ApiOperation(value = "查询社工详细信息")
+ R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
+ return communityService.comActSocialWorkerDetails(id);
+ }
+
+ /**
+ * 导入社工名单
+ * @return
+ */
+ @ApiOperation(value = "导入社工名单")
+ @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+ public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
+ String fileName = file.getOriginalFilename(); //获取文件名
+ log.info("传入文件名字【{}】",fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ log.error("导入模板失败【{}】", e.getMessage());
+ return R.fail("信息有误");
+ }
+ return R.ok();
+ }
+
+
+ @GetMapping("/getTemplate")
+ @ApiOperation("获取模板")
+ public R getTemplate(){
+ return R.ok(comactsocialworkerUrl);
+ }
+
+ @ApiOperation("获取活动社工")
+ @PostMapping("/activity")
+ public R activity(@RequestBody CommonPage commonPage){
+ return communityService.activity(commonPage);
+ }
+ @ApiOperation("根据社工获取活动")
+ @PostMapping("/activityList")
+ R activityList(@RequestBody CommonPage commonPage){
+ return communityService.activityList(commonPage);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java
new file mode 100644
index 0000000..d6a4bf5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/StreetApi.java
@@ -0,0 +1,37 @@
+package com.panzhihua.community_backstage.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComStreetVO;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @description: 街道管理
+ * @author: llming
+ **/
+@Api(tags = {"街道管理"})
+@RestController
+@RequestMapping("/streetmanager/")
+public class StreetApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
+
+ @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
+ @PostMapping("pagestreet")
+ public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
+ return communityService.pageStreet(pageComStreetDTO);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
index b1ef9b9..b87abfb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenStatisticsApi.java
@@ -2,6 +2,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
@@ -356,4 +357,20 @@
public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
return bigScreenStatisticsService.pageEventList(pageBaseDTO);
}
+ @PostMapping("/hmk/baseInfo")
+ public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
+ return bigScreenStatisticsService.hmkBaseInfo(commonPage);
+ }
+ @GetMapping("/hmk/partyProjectActivityLine")
+ public R partyActivityLine(){
+ return bigScreenStatisticsService.partyProjectActivityLine();
+ }
+ @PostMapping("/hmk/projectActivityTop")
+ public R projectActivityTop(@RequestBody CommonPage commonPage){
+ return bigScreenStatisticsService.projectActivityProject(commonPage);
+ }
+ @GetMapping("/hmk/projectType")
+ public R projectType(@RequestParam("name") String name){
+ return bigScreenStatisticsService.projectType(name);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
index 706d0d8..f6ca0c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActColumnApi.java
@@ -49,7 +49,7 @@
* @return 单条数据
*/
@GetMapping("{id}")
- public R selectOne(@PathVariable("id") Serializable id) {
+ public R selectOne(@PathVariable("id") Long id) {
return R.ok(this.comActColumnService.getById(id));
}
@@ -79,8 +79,6 @@
return R.ok(this.comActColumnService.updateById(comActColumn));
}
-
-
/**
* 删除数据
*
@@ -91,4 +89,12 @@
public R delete(@RequestParam("id") Long id) {
return this.comActColumnService.delete(id);
}
+
+ /**
+ * 项目分类级联查询
+ */
+ @PostMapping("/queryLevel")
+ public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
+ return this.comActColumnService.queryLevel(comActColumnVO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleApi.java
new file mode 100644
index 0000000..404eb52
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleApi.java
@@ -0,0 +1,89 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.service_community.entity.ComActRaffle;
+import com.panzhihua.service_community.service.ComActRaffleService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 抽奖活动表(ComActRaffle)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@RestController
+@RequestMapping("comActRaffle")
+public class ComActRaffleApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActRaffleService comActRaffleService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActRaffleService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/detail")
+ public R selectOne(@RequestParam("id") Long id,@RequestParam("userId")Long userId) {
+ return this.comActRaffleService.selectById(id,userId);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.comActRaffleService.insert(comActRaffleVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
+ return this.comActRaffleService.update(comActRaffleVO);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.comActRaffleService.delete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRafflePrizeApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRafflePrizeApi.java
new file mode 100644
index 0000000..0f87c27
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRafflePrizeApi.java
@@ -0,0 +1,88 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.service_community.entity.ComActRafflePrize;
+import com.panzhihua.service_community.service.ComActRafflePrizeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:46
+ */
+@RestController
+@RequestMapping("comActRafflePrize")
+public class ComActRafflePrizeApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActRafflePrizeService comActRafflePrizeService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActRafflePrizeService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return R.ok(this.comActRafflePrizeService.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRafflePrize 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActRafflePrize comActRafflePrize) {
+ return R.ok(this.comActRafflePrizeService.save(comActRafflePrize));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRafflePrize 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRafflePrize comActRafflePrize) {
+ return R.ok(this.comActRafflePrizeService.updateById(comActRafflePrize));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActRafflePrizeService.removeById(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
new file mode 100644
index 0000000..ec307df
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActRaffleRecordApi.java
@@ -0,0 +1,92 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.service_community.entity.ComActRaffleRecord;
+import com.panzhihua.service_community.service.ComActRaffleRecordService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+@RestController
+@RequestMapping("comActRaffleRecord")
+public class ComActRaffleRecordApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActRaffleRecordService comActRaffleRecordService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActRaffleRecordService.pageList(commonPage);
+ }
+ @GetMapping("/queryPrize")
+ public R queryPrize(@RequestParam("id")Long id){
+ return this.comActRaffleRecordService.queryPrize(id);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Serializable id) {
+ return R.ok(this.comActRaffleRecordService.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActRaffleRecord 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActRaffleRecord comActRaffleRecord) {
+ return R.ok(this.comActRaffleRecordService.save(comActRaffleRecord));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActRaffleRecord 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActRaffleRecord comActRaffleRecord) {
+ return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActRaffleRecordService.removeById(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java
new file mode 100644
index 0000000..084bcb3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialMemberApi.java
@@ -0,0 +1,87 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.service_community.entity.ComActSocialMember;
+import com.panzhihua.service_community.service.ComActSocialMemberService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:47
+ */
+@RestController
+@RequestMapping("comActSocialMember")
+public class ComActSocialMemberApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialMemberService comActSocialMemberService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialMemberService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActSocialMemberService.detail(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.comActSocialMemberService.insert(comActSocialMember);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialMember 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
+ return this.comActSocialMemberService.update(comActSocialMember);
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return this.comActSocialMemberService.delete(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java
index 52c0fbc..26df63d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialOrgApi.java
@@ -40,6 +40,28 @@
public R selectAll(@RequestBody CommonPage commonPage) {
return this.comActSocialOrgService.pageList(commonPage);
}
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActSocialOrgService.selectById(id);
+ }
+
+ /**
+ * 通过userId查询
+ *
+ * @param userId 主键
+ * @return 单条数据
+ */
+ @GetMapping("/selectByUserId")
+ public R selectOneByUserId(@RequestParam("userId") Long userId) {
+ return R.ok(this.comActSocialOrgService.getOne(new QueryWrapper<ComActSocialOrg>().lambda().eq(ComActSocialOrg::getUserId,userId)));
+ }
/**
* 新增数据
*
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
new file mode 100644
index 0000000..7b15fa6
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java
@@ -0,0 +1,116 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.service_community.entity.ComActSocialProject;
+import com.panzhihua.service_community.service.ComActSocialProjectService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-22 14:02:48
+ */
+@RestController
+@RequestMapping("comActSocialProject")
+public class ComActSocialProjectApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialProjectService comActSocialProjectService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialProjectService.pageList(commonPage);
+ }
+
+ /**
+ * 平台详情接口
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActSocialProjectService.getByBackstage(id);
+ }
+ /**
+ * 根据项目id分页获取关联项目
+ */
+ @PostMapping("/getRelation")
+ public R getRelation(@RequestBody CommonPage commonPage){
+ return this.comActSocialProjectService.getProject(commonPage);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody SocialProjectVO socialProjectVO) {
+ ComActSocialProject comActSocialProject=new ComActSocialProject();
+ BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
+ comActSocialProject.setCreateTime(new Date());
+ if(socialProjectVO.getLevel()>1){
+ ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId());
+ comActSocialProject.setColumnId(comActSocialProject1.getColumnId());
+ comActSocialProject.setSecondColumnId(comActSocialProject1.getSecondColumnId());
+ }
+ return R.ok(this.comActSocialProjectService.save(comActSocialProject));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param socialProjectVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody SocialProjectVO socialProjectVO) {
+ ComActSocialProject comActSocialProject=new ComActSocialProject();
+ BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
+ return R.ok(this.comActSocialProjectService.updateById(comActSocialProject));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActSocialProjectService.removeById(id));
+ }
+
+ /**
+ * 小程序详情接口
+ * @param id
+ * @return
+ */
+ @GetMapping("/getApplet")
+ public R getApplet(@RequestParam("id") Long id){
+ return this.comActSocialProjectService.getByApplet(id);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java
new file mode 100644
index 0000000..c2b3d41
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectMemberApi.java
@@ -0,0 +1,96 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.service_community.entity.ComActSocialProjectMember;
+import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+@RestController
+@RequestMapping("comActSocialProjectMember")
+public class ComActSocialProjectMemberApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialProjectMemberService comActSocialProjectMemberService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialProjectMemberService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return R.ok(this.comActSocialProjectMemberService.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ return this.comActSocialProjectMemberService.insert(comActSocialProjectMemberVO);
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectMemberVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ return R.ok(this.comActSocialProjectMemberService.updateById(comActSocialProjectMember));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActSocialProjectMemberService.removeById(id));
+ }
+
+ @PostMapping("/batch")
+ public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO){
+ return R.ok(this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java
new file mode 100644
index 0000000..f3fa78c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectPublicityApi.java
@@ -0,0 +1,118 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
+import com.panzhihua.service_community.service.ComActSocialProjectPublicityService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:55
+ */
+@RestController
+@RequestMapping("comActSocialProjectPublicity")
+public class ComActSocialProjectPublicityApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialProjectPublicityService comActSocialProjectPublicityService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialProjectPublicityService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return R.ok(this.comActSocialProjectPublicityService.getById(id));
+ }
+
+ /**
+ * 小程序通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("/getByApplet/{id}")
+ public R getByApplet(@PathVariable("id") Long id) {
+ ComActSocialProjectPublicity comActSocialProjectPublicity=this.comActSocialProjectPublicityService.getById(id);
+ comActSocialProjectPublicity.setViews(comActSocialProjectPublicity.getViews()+1);
+ this.comActSocialProjectPublicityService.updateById(comActSocialProjectPublicity);
+ return this.comActSocialProjectPublicityService.selectOne(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ ComActSocialProjectPublicity comActSocialProjectPublicity=new ComActSocialProjectPublicity();
+ BeanUtils.copyProperties(comActSocialProjectPublicityVO,comActSocialProjectPublicity);
+ comActSocialProjectPublicity.setCreateTime(new Date());
+ return R.ok(this.comActSocialProjectPublicityService.save(comActSocialProjectPublicity));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectPublicityVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
+ ComActSocialProjectPublicity comActSocialProjectPublicity=new ComActSocialProjectPublicity();
+ BeanUtils.copyProperties(comActSocialProjectPublicityVO,comActSocialProjectPublicity);
+ return R.ok(this.comActSocialProjectPublicityService.updateById(comActSocialProjectPublicity));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActSocialProjectPublicityService.removeById(id));
+ }
+ /**
+ * 多条删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("delBatch")
+ public R delBatch(@RequestParam("ids") List<Long> ids) {
+ return R.ok(this.comActSocialProjectPublicityService.removeByIds(ids));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectScheduleApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectScheduleApi.java
new file mode 100644
index 0000000..9914750
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectScheduleApi.java
@@ -0,0 +1,95 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
+import com.panzhihua.service_community.service.ComActSocialProjectScheduleService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表控制层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+@RestController
+@RequestMapping("comActSocialProjectSchedule")
+public class ComActSocialProjectScheduleApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialProjectScheduleService comActSocialProjectScheduleService;
+
+ /**
+ * 根据projectId查询所有进度
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialProjectScheduleService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return R.ok(this.comActSocialProjectScheduleService.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ ComActSocialProjectSchedule comActSocialProjectSchedule=new ComActSocialProjectSchedule();
+ BeanUtils.copyProperties(comActSocialProjectScheduleVO,comActSocialProjectSchedule);
+ comActSocialProjectSchedule.setCreateTime(new Date());
+ return R.ok(this.comActSocialProjectScheduleService.save(comActSocialProjectSchedule));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialProjectScheduleVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
+ ComActSocialProjectSchedule comActSocialProjectSchedule=new ComActSocialProjectSchedule();
+ BeanUtils.copyProperties(comActSocialProjectScheduleVO,comActSocialProjectSchedule);
+ return R.ok(this.comActSocialProjectScheduleService.updateById(comActSocialProjectSchedule));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActSocialProjectScheduleService.removeById(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java
new file mode 100644
index 0000000..b43f51f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerApi.java
@@ -0,0 +1,106 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.service_community.entity.ComActSocialWorker;
+import com.panzhihua.service_community.service.ComActSocialWorkerService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 社工(ComActSocialWorker)表控制层
+ *
+ * @author makejava
+ * @since 2021-10-25 10:56:48
+ */
+@RestController
+@RequestMapping("comActSocialWorker")
+public class ComActSocialWorkerApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialWorkerService comActSocialWorkerService;
+
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/add")
+ R add(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ return comActSocialWorkerService.add(comActSocialWorkerAddDTO);
+ };
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/edit")
+ R edit(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
+ return comActSocialWorkerService.edit(comActSocialWorkerEditDTO);
+ };
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @PostMapping("/page")
+ R<IPage<ComActSocialWorkerVO>> query(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
+ return comActSocialWorkerService.query(pageComActSocialWorkerDTO);
+ };
+
+ /**
+ * 删除社工
+ * @param ComActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/delete")
+ R delete(@RequestBody ComActSocialWorkerDeleteDTO ComActSocialWorkerDeleteDTO){
+ return comActSocialWorkerService.delete(ComActSocialWorkerDeleteDTO);
+ };
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @PostMapping("/{id}")
+ R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
+ return comActSocialWorkerService.comActSocialWorkerDetails(id);
+ }
+
+ /**
+ * 导入社工名单
+ * @param list
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/input")
+ R export(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId){
+ return comActSocialWorkerService.export(list,communityId);
+ }
+ @PostMapping("/activity")
+ R activity(@RequestBody CommonPage commonPage){
+ return comActSocialWorkerService.activity(commonPage);
+ }
+ @PostMapping("/activityList")
+ R activityList(@RequestBody CommonPage commonPage){
+ return comActSocialWorkerService.activityList(commonPage);
+ }
+}
+
+
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerServiceApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerServiceApi.java
new file mode 100644
index 0000000..8b0f08b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialWorkerServiceApi.java
@@ -0,0 +1,92 @@
+package com.panzhihua.service_community.api;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.service_community.entity.ComActSocialWorkerService;
+import com.panzhihua.service_community.service.ComActSocialWorkerServiceService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表控制层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:42
+ */
+@RestController
+@RequestMapping("comActSocialWorkerService")
+public class ComActSocialWorkerServiceApi {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private ComActSocialWorkerServiceService comActSocialWorkerServiceService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param commonPage 查询实体
+ * @return 所有数据
+ */
+ @PostMapping("queryAll")
+ public R selectAll(@RequestBody CommonPage commonPage) {
+ return this.comActSocialWorkerServiceService.pageList(commonPage);
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable("id") Long id) {
+ return this.comActSocialWorkerServiceService.selectById(id);
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param comActSocialWorkerService 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody ComActSocialWorkerService comActSocialWorkerService) {
+ return R.ok(this.comActSocialWorkerServiceService.save(comActSocialWorkerService));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param comActSocialWorkerServiceVO 实体对象
+ * @return 修改结果
+ */
+ @PostMapping("/update")
+ public R update(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO) {
+ ComActSocialWorkerService comActSocialWorkerService=new ComActSocialWorkerService();
+ BeanUtils.copyProperties(comActSocialWorkerServiceVO,comActSocialWorkerService);
+ return R.ok(this.comActSocialWorkerServiceService.updateById(comActSocialWorkerService));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键结合
+ * @return 删除结果
+ */
+ @GetMapping("del")
+ public R delete(@RequestParam("id") Long id) {
+ return R.ok(this.comActSocialWorkerServiceService.removeById(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
index 4d4812a..c5cb049 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/StreetApi.java
@@ -37,7 +37,7 @@
*/
@PostMapping("addstreet")
@Transactional(rollbackFor = Exception.class)
- public R addStreet(@RequestBody ComStreetVO comStreetVO) {
+ public R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVO) {
return comStreetService.addStreet(comStreetVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
index 87f0c2a..99048ff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -65,9 +65,14 @@
+ "AND a.`status` != 1 AND a.`status` != 6 " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
+ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} "
+ " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
- + "AND a.volunteer_max!=0 " + " </if> "
- + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 "
- + " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
+ + "AND a.volunteer_max!=0 and is_project = 0 " + " </if> "
+ + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0 and is_project = 0 "
+ + " </if> "
+ + "<if test='comActActivityVO.type != null and comActActivityVO.type==4 '>" + "AND is_project = 1 "
+ + " </if> "
+ + "<if test='comActActivityVO.projectId != null'>" + "AND project_id = #{comActActivityVO.projectId} "
+ + " </if> "
+ + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
// @Select("SELECT " + "u.name sponsorName, " + "ca.name communityName, "
@@ -270,4 +275,19 @@
StatisticsCommVO getActTotalPolylineData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct, @Param("date") String date);
IPage<ComActActivityVO> indexActList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("isResidentAct") boolean isResidentAct);
+
+ /**
+ * 查询项目活动列表
+ * @param page
+ * @return
+ */
+ IPage<ActActivityListVO> selectProjectActivity(Page page);
+
+ /**
+ * 根据社工id查询活动列表
+ * @param page
+ * @param id
+ * @return
+ */
+ IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
index abff41e..0cd504b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActColumnDao.java
@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.ComActColumnLevelVO;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActColumn;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 分类列表(ComActColumn)表数据库访问层
@@ -24,4 +28,10 @@
*/
IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);
+ /**
+ * 项目级联查询
+ * @param comActColumnVO
+ * @return
+ */
+ List<ComActColumnLevelVO> queryLevel(ComActColumnVO comActColumnVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleDao.java
new file mode 100644
index 0000000..f1e7792
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleDao.java
@@ -0,0 +1,37 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActRaffle;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 抽奖活动表(ComActRaffle)表数据库访问层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:19
+ */
+@Mapper
+public interface ComActRaffleDao extends BaseMapper<ComActRaffle> {
+ /**
+ * 分页查询列表
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActRaffleVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ ComActRaffleVO selectById(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRafflePrizeDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRafflePrizeDao.java
new file mode 100644
index 0000000..91e0b90
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRafflePrizeDao.java
@@ -0,0 +1,35 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeCount;
+import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActRafflePrize;
+
+import java.util.List;
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表数据库访问层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+@Mapper
+public interface ComActRafflePrizeDao extends BaseMapper<ComActRafflePrize> {
+ /**
+ * 根据抽奖id查询奖品列表
+ * @param id
+ * @return
+ */
+ List<ComActRafflePrizeVO> selectByRaffleId(Long id);
+
+ /**
+ *
+ * 查询奖品统计
+ * @param id
+ * @return
+ */
+ ComActRafflePrizeCount selectCount(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleRecordDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleRecordDao.java
new file mode 100644
index 0000000..fafc8c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActRaffleRecordDao.java
@@ -0,0 +1,38 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActRaffleRecord;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表数据库访问层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:01
+ */
+@Mapper
+public interface ComActRaffleRecordDao extends BaseMapper<ComActRaffleRecord> {
+ /**
+ * 根据用户id活动id查询中奖情况
+ * @param userId
+ * @param raffleId
+ * @return
+ */
+ ComActRaffleRecordVO selectByUserId(@Param("userId")Long userId,@Param("raffleId")Long raffleId);
+
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActRaffleRecordVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java
new file mode 100644
index 0000000..a126354
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialMemberDao.java
@@ -0,0 +1,33 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialMember;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:46
+ */
+@Mapper
+public interface ComActSocialMemberDao extends BaseMapper<ComActSocialMember> {
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActSocialMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 详情
+ * @return
+ */
+ ComActSocialMemberVO detail(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
index 9ccff44..c7bfe73 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialOrgDao.java
@@ -5,9 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 社会组织(ComActSocialOrg)表数据库访问层
@@ -24,4 +28,24 @@
* @return
*/
IPage<ComActSocialOrgVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 主键查询
+ * @param id
+ * @return
+ */
+ ComActSocialOrgVO detail(Long id);
+
+ /**
+ * 查询社会组织数据
+ * @return
+ */
+ BigScreenHmkSocialOrgInfo selectInfo(Long communityId);
+
+
+ /**
+ * 查询社会组织饼状图
+ * @return
+ */
+ List<BigScreenHmkProjectTypeInfo> selectType(Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java
new file mode 100644
index 0000000..20aa3cb
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectDao.java
@@ -0,0 +1,77 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialProject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-22 14:02:46
+ */
+@Mapper
+public interface ComActSocialProjectDao extends BaseMapper<ComActSocialProject> {
+
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<SocialProjectVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 小程序查询项目详情
+ * @param id
+ * @return
+ */
+ SocialProjectVO getByApplet(Long id);
+
+ /**
+ * 河门口大屏项目基础数据
+ * @return
+ */
+ BigScreenHmkProjectInfo selectBaseInfo(Long communityId);
+
+ /**
+ * 河门口大屏项目分类
+ * @param orgName
+ * @param communityId
+ * @return
+ */
+ List<BigScreenHmkProjectTypeInfo> selectType(@Param("orgName")String orgName,@Param("communityId")Long communityId);
+
+ /**
+ * 根据活动类型查询数量
+ * @param type
+ * @return
+ */
+ Integer selectActivity(@Param("type") Integer type,@Param("communityId")Long communityId);
+
+ /**
+ * 首页基础数据
+ * @return
+ */
+ BigScreenHmkBaseInfo selectIndexBaseInfo();
+
+ /**
+ * 河门口大屏活动折线
+ * @param date
+ * @param year
+ * @return
+ */
+ BigScreenActivityLine selectActivityCountMonth(@Param("date") String date,@Param("year") String year);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectMemberDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectMemberDao.java
new file mode 100644
index 0000000..b7d45c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectMemberDao.java
@@ -0,0 +1,28 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialProjectMember;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:42
+ */
+@Mapper
+public interface ComActSocialProjectMemberDao extends BaseMapper<ComActSocialProjectMember> {
+
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActSocialProjectMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java
new file mode 100644
index 0000000..0f22659
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectPublicityDao.java
@@ -0,0 +1,34 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:54
+ */
+@Mapper
+public interface ComActSocialProjectPublicityDao extends BaseMapper<ComActSocialProjectPublicity> {
+ /**
+ * 分页查询
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActSocialProjectPublicityVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ ComActSocialProjectPublicityVO selectOne(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectScheduleDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectScheduleDao.java
new file mode 100644
index 0000000..dae820a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialProjectScheduleDao.java
@@ -0,0 +1,16 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:15
+ */
+@Mapper
+public interface ComActSocialProjectScheduleDao extends BaseMapper<ComActSocialProjectSchedule> {
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java
new file mode 100644
index 0000000..4f890ea
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerDao.java
@@ -0,0 +1,60 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.civil.ComActSocialExportVO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialWorker;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 社工(ComActSocialWorker)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-10-25 10:56:47
+ */
+@Mapper
+public interface ComActSocialWorkerDao extends BaseMapper<ComActSocialWorker> {
+ /**
+ * 分页查询
+ * @param pageComActSocialWorkerDTO
+ * @return
+ */
+ IPage<ComActSocialWorkerVO> findByPage(Page page, @Param("pageComActSocialWorkerDTO") PageComActSocialWorkerDTO pageComActSocialWorkerDTO);
+
+ /**
+ * 导出
+ * @param comActSocialWorkerDO
+ * @return
+ */
+ List<ComActSocialWorkerExcelVO> queryAll(ComActSocialExportVO comActSocialWorkerDO);
+
+ /**
+ * 查询社工人数
+ * @param type
+ * @return
+ */
+ Integer selectType(@Param("type") Integer type,@Param("communityId")Long communityId);
+
+ /**
+ * 社工技能分布查询
+ * @return
+ */
+ List<BigScreenHmkProjectTypeInfo> selectSkillType(Long communityId);
+
+ /**
+ * 活动社工查询
+ * @param page
+ * @param id
+ * @return
+ */
+ IPage<ComActSocialWorkerVO> selectActivity(Page page,@Param("id") Long id);
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.java
new file mode 100644
index 0000000..c8da025
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.java
@@ -0,0 +1,36 @@
+package com.panzhihua.service_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import org.apache.ibatis.annotations.Mapper;
+import com.panzhihua.service_community.entity.ComActSocialWorkerService;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表数据库访问层
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:41
+ */
+@Mapper
+public interface ComActSocialWorkerServiceDao extends BaseMapper<ComActSocialWorkerService> {
+ /**
+ * 根据userId获取服务信息
+ * @param page
+ * @param commonPage
+ * @return
+ */
+ IPage<ComActSocialWorkerServiceVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ ComActSocialWorkerServiceVO getById(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
index 46a0203..1e00d64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActColumn.java
@@ -84,4 +84,6 @@
private Long communityId;
+ private Long parentId;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java
new file mode 100644
index 0000000..62605d1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffle.java
@@ -0,0 +1,134 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 抽奖活动表(ComActRaffle)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:19
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("抽奖活动表")
+public class ComActRaffle implements Serializable {
+
+ private static final long serialVersionUID = -19557136291047637L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ /**
+ * 开始时间
+ */
+ @ApiModelProperty(value = "开始时间")
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ @ApiModelProperty(value = "结束时间")
+ private Date stopTime;
+
+ /**
+ * 开奖时间
+ */
+ @ApiModelProperty(value = "开奖时间")
+ private Date lotteryTime;
+
+ /**
+ * 兑奖开始时间
+ */
+ @ApiModelProperty(value = "兑奖开始时间")
+ private Date raffleStartTime;
+
+ /**
+ * 兑奖结束时间
+ */
+ @ApiModelProperty(value = "兑奖结束时间")
+ private Date raffleStopTime;
+
+ /**
+ * 工作时间
+ */
+ @ApiModelProperty(value = "工作时间")
+ private String workTime;
+
+ /**
+ * 地址
+ */
+ @ApiModelProperty(value = "地址")
+ private String address;
+
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ /**
+ * 联系方式
+ */
+ @ApiModelProperty(value = "联系方式")
+ private String phone;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 状态 0未开始 1报名中 2待开奖 3已开奖
+ */
+ @ApiModelProperty(value = "状态 0未开始 1报名中 2待开奖 3已开奖")
+ private Integer status;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java
new file mode 100644
index 0000000..d1fa05a
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRafflePrize.java
@@ -0,0 +1,66 @@
+package com.panzhihua.service_community.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("抽奖活动奖品表")
+public class ComActRafflePrize implements Serializable {
+
+ private static final long serialVersionUID = 706879121724104929L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 奖品名称
+ */
+ @ApiModelProperty(value = "奖品名称")
+ private String name;
+
+ /**
+ * 总数
+ */
+ @ApiModelProperty(value = "总数")
+ private Integer total;
+
+ /**
+ * 剩余
+ */
+ @ApiModelProperty(value = "剩余")
+ private Integer surplus;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 抽奖活动id
+ */
+ @ApiModelProperty(value = "抽奖活动id")
+ private Long raffleId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java
new file mode 100644
index 0000000..e0d2cde
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActRaffleRecord.java
@@ -0,0 +1,74 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:01
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("抽奖活动中奖记录表")
+public class ComActRaffleRecord implements Serializable {
+
+ private static final long serialVersionUID = 201328912468431601L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 奖品id
+ */
+ @ApiModelProperty(value = "奖品id")
+ private Long prizeId;
+
+ /**
+ * 核销人
+ */
+ @ApiModelProperty(value = "核销人")
+ private Long staffId;
+
+ /**
+ * 核销时间
+ */
+ @ApiModelProperty(value = "核销时间")
+ private Date staffTime;
+
+ @ApiModelProperty(value = "0 已参加 1待兑奖 2已兑奖 3已失效")
+ private Integer status;
+
+ @ApiModelProperty(value = "抽奖id")
+ private Long raffleId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java
new file mode 100644
index 0000000..11de2ad
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialMember.java
@@ -0,0 +1,107 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社会组织成员表(ComActSocialMember)表实体类
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:46
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("社会组织成员表")
+public class ComActSocialMember implements Serializable {
+
+ private static final long serialVersionUID = 279847158941704646L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 社会组织id
+ */
+ @ApiModelProperty(value = "社会组织id")
+ private Long orgId;
+
+ /**
+ * 职位
+ */
+ @ApiModelProperty(value = "职位")
+ private String position;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 账号
+ */
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ /**
+ * 密码
+ */
+ @ApiModelProperty(value = "密码")
+ private String password;
+
+ /**
+ * 状态1启用 0停用
+ */
+ @ApiModelProperty(value = "状态1启用 0停用")
+ private Integer status;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
index 7dd68c1..4b54734 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java
@@ -251,4 +251,25 @@
private String password;
+ @ApiModelProperty("状态")
+ private Integer status;
+
+ @ApiModelProperty("成立方式")
+ private Integer buildType;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("服务类型")
+ private Long serviceType;
+
+ @ApiModelProperty("街道id")
+ private Long streetId;
+
+ @ApiModelProperty("是否三社 0否1是")
+ private Integer isSociety;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
new file mode 100644
index 0000000..35d7301
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProject.java
@@ -0,0 +1,131 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 三社联动项目表(ComActSocialProject)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-22 14:02:46
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("三社联动项目表")
+public class ComActSocialProject implements Serializable {
+
+ private static final long serialVersionUID = -24945028672614601L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 项目名称
+ */
+ @ApiModelProperty(value = "项目名称")
+ private String name;
+
+ /**
+ * 项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他
+ */
+ @ApiModelProperty(value = "项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他")
+ private Integer type;
+
+ /**
+ * 项目状态 1初创项目 2公开发布 3运作中 4 已结束
+ */
+ @ApiModelProperty(value = "项目状态 1初创项目 2公开发布 3运作中 4 已结束")
+ private Integer status;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty(value = "社区id")
+ private Long communityId;
+
+ /**
+ * 街道id
+ */
+ @ApiModelProperty(value = "街道id")
+ private Long streetId;
+
+ /**
+ * 责任方
+ */
+ @ApiModelProperty(value = "责任方")
+ private String responsibility;
+
+ /**
+ * 父项目id
+ */
+ @ApiModelProperty(value = "父项目id")
+ private Long parentId;
+
+ /**
+ * 附件
+ */
+ @ApiModelProperty(value = "附件")
+ private String url;
+
+ /**
+ * 封面
+ */
+ @ApiModelProperty(value = "封面")
+ private String image;
+
+ /**
+ * 介绍
+ */
+ @ApiModelProperty(value = "介绍")
+ private String content;
+
+ /**
+ * 项目等级
+ */
+ @ApiModelProperty(value = "项目等级")
+ private Integer level;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private Long columnId;
+
+ /**
+ * 二级分类id
+ */
+ @ApiModelProperty(value = "二级分类id")
+ private Long secondColumnId;
+
+ @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
+ private Integer responsibilityType;
+
+ @ApiModelProperty(value = "责任方id")
+ private Long responsibilityId;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java
new file mode 100644
index 0000000..d379871
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectMember.java
@@ -0,0 +1,80 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目人员(ComActSocialProjectMember)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:42
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("项目人员")
+public class ComActSocialProjectMember implements Serializable {
+
+ private static final long serialVersionUID = 982451898968415899L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 照片
+ */
+ @ApiModelProperty(value = "照片")
+ private String image;
+
+ /**
+ * 手机号
+ */
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ /**
+ * 类型 1社工 2志愿者
+ */
+ @ApiModelProperty(value = "类型 1社工 2志愿者")
+ private Integer type;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java
new file mode 100644
index 0000000..403a852
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectPublicity.java
@@ -0,0 +1,77 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:54
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("项目宣传表")
+public class ComActSocialProjectPublicity implements Serializable {
+
+ private static final long serialVersionUID = -90937393082259077L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 封面图
+ */
+ @ApiModelProperty(value = "封面图")
+ private String image;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 浏览量
+ */
+ @ApiModelProperty(value = "浏览量")
+ private Integer views;
+
+ /**
+ * 是否置顶 0否 1是
+ */
+ @ApiModelProperty(value = "是否置顶")
+ private Integer isTop;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java
new file mode 100644
index 0000000..8b41a40
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialProjectSchedule.java
@@ -0,0 +1,60 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表实体类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:15
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("项目进度表")
+public class ComActSocialProjectSchedule implements Serializable {
+
+ private static final long serialVersionUID = -17588094441653342L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 项目id
+ */
+ @ApiModelProperty(value = "项目id")
+ private Long projectId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java
new file mode 100644
index 0000000..d6e02f2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorker.java
@@ -0,0 +1,163 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社工(ComActSocialWorker)表实体类
+ *
+ * @author makejava
+ * @since 2021-10-25 13:50:43
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("社工")
+public class ComActSocialWorker implements Serializable {
+
+ private static final long serialVersionUID = 624699365201103858L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 所属组织ID
+ */
+ @ApiModelProperty(value = "所属组织ID")
+ private Long socialOrgId;
+
+ /**
+ * 姓名
+ */
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String telephone;
+
+ /**
+ * 性别0女1男
+ */
+ @ApiModelProperty(value = "性别0女1男")
+ private Integer gen;
+
+ /**
+ * 所属街道
+ */
+ @ApiModelProperty(value = "所属街道")
+ private Long streetId;
+
+ /**
+ * 所属社区
+ */
+ @ApiModelProperty(value = "所属社区")
+ private Long communityId;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createAt;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateAt;
+
+ /**
+ * 身份证
+ */
+ @ApiModelProperty(value = "身份证")
+ private String idCard;
+
+ /**
+ * 分类id
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillType;
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类id")
+ private String skillTypeName;
+ /**
+ * 入职时间
+ */
+ @ApiModelProperty(value = "入职时间")
+ private Date joinTime;
+
+ /**
+ * 住址
+ */
+ @ApiModelProperty(value = "住址")
+ private String address;
+
+ /**
+ * 图片
+ */
+ @ApiModelProperty(value = "图片")
+ private String image;
+
+ /**
+ * 学历
+ */
+ @ApiModelProperty(value = "学历")
+ private String education;
+
+ /**
+ * 政治面貌
+ */
+ @ApiModelProperty(value = "政治面貌")
+ private String politicalOutlook;
+
+ /**
+ * 民族
+ */
+ @ApiModelProperty(value = "民族")
+ private String nation;
+
+ /**
+ * 是否证件 0否 1是
+ */
+ @ApiModelProperty(value = "是否证件 0否 1是")
+ private Integer credential;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java
new file mode 100644
index 0000000..a8d98bd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialWorkerService.java
@@ -0,0 +1,92 @@
+package com.panzhihua.service_community.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表实体类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:41
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("社工服务表")
+public class ComActSocialWorkerService implements Serializable {
+
+ private static final long serialVersionUID = 984587632214927218L;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 社工id
+ */
+ @ApiModelProperty(value = "社工id")
+ private Long workerId;
+
+ /**
+ * 发起人id
+ */
+ @ApiModelProperty(value = "发起人id")
+ private Long senderId;
+
+ /**
+ * 服务状态 0待执行 1已完成
+ */
+ @ApiModelProperty(value = "服务状态 0待执行 1已完成")
+ private Integer status;
+
+ /**
+ * 内容id
+ */
+ @ApiModelProperty(value = "内容id")
+ private Long serviceId;
+
+ /**
+ * 服务类型 1微心愿 2随手拍
+ */
+ @ApiModelProperty(value = "服务类型 1微心愿 2随手拍")
+ private Integer serviceType;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 汇报内容
+ */
+ @ApiModelProperty(value = "汇报内容")
+ private String resultContent;
+
+ /**
+ * 汇报图片
+ */
+ @ApiModelProperty(value = "汇报图片")
+ private String resultUrl;
+
+ /**
+ * 得分
+ */
+ @ApiModelProperty(value = "得分")
+ private Integer score;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ProjectRelationVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ProjectRelationVO.java
new file mode 100644
index 0000000..dcb0f79
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ProjectRelationVO.java
@@ -0,0 +1,23 @@
+package com.panzhihua.service_community.entity;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zzj
+ */
+@Data
+@ApiModel("相关项目")
+public class ProjectRelationVO {
+ @ApiModelProperty("一级父类项目")
+ private SocialProjectVO fatherProjectLevelOne;
+ @ApiModelProperty("二级父类项目")
+ private SocialProjectVO fatherProjectLevelTwo;
+ @ApiModelProperty("子类项目")
+ private IPage<SocialProjectVO> socialProjectVOIPage;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
index 2c484a5..31dfa7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -209,4 +209,14 @@
* 活动类型
*/
private String activityType;
+
+ /**
+ * 是否居民活动
+ */
+ private Integer isProject;
+
+ /**
+ * 项目id
+ */
+ private Long projectId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
index 87daee7..5ed8ed8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/BigScreenStatisticsService.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
/**
@@ -166,4 +167,30 @@
* @return
*/
R pageEventList(PageBaseDTO pageBaseDTO);
+
+ /**
+ * 河门口大屏首页
+ * @return
+ */
+ R hmkBaseInfo(CommonPage commonPage);
+
+ /**
+ * 河门口大屏折线图
+ * @return
+ */
+ R partyProjectActivityLine();
+
+ /**
+ * 活动评分排名
+ * @param commonPage
+ * @return
+ */
+ R projectActivityProject(CommonPage commonPage);
+
+ /**
+ * 根据责任方名字查询项目类型饼状图
+ * @param name
+ * @return
+ */
+ R projectType(String name);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
index 9b6d8f5..68e27e8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActColumnService.java
@@ -3,6 +3,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.entity.ComActColumn;
/**
@@ -26,4 +27,10 @@
* @return
*/
R delete(Long id);
+
+ /**
+ * 项目级联查询
+ * @param comActColumnVO
+ */
+ R queryLevel(ComActColumnVO comActColumnVO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRafflePrizeService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRafflePrizeService.java
new file mode 100644
index 0000000..8af5d2c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRafflePrizeService.java
@@ -0,0 +1,24 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActRafflePrize;
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表服务接口
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+public interface ComActRafflePrizeService extends IService<ComActRafflePrize> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleRecordService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleRecordService.java
new file mode 100644
index 0000000..a4faf21
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleRecordService.java
@@ -0,0 +1,31 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActRaffleRecord;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表服务接口
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+public interface ComActRaffleRecordService extends IService<ComActRaffleRecord> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 查询奖品信息
+ * @param id
+ * @return
+ */
+ R queryPrize(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleService.java
new file mode 100644
index 0000000..8bf7175
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActRaffleService.java
@@ -0,0 +1,54 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.service_community.entity.ComActRaffle;
+
+/**
+ * 抽奖活动表(ComActRaffle)表服务接口
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+public interface ComActRaffleService extends IService<ComActRaffle> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 新增
+ * @param comActRaffleVO
+ * @return
+ */
+ R insert(ComActRaffleVO comActRaffleVO);
+
+ /**
+ * 修改
+ * @param comActRaffleVO
+ * @return
+ */
+ R update(ComActRaffleVO comActRaffleVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ R delete(Long id);
+
+ /**
+ * 详情
+ * @param id
+ * @param userId
+ * @return
+ */
+ R selectById(Long id,Long userId);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java
new file mode 100644
index 0000000..4151149
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialMemberService.java
@@ -0,0 +1,49 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActSocialMember;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表服务接口
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:46
+ */
+public interface ComActSocialMemberService extends IService<ComActSocialMember> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 新增
+ * @param comActSocialMemberVO
+ * @return
+ */
+ R insert(ComActSocialMemberVO comActSocialMemberVO);
+
+ /**
+ * 修改
+ * @param comActSocialMemberVO
+ * @return
+ */
+ R update(ComActSocialMemberVO comActSocialMemberVO);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ R detail(Long id);
+
+ /**
+ * 删除
+ */
+ R delete(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java
new file mode 100644
index 0000000..97bdeb9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectMemberService.java
@@ -0,0 +1,37 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.service_community.entity.ComActSocialProjectMember;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+public interface ComActSocialProjectMemberService extends IService<ComActSocialProjectMember> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 添加人员
+ * @param comActSocialProjectMemberVO
+ * @return
+ */
+ R insert(ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+
+ /**
+ * 批量添加
+ * @param comActSocialProjectMemberVO
+ * @return
+ */
+ R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java
new file mode 100644
index 0000000..c9af5a9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectPublicityService.java
@@ -0,0 +1,29 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:54
+ */
+public interface ComActSocialProjectPublicityService extends IService<ComActSocialProjectPublicity> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ R selectOne(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectScheduleService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectScheduleService.java
new file mode 100644
index 0000000..9685462
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectScheduleService.java
@@ -0,0 +1,22 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+public interface ComActSocialProjectScheduleService extends IService<ComActSocialProjectSchedule> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java
new file mode 100644
index 0000000..ea39c6c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialProjectService.java
@@ -0,0 +1,43 @@
+package com.panzhihua.service_community.service;
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActSocialProject;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-22 14:02:47
+ */
+public interface ComActSocialProjectService extends IService<ComActSocialProject> {
+ /**
+ * 分页查询
+ *
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 小程序获取详情
+ * @param id
+ * @return
+ */
+ R getByApplet(Long id);
+
+ /**
+ * 小程序获取详情
+ * @param id
+ * @return
+ */
+ R getByBackstage(Long id);
+
+ /**
+ * 根据项目id分页查询关联项目
+ * @param commonPage
+ * @return
+ */
+ R getProject(CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java
new file mode 100644
index 0000000..2c564c3
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerService.java
@@ -0,0 +1,77 @@
+package com.panzhihua.service_community.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.service_community.entity.ComActSocialWorker;
+
+import java.util.List;
+
+/**
+ * 社工(ComActSocialWorker)表服务接口
+ *
+ * @author makejava
+ * @since 2021-10-25 10:56:47
+ */
+public interface ComActSocialWorkerService extends IService<ComActSocialWorker> {
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ R add(ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ R edit(ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ R<IPage<ComActSocialWorkerVO>> query(PageComActSocialWorkerDTO pageComActSocialWorkerDTO);
+
+ /**
+ * 删除社工
+ * @param ComActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ R delete(ComActSocialWorkerDeleteDTO ComActSocialWorkerDeleteDTO);
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);
+
+ /**
+ * 导出
+ * @param lis
+ * @param communityId
+ * @return
+ */
+ R export(List<ComActSocialWorkerExcelVO> lis, Long communityId);
+
+ /**
+ * 查询活动社工
+ * @param commonPage
+ * @return
+ */
+ R activity(CommonPage commonPage);
+
+ /**
+ * 根据社工查询活动
+ * @param commonPage
+ * @return
+ */
+ R activityList(CommonPage commonPage);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerServiceService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerServiceService.java
new file mode 100644
index 0000000..4c21d1c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActSocialWorkerServiceService.java
@@ -0,0 +1,31 @@
+package com.panzhihua.service_community.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.service_community.entity.ComActSocialWorkerService;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表服务接口
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:42
+ */
+public interface ComActSocialWorkerServiceService extends IService<ComActSocialWorkerService> {
+ /**
+ * 分页查询
+ * @param commonPage
+ * @return
+ */
+ R pageList(CommonPage commonPage);
+
+ /**
+ * 详情
+ * @param id
+ * @return
+ */
+ R selectById(Long id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java
index 2e0d06c..7ac4b97 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java
@@ -18,7 +18,7 @@
* 街道信息
* @return 新增结果
*/
- R addStreet(ComStreetVO comStreetVO);
+ R<ComStreetVO> addStreet(ComStreetVO comStreetVO);
/**
* 查询社区
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index ddf1531..35ca3e2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -14,6 +14,10 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.community.bigscreen.*;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.service_community.dao.*;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -102,6 +106,18 @@
@Resource
private ComActCommitteeDao comActCommitteeDao;
+
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+
+ @Resource
+ private ComActSocialOrgDao comActSocialOrgDao;
+
+ @Resource
+ private ComActSocialWorkerDao comActSocialWorkerDao;
+
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
/**
* 大数据分析平台-居民自治
@@ -632,6 +648,107 @@
return R.ok(iPage);
}
+ @Override
+ public R hmkBaseInfo(CommonPage commonPage) {
+ BigScreenHmkBaseInfo bigScreenHmkBaseInfo=comActSocialProjectDao.selectIndexBaseInfo();
+ //项目数据
+ BigScreenHmkProjectInfo bigScreenHmkProjectInfo=comActSocialProjectDao.selectBaseInfo(commonPage.getCommunityId());
+ List<BigScreenHmkProjectTypeInfo> typeInfo=comActSocialProjectDao.selectType(null,commonPage.getCommunityId());
+ if(bigScreenHmkProjectInfo.getCount()>0){
+ typeInfo.forEach(bigScreenHmkProjectTypeInfo -> {
+ bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkProjectInfo.getCount());
+ });
+ }
+ bigScreenHmkProjectInfo.setTypeInfoList(typeInfo);
+ //活动数据
+ Integer countAll=comActSocialProjectDao.selectActivity(0,commonPage.getCommunityId());
+ BigScreenHmkProjectTypeInfo jm=new BigScreenHmkProjectTypeInfo();
+ jm.setName("居民活动");
+ jm.setCount(comActSocialProjectDao.selectActivity(2,commonPage.getCommunityId()));
+ if(countAll>0){
+ jm.setPercent(jm.getCount()/countAll);
+ }
+ BigScreenHmkProjectTypeInfo zyz=new BigScreenHmkProjectTypeInfo();
+ zyz.setName("志愿者活动");
+ zyz.setCount(comActSocialProjectDao.selectActivity(1,commonPage.getCommunityId()));
+ if(countAll>0){
+ zyz.setPercent(zyz.getCount()/countAll);
+ }
+ List<BigScreenHmkProjectTypeInfo> activityList=new ArrayList<>();
+ activityList.add(jm);
+ activityList.add(zyz);
+ bigScreenHmkProjectInfo.setActivityTypeInfoList(activityList);
+ //社会组织数据
+ BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo=comActSocialOrgDao.selectInfo(commonPage.getCommunityId());
+ List<BigScreenHmkProjectTypeInfo> typeInfoList= comActSocialOrgDao.selectType(commonPage.getCommunityId());
+ if(bigScreenHmkSocialOrgInfo.getCount()>0){
+ typeInfoList.forEach(bigScreenHmkProjectTypeInfo -> {
+ bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkSocialOrgInfo.getCount());
+ });
+ }
+ bigScreenHmkSocialOrgInfo.setTypeInfoList(typeInfoList);
+ bigScreenHmkBaseInfo.setBigScreenHmkSocialOrgInfo(bigScreenHmkSocialOrgInfo);
+ //社工数据
+ BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo=new BigScreenHmkSocialWorkerInfo();
+ List<BigScreenHmkProjectTypeInfo> socialWorkerList=new ArrayList<>();
+ Integer socialAll=comActSocialWorkerDao.selectType(0,commonPage.getCommunityId());
+ BigScreenHmkProjectTypeInfo ss=new BigScreenHmkProjectTypeInfo();
+ ss.setName("30岁以下");
+ ss.setCount(comActSocialWorkerDao.selectType(1,commonPage.getCommunityId()));
+ if(socialAll>0){
+ ss.setPercent(ss.getCount()/socialAll);
+ }
+ BigScreenHmkProjectTypeInfo wj=new BigScreenHmkProjectTypeInfo();
+ wj.setName("30-59岁");
+ wj.setCount(comActSocialWorkerDao.selectType(2,commonPage.getCommunityId()));
+ if(socialAll>0){
+ wj.setPercent(wj.getCount()/socialAll);
+ }
+ BigScreenHmkProjectTypeInfo ls=new BigScreenHmkProjectTypeInfo();
+ ls.setName("60岁以上");
+ ls.setCount(comActSocialWorkerDao.selectType(3,commonPage.getCommunityId()));
+ if(socialAll>0){
+ ls.setPercent(ls.getCount()/socialAll);
+ }
+ socialWorkerList.add(ss);
+ socialWorkerList.add(wj);
+ socialWorkerList.add(ls);
+ bigScreenHmkSocialWorkerInfo.setSocialWorkerAge(socialWorkerList);
+ List<BigScreenHmkProjectTypeInfo> socialWorkerSkill=comActSocialWorkerDao.selectSkillType(commonPage.getCommunityId());
+ if(socialAll>0){
+ socialWorkerSkill.forEach(bigScreenHmkProjectTypeInfo -> {
+ bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/socialAll);
+ });
+ }
+ bigScreenHmkSocialWorkerInfo.setSocialWorkerSkill(socialWorkerSkill);
+ bigScreenHmkBaseInfo.setBigScreenHmkSocialWorkerInfo(bigScreenHmkSocialWorkerInfo);
+ bigScreenHmkBaseInfo.setBigScreenHmkProjectInfo(bigScreenHmkProjectInfo);
+ return R.ok(bigScreenHmkBaseInfo);
+ }
+
+ @Override
+ public R partyProjectActivityLine() {
+ List<BigScreenActivityLine> bigScreenActivityLines=this.getPastMonth();
+ bigScreenActivityLines.forEach(bigScreenActivityLine -> {
+ BigScreenActivityLine bigScreenActivityLine1=comActSocialProjectDao.selectActivityCountMonth(bigScreenActivityLine.getX(),bigScreenActivityLine.getYear());
+ bigScreenActivityLine.setY(bigScreenActivityLine1.getY());
+ bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY());
+ bigScreenActivityLine.setX(bigScreenActivityLine.getYear().substring(2,4)+"-"+bigScreenActivityLine.getX());
+ });
+
+ return R.ok(bigScreenActivityLines);
+ }
+
+ @Override
+ public R projectActivityProject(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.selectProjectActivity(new Page(commonPage.getPage(),commonPage.getSize())));
+ }
+
+ @Override
+ public R projectType(String name) {
+ return R.ok(comActSocialProjectDao.selectType(name,null));
+ }
+
private Page retrievePage(PageBaseDTO pageBaseDTO) {
Long pageNum = pageBaseDTO.getPageNum();
Long size = pageBaseDTO.getPageSize();
@@ -645,4 +762,16 @@
}
return page;
}
+ public List<BigScreenActivityLine> getPastMonth(){
+ List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
+ for(int i=11;i>=0;i--){
+ BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
+ String date=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"MM");
+ String year=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"yyyy");
+ bigScreenActivityLine.setX(date);
+ bigScreenActivityLine.setYear(year);
+ bigScreenActivityLines.add(bigScreenActivityLine);
+ }
+ return bigScreenActivityLines;
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index a17c5cc..6f571f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -129,7 +129,9 @@
comActActivityDO.setStatus(3);
}
}
-
+ if(comActActivityVO.getType()==4){
+ comActActivityDO.setIsProject(1);
+ }
boolean save = this.save(comActActivityDO);
if (!save) {
return R.fail();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
index a1a90a8..412e6e2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActColumnServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
@@ -41,4 +42,9 @@
return R.ok(comActColumnDao.deleteById(id));
}
+ @Override
+ public R queryLevel(ComActColumnVO comActColumnVO) {
+ return R.ok(this.comActColumnDao.queryLevel(comActColumnVO));
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRafflePrizeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRafflePrizeServiceImpl.java
new file mode 100644
index 0000000..4b96698
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRafflePrizeServiceImpl.java
@@ -0,0 +1,28 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.entity.ComActRafflePrize;
+import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
+import com.panzhihua.service_community.service.ComActRafflePrizeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 抽奖活动奖品表(ComActRafflePrize)表服务实现类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动奖品表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:45
+ */
+@Slf4j
+@Service
+public class ComActRafflePrizeServiceImpl extends ServiceImpl<ComActRafflePrizeDao, ComActRafflePrize> implements ComActRafflePrizeService {
+
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return null;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java
new file mode 100644
index 0000000..deb0422
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleRecordServiceImpl.java
@@ -0,0 +1,42 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeCount;
+import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
+import com.panzhihua.service_community.entity.ComActRaffleRecord;
+import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
+import com.panzhihua.service_community.service.ComActRaffleRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 抽奖活动中奖记录表(ComActRaffleRecord)表服务实现类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动中奖记录表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:32:02
+ */
+@Slf4j
+@Service
+public class ComActRaffleRecordServiceImpl extends ServiceImpl<ComActRaffleRecordDao, ComActRaffleRecord> implements ComActRaffleRecordService {
+ @Resource
+ private ComActRafflePrizeDao comActRafflePrizeDao;
+
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R queryPrize(Long id) {
+ ComActRafflePrizeCount comActRafflePrizeCount= comActRafflePrizeDao.selectCount(id);
+ comActRafflePrizeCount.setComActRafflePrizeVOList(comActRafflePrizeDao.selectByRaffleId(id));
+ return R.ok(comActRafflePrizeCount);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
new file mode 100644
index 0000000..8bac9fe
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
@@ -0,0 +1,128 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
+import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
+import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
+import com.panzhihua.service_community.entity.ComActRaffle;
+import com.panzhihua.service_community.dao.ComActRaffleDao;
+import com.panzhihua.service_community.entity.ComActRafflePrize;
+import com.panzhihua.service_community.entity.ComActRaffleRecord;
+import com.panzhihua.service_community.service.ComActRaffleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 抽奖活动表(ComActRaffle)表服务实现类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 抽奖活动表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-18 14:31:20
+ */
+@Slf4j
+@Service
+public class ComActRaffleServiceImpl extends ServiceImpl<ComActRaffleDao, ComActRaffle> implements ComActRaffleService {
+
+ @Resource
+ private ComActRafflePrizeDao comActRafflePrizeDao;
+ @Resource
+ private ComActRaffleRecordDao comActRaffleRecordDao;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R insert(ComActRaffleVO comActRaffleVO) {
+ ComActRaffle comActRaffle=new ComActRaffle();
+ BeanUtils.copyProperties(comActRaffleVO,comActRaffle);
+ comActRaffle.setCreateTime(new Date());
+ comActRaffle.setStatus(0);
+ int count= this.baseMapper.insert(comActRaffle);
+ if(count>0){
+ if(!CollectionUtils.isEmpty(comActRaffleVO.getComActRafflePrizeVOList())){
+ comActRaffleVO.getComActRafflePrizeVOList().forEach(comActRafflePrizeVO -> {
+ ComActRafflePrize comActRafflePrize=new ComActRafflePrize();
+ BeanUtils.copyProperties(comActRafflePrizeVO,comActRafflePrize);
+ comActRafflePrize.setRaffleId(comActRaffle.getId());
+ comActRafflePrize.setSurplus(comActRafflePrize.getTotal());
+ comActRafflePrizeDao.insert(comActRafflePrize);
+ });
+ }
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R update(ComActRaffleVO comActRaffleVO) {
+ ComActRaffle comActRaffle=new ComActRaffle();
+ BeanUtils.copyProperties(comActRaffleVO,comActRaffle);
+ comActRaffle.setCreateTime(new Date());
+ comActRaffle.setStatus(0);
+ int count=this.baseMapper.updateById(comActRaffle);
+ if(count>0){
+ if(!CollectionUtils.isEmpty(comActRaffleVO.getComActRafflePrizeVOList())){
+ comActRafflePrizeDao.delete(new QueryWrapper<ComActRafflePrize>().lambda().eq(ComActRafflePrize::getRaffleId,comActRaffle.getId()));
+ comActRaffleVO.getComActRafflePrizeVOList().forEach(comActRafflePrizeVO -> {
+ ComActRafflePrize comActRafflePrize=new ComActRafflePrize();
+ BeanUtils.copyProperties(comActRafflePrizeVO,comActRafflePrize);
+ comActRafflePrize.setRaffleId(comActRaffle.getId());
+ comActRafflePrize.setSurplus(comActRafflePrize.getTotal());
+ comActRafflePrizeDao.insert(comActRafflePrize);
+ });
+ }
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R delete(Long id) {
+ int count=this.baseMapper.deleteById(id);
+ if(count>0){
+ comActRafflePrizeDao.delete(new QueryWrapper<ComActRafflePrize>().lambda().eq(ComActRafflePrize::getRaffleId,id));
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R selectById(Long id,Long userId) {
+ ComActRaffleVO comActRaffleVO=this.baseMapper.selectById(id);
+ if(comActRaffleVO!=null){
+ comActRaffleVO.setComActRafflePrizeVOList(comActRafflePrizeDao.selectByRaffleId(id));
+ }
+ if(userId!=null){
+ ComActRaffleRecordVO comActRaffleRecordVO=comActRaffleRecordDao.selectByUserId(userId,id);
+ if(comActRaffleRecordVO!=null){
+ comActRaffleVO.setComActRaffleRecordVO(comActRaffleRecordVO);
+ comActRaffleVO.setJoinStatus(0);
+ }
+ else {
+ if(comActRaffleVO.getStatus()==1){
+ comActRaffleVO.setJoinStatus(1);
+ }
+ else {
+ comActRaffleVO.setJoinStatus(0);
+ }
+ }
+ }
+ return R.ok(comActRaffleVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java
new file mode 100644
index 0000000..595a0d1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialMemberServiceImpl.java
@@ -0,0 +1,103 @@
+package com.panzhihua.service_community.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.ComActSocialMemberVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.entity.ComActSocialMember;
+import com.panzhihua.service_community.dao.ComActSocialMemberDao;
+import com.panzhihua.service_community.service.ComActSocialMemberService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 社会组织成员表(ComActSocialMember)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-10-22 09:52:47
+ */
+@Slf4j
+@Service
+public class ComActSocialMemberServiceImpl extends ServiceImpl<ComActSocialMemberDao, ComActSocialMember> implements ComActSocialMemberService {
+ @Resource
+ private ComActSocialMemberDao comActSocialMemberDao;
+ @Resource
+ private UserService userService;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R insert(ComActSocialMemberVO comActSocialMemberVO) {
+ ComActSocialMember comActSocialMember=new ComActSocialMember();
+ BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember);
+ Integer count=this.comActSocialMemberDao.selectCount(new QueryWrapper<ComActSocialMember>().lambda().eq(ComActSocialMember::getAccount,comActSocialMemberVO.getAccount()).eq(ComActSocialMember::getName,comActSocialMemberVO.getName()));
+ if(count>0){
+ return R.fail("姓名或账号已存在");
+ }
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAccount(comActSocialMemberVO.getAccount());
+ administratorsUserVO.setPassword(comActSocialMemberVO.getPassword());
+ //根据roleId判断是普通社会组织还是定制三社
+ administratorsUserVO.setSocialType(3);
+ administratorsUserVO.setRoleId(777777777L);
+ if(comActSocialMemberVO.getStreetId()!=null){
+ administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId());
+ }
+ administratorsUserVO.setName(comActSocialMemberVO.getName());
+ administratorsUserVO.setPhone(comActSocialMemberVO.getPhone());
+ R r=userService.addUserBackstageProperty(administratorsUserVO);
+ if(R.isOk(r)){
+ comActSocialMember.setCreateTime(new Date());
+ comActSocialMember.setUserId(Long.parseLong(r.getData().toString()));
+ this.comActSocialMemberDao.insert(comActSocialMember);
+ return R.ok();
+ }
+ return r;
+ }
+
+ @Override
+ public R update(ComActSocialMemberVO comActSocialMemberVO) {
+ ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(comActSocialMemberVO.getId());
+ if(comActSocialMember!=null){
+ if(comActSocialMemberVO.getStatus()==0){
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setUserId(comActSocialMember.getUserId());
+ administratorsUserVO.setStatus(0);
+ userService.putUserBackstage(administratorsUserVO);
+ }
+ ComActSocialMember comActSocialMember1=new ComActSocialMember();
+ BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember1);
+ return this.comActSocialMemberDao.updateById(comActSocialMember1)>0?R.ok():R.fail();
+ }
+ return R.fail("参数错误");
+ }
+
+ @Override
+ public R detail(Long id) {
+ return R.ok(this.comActSocialMemberDao.detail(id));
+ }
+
+ @Override
+ public R delete(Long id) {
+ ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(id);
+ if(comActSocialMember!=null){
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setUserId(comActSocialMember.getUserId());
+ userService.deleteUserBackstage(administratorsUserVO);
+ return this.comActSocialMemberDao.deleteById(id)>0?R.ok():R.fail();
+ }
+ return R.fail("参数错误");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
index a5d580a..ebee445 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java
@@ -39,7 +39,7 @@
@Override
public R selectById(Long id) {
- return null;
+ return R.ok(comActSocialOrgDao.detail(id));
}
@Override
@@ -52,8 +52,21 @@
administratorsUserVO.setType(3);
administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
- administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
- administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
+ //根据roleId判断是普通社会组织还是定制三社
+ if(comActSocialOrgVO.getRoleId()==null){
+ administratorsUserVO.setSocialType(2);
+ administratorsUserVO.setRoleId(777777777L);
+ comActSocialOrg.setIsSociety(1);
+ }
+ else {
+ administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
+ }
+ if(comActSocialOrg.getCommunityId()!=null){
+ administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
+ }
+ if(comActSocialOrg.getStreetId()!=null){
+ administratorsUserVO.setStreetId(comActSocialOrg.getStreetId());
+ }
administratorsUserVO.setName(comActSocialOrgVO.getContactName());
administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
R r=userService.addUserBackstageProperty(administratorsUserVO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
new file mode 100644
index 0000000..e9ed04b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectMemberServiceImpl.java
@@ -0,0 +1,124 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
+import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
+import com.panzhihua.service_community.entity.ComActSocialProjectMember;
+import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
+import com.panzhihua.service_community.entity.ComActSocialWorker;
+import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
+import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 项目人员(ComActSocialProjectMember)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-23 15:16:43
+ */
+@Slf4j
+@Service
+public class ComActSocialProjectMemberServiceImpl extends ServiceImpl<ComActSocialProjectMemberDao, ComActSocialProjectMember> implements ComActSocialProjectMemberService {
+
+ @Resource
+ private ComActSocialProjectMemberDao comActSocialProjectMemberDao;
+ @Resource
+ private ComActSocialWorkerDao comActSocialWorkerDao;
+ @Resource
+ private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(this.comActSocialProjectMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R insert(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ if(comActSocialProjectMemberVO.getType()==1){
+ ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(comActSocialProjectMemberVO.getParamId());
+ if(comActSocialWorker!=null){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ return R.ok();
+ }
+ }
+ else {
+ ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(comActSocialProjectMemberVO.getParamId());
+ if(comMngVolunteerMngDO!=null){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
+ comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
+ comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
+ comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ return R.ok();
+ }
+ }
+ return R.fail("参数异常");
+ }
+
+ @Override
+ public R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
+ if(CollectionUtils.isNotEmpty(comActSocialProjectMemberVO.getIds())){
+ comActSocialProjectMemberVO.getIds().forEach(id ->{
+ if(comActSocialProjectMemberVO.getType()==1){
+ ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
+ if(comActSocialWorker!=null){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
+ comActSocialProjectMember.setImage(comActSocialWorker.getImage());
+ comActSocialProjectMember.setName(comActSocialWorker.getName());
+ comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(1);
+ comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
+ }
+ else {
+ ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id);
+ if(comMngVolunteerMngDO!=null){
+ ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
+ BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
+ comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
+ comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
+ comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
+ comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
+ comActSocialProjectMember.setCreateTime(new Date());
+ comActSocialProjectMember.setType(2);
+ comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
+ comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
+ comActSocialProjectMemberDao.insert(comActSocialProjectMember);
+ }
+ }
+ });
+ }
+ return R.ok();
+ }
+
+ public Integer getAge(String idCard){
+ Integer year=Integer.parseInt(idCard.substring(5,9));
+ Integer nowYear= DateUtils.getYear(new Date());
+ return nowYear-year;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java
new file mode 100644
index 0000000..b1f6423
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectPublicityServiceImpl.java
@@ -0,0 +1,36 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
+import com.panzhihua.service_community.dao.ComActSocialProjectPublicityDao;
+import com.panzhihua.service_community.service.ComActSocialProjectPublicityService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目宣传表(ComActSocialProjectPublicity)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:30:55
+ */
+@Slf4j
+@Service
+public class ComActSocialProjectPublicityServiceImpl extends ServiceImpl<ComActSocialProjectPublicityDao, ComActSocialProjectPublicity> implements ComActSocialProjectPublicityService {
+
+ @Resource
+ private ComActSocialProjectPublicityDao comActSocialProjectPublicityDao;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(comActSocialProjectPublicityDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R selectOne(Long id) {
+ return R.ok(comActSocialProjectPublicityDao.selectOne(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectScheduleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectScheduleServiceImpl.java
new file mode 100644
index 0000000..e9ae2a7
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectScheduleServiceImpl.java
@@ -0,0 +1,31 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
+import com.panzhihua.service_community.dao.ComActSocialProjectScheduleDao;
+import com.panzhihua.service_community.service.ComActSocialProjectScheduleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目进度表(ComActSocialProjectSchedule)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-23 14:31:16
+ */
+@Slf4j
+@Service
+public class ComActSocialProjectScheduleServiceImpl extends ServiceImpl<ComActSocialProjectScheduleDao, ComActSocialProjectSchedule> implements ComActSocialProjectScheduleService {
+
+ @Resource
+ private ComActSocialProjectScheduleDao comActSocialProjectScheduleDao;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(comActSocialProjectScheduleDao.selectList(new QueryWrapper<ComActSocialProjectSchedule>().lambda().eq(ComActSocialProjectSchedule::getProjectId,commonPage.getParamId()).orderByDesc(ComActSocialProjectSchedule::getCreateTime)));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
new file mode 100644
index 0000000..5dc54d5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialProjectServiceImpl.java
@@ -0,0 +1,84 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.service_community.entity.ComActSocialProject;
+import com.panzhihua.service_community.dao.ComActSocialProjectDao;
+import com.panzhihua.service_community.entity.ProjectRelationVO;
+import com.panzhihua.service_community.service.ComActSocialProjectService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 三社联动项目表(ComActSocialProject)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-22 14:02:48
+ */
+@Slf4j
+@Service
+public class ComActSocialProjectServiceImpl extends ServiceImpl<ComActSocialProjectDao, ComActSocialProject> implements ComActSocialProjectService {
+
+ @Resource
+ private ComActSocialProjectDao comActSocialProjectDao;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R getByApplet(Long id) {
+ ComActSocialProject comActSocialProject=this.comActSocialProjectDao.selectById(id);
+ comActSocialProject.setViews(comActSocialProject.getViews()+1);
+ comActSocialProjectDao.updateById(comActSocialProject);
+ return R.ok(comActSocialProjectDao.getByApplet(id));
+ }
+
+ @Override
+ public R getByBackstage(Long id) {
+ return R.ok(comActSocialProjectDao.getByApplet(id));
+ }
+
+ @Override
+ public R getProject(CommonPage commonPage) {
+ if(commonPage.getParamId()==null){
+ return R.fail("数据异常");
+ }
+ ProjectRelationVO projectRelationVO=new ProjectRelationVO();
+ ComActSocialProject comActSocialProject=this.comActSocialProjectDao.selectById(commonPage.getParamId());
+ if(comActSocialProject.getLevel()==1){
+ ComActSocialProject comActSocialProject1=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject.getParentId()));
+ if(comActSocialProject1!=null){
+ SocialProjectVO socialProjectVO=new SocialProjectVO();
+ BeanUtils.copyProperties(comActSocialProject1,socialProjectVO);
+ projectRelationVO.setFatherProjectLevelOne(socialProjectVO);
+ }
+
+ }
+ if(comActSocialProject.getLevel()==2){
+ ComActSocialProject comActSocialProject1=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject.getParentId()));
+ if(comActSocialProject1!=null){
+ SocialProjectVO socialProjectVO=new SocialProjectVO();
+ BeanUtils.copyProperties(comActSocialProject1,socialProjectVO);
+ projectRelationVO.setFatherProjectLevelTwo(socialProjectVO);
+ ComActSocialProject comActSocialProject2=this.comActSocialProjectDao.selectOne(new QueryWrapper<ComActSocialProject>().lambda().eq(ComActSocialProject::getId,comActSocialProject1.getParentId()));
+ if(comActSocialProject2!=null){
+ SocialProjectVO socialProjectVO1=new SocialProjectVO();
+ BeanUtils.copyProperties(comActSocialProject2,socialProjectVO1);
+ projectRelationVO.setFatherProjectLevelOne(socialProjectVO1);
+ }
+ }
+ }
+ IPage<SocialProjectVO> socialProjectVOIPage=this.comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
+ projectRelationVO.setSocialProjectVOIPage(socialProjectVOIPage);
+ return R.ok(projectRelationVO);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
new file mode 100644
index 0000000..6a1ca7c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
@@ -0,0 +1,176 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.civil.*;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
+import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.entity.ComActSocialOrg;
+import com.panzhihua.service_community.entity.ComActSocialWorker;
+import com.panzhihua.service_community.model.dos.ComActDO;
+import com.panzhihua.service_community.model.dos.ComStreetDO;
+import com.panzhihua.service_community.service.ComActSocialWorkerService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 社工(ComActSocialWorker)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-10-25 10:56:48
+ */
+@Slf4j
+@Service
+public class ComActSocialWorkerServiceImpl extends ServiceImpl<ComActSocialWorkerDao, ComActSocialWorker> implements ComActSocialWorkerService {
+ @Resource
+ private ComActSocialWorkerDao comActSocialWorkerMapper;
+ @Resource
+ private ComStreetDAO comStreetDAO;
+ @Resource
+ private ComActSocialOrgDao comActSocialOrgMapper;
+ @Resource
+ private ComActDAO comActDAO;
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
+ /**
+ * 新增社工
+ * @param comActSocialWorkerAddDTO
+ * @return 新增结果
+ */
+ @Override
+ public R add(ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
+ ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
+ BeanUtils.copyProperties(comActSocialWorkerAddDTO, comActSocialWorkerDO);
+ comActSocialWorkerDO.setCreateBy(comActSocialWorkerAddDTO.getUserId());
+ if(comActSocialWorkerMapper.insert(comActSocialWorkerDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 修改社工
+ * @param comActSocialWorkerEditDTO
+ * @return 维护结果
+ */
+ @Override
+ public R edit(ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
+ ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
+ BeanUtils.copyProperties(comActSocialWorkerEditDTO, comActSocialWorkerDO);
+ //comActSocialWorkerDO.setUpdateAt(new Date());
+ if(comActSocialWorkerMapper.updateById(comActSocialWorkerDO)>0){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 分页查找社工
+ * @param pageComActSocialWorkerDTO
+ * @return 维护结果
+ */
+ @Override
+ public R<IPage<ComActSocialWorkerVO>> query(PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
+ Page page = new Page(1,10);
+ if(pageComActSocialWorkerDTO.getPageNum()!=null) {
+ page.setCurrent(pageComActSocialWorkerDTO.getPageNum());
+ }
+ if(pageComActSocialWorkerDTO.getPageSize()!=null) {
+ page.setSize(pageComActSocialWorkerDTO.getPageSize());
+ }
+ return R.ok(comActSocialWorkerMapper.findByPage(page, pageComActSocialWorkerDTO));
+ }
+
+ /**
+ * 删除社工
+ * @param ComActSocialWorkerDeleteDTO
+ * @return 平台用户信息
+ */
+ @Override
+ public R delete(ComActSocialWorkerDeleteDTO ComActSocialWorkerDeleteDTO){
+ return R.ok(this.comActSocialWorkerMapper.deleteById(ComActSocialWorkerDeleteDTO.getId()));
+ }
+
+ /**
+ * 查询社工详细信息
+ * @param id 社工 id
+ * @return 查找结果
+ */
+ @Override
+ public R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id){
+ ComActSocialWorker comActSocialWorkerDO = comActSocialWorkerMapper.selectById(id);
+ if(comActSocialWorkerDO!=null) {
+ ComActSocialWorkerDetailsVO comActSocialWorkerDetailsVO = new ComActSocialWorkerDetailsVO();
+ BeanUtils.copyProperties(comActSocialWorkerDO, comActSocialWorkerDetailsVO);
+ return R.ok(comActSocialWorkerDetailsVO);
+ }
+ return R.fail();
+ }
+
+ @Override
+ public R export(List<ComActSocialWorkerExcelVO> lis, Long communityId) {
+ if(!CollectionUtils.isEmpty(lis)){
+ List<ComActSocialWorker> list=new ArrayList<>();
+ for(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO:lis) {
+ ComActSocialWorker comActSocialWorkerDO = new ComActSocialWorker();
+ BeanUtils.copyProperties(comActSocialWorkerExcelVO,comActSocialWorkerDO);
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCommunityId())){
+ ComActDO comActDO= comActDAO.selectOne(new QueryWrapper<ComActDO>().eq("name",comActSocialWorkerExcelVO.getCommunityId()));
+ if(comActDO!=null){
+ comActSocialWorkerDO.setCommunityId(comActDO.getCommunityId());
+ }
+ }
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getGen())){
+ if("男".equals(comActSocialWorkerExcelVO.getGen())){
+ comActSocialWorkerDO.setGen(1);
+ }
+ else {
+ comActSocialWorkerDO.setGen(0);
+ }
+ }
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){
+ if("是".equals(comActSocialWorkerExcelVO.getCredential())){
+ comActSocialWorkerDO.setCredential(1);
+ }
+ else {
+ comActSocialWorkerDO.setCredential(0);
+ }
+ }
+ if(StringUtils.isNotEmpty(comActSocialWorkerExcelVO.getCredential())){
+ if("是".equals(comActSocialWorkerExcelVO.getCredential())){
+ comActSocialWorkerDO.setCredential(1);
+ }
+ else {
+ comActSocialWorkerDO.setCredential(0);
+ }
+ }
+ list.add(comActSocialWorkerDO);
+ }
+ this.saveBatch(list);
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public R activity(CommonPage commonPage) {
+ return R.ok(comActSocialWorkerMapper.selectActivity(new Page(commonPage.getPage(),commonPage.getSize()),commonPage.getParamId()));
+ }
+
+ @Override
+ public R activityList(CommonPage commonPage) {
+ return R.ok(comActActivityDAO.selectActivityBySocialWorker(new Page(commonPage.getPage(),commonPage.getSize()),commonPage.getParamId()));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java
new file mode 100644
index 0000000..926d8c5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java
@@ -0,0 +1,39 @@
+package com.panzhihua.service_community.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.property.CommonPage;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
+import com.panzhihua.service_community.entity.ComActSocialWorkerService;
+import com.panzhihua.service_community.dao.ComActSocialWorkerServiceDao;
+import com.panzhihua.service_community.service.ComActSocialWorkerServiceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 社工服务表(ComActSocialWorkerService)表服务实现类
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * description: 社工服务表相关功能
+ *
+ * @author zzj
+ * @since 2022-02-16 15:59:42
+ */
+@Slf4j
+@Service
+public class ComActSocialWorkerServiceServiceImpl extends ServiceImpl<ComActSocialWorkerServiceDao, ComActSocialWorkerService> implements ComActSocialWorkerServiceService {
+
+ @Resource
+ private ComActSocialWorkerServiceDao comActSocialWorkerServiceDao;
+ @Override
+ public R pageList(CommonPage commonPage) {
+ return R.ok(comActSocialWorkerServiceDao.pageList(new Page<>(commonPage.getPage(),commonPage.getSize()),commonPage));
+ }
+
+ @Override
+ public R selectById(Long id) {
+ return R.ok(comActSocialWorkerServiceDao.getById(id));
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
index ed81592..b9ed547 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -4,9 +4,12 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
+import com.panzhihua.common.service.user.UserService;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -37,6 +40,9 @@
@Resource
private ComStreetDAO comStreetDAO;
+ @Resource
+ private UserService userService;
+
/**
* 新增社区
*
@@ -45,7 +51,8 @@
* @return 新增结果
*/
@Override
- public R addStreet(ComStreetVO comStreetVO) {
+ @Transactional
+ public R<ComStreetVO> addStreet(ComStreetVO comStreetVO) {
String password = comStreetVO.getPassword();
String encode = new BCryptPasswordEncoder().encode(password);
comStreetVO.setPassword(encode);
@@ -59,14 +66,26 @@
if (integer > 0) {
return R.fail(500, "街道已经存在");
}
- BeanUtils.copyProperties(comStreetVO, comStreetDO);
- int insert = comStreetDAO.insert(comStreetDO);
- if (insert > 0) {
- ComStreetDO comStreetDO1 = comStreetDAO.selectOne(param);
- BeanUtils.copyProperties(comStreetDO1, comStreetVO);
- return R.ok(comStreetVO);
+ AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
+ administratorsUserVO.setType(3);
+ administratorsUserVO.setAccount(comStreetVO.getAccount());
+ administratorsUserVO.setPassword(comStreetVO.getPassword());
+ administratorsUserVO.setSocialType(1);
+ administratorsUserVO.setRoleId(777777777L);
+ administratorsUserVO.setStreetId(0L);
+ administratorsUserVO.setName(comStreetVO.getName());
+ R r=userService.addUserBackstageProperty(administratorsUserVO);
+ if(R.isOk(r)){
+ BeanUtils.copyProperties(comStreetVO, comStreetDO);
+ int insert = comStreetDAO.insert(comStreetDO);
+ if (insert > 0) {
+ ComStreetDO comStreetDO1 = comStreetDAO.selectOne(param);
+ BeanUtils.copyProperties(comStreetDO1, comStreetVO);
+ return R.ok(comStreetVO);
+ }
+ return R.fail(500, "");
}
- return R.fail(500, "");
+ return R.fail("账号已存在");
}
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
index 2dd515a..d0502aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -74,16 +74,23 @@
SELECT a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max, a.contact_name,
COUNT(if(s.is_volunteer=1,NULL,s.id))participant_now, a.volunteer_max,
COUNT(if(s.is_volunteer=1,s.id,NULL))volunteer_now, a.`status`, a.publish_at, a.is_qr_code,
- a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward
+ a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward , a.cover <if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
FROM com_act_activity a
LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
WHERE a.`status` = 1 AND a.community_id = ${comActActivityVO.communityId}
+ <if test='comActActivityVO.type != null and comActActivityVO.type == 4'>
+ left join (select count(t.id) as socialCount,activity_id from com_act_act_regist t LEFT JOIN sys_user t1 on t.user_id = t1.user_id LEFT JOIN com_act_social_worker t2 on t1.phone = t2.telephone where t2.id is not null GROUP BY t.activity_id) so on a.id = so.activity_id
+ </if>
+ WHERE a.`status` = 1 AND a.community_id=#{comActActivityVO.communityId}
<if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
AND a.volunteer_max != 0
</if>
<if test='comActActivityVO.type != null and comActActivityVO.type == 2'>
AND a.volunteer_max = 0
+ </if>
+ <if test='comActActivityVO.type != null and comActActivityVO.type == 4'>
+ AND a.is_project = 1
</if>
<if test='comActActivityVO.rewardWay != null and comActActivityVO.rewardWay != 0'>
AND a.reward_way = #{comActActivityVO.rewardWay}
@@ -105,16 +112,22 @@
SELECT a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max, a.contact_name,
COUNT(if(s.is_volunteer=1,NULL,s.id))participant_now, a.volunteer_max,
COUNT(if(s.is_volunteer=1,s.id,NULL))volunteer_now, a.`status`, a.publish_at,
- a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward
+ a.is_qr_code, a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward ,a.cover<if test='comActActivityVO.type != null and comActActivityVO.type == 4'>,so.socialCount</if>
FROM com_act_activity a
LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
+ <if test='comActActivityVO.type != null and comActActivityVO.type == 4'>
+ left join (select count(t.id) as socialCount,activity_id from com_act_act_regist t LEFT JOIN sys_user t1 on t.user_id = t1.user_id LEFT JOIN com_act_social_worker t2 on t1.phone = t2.telephone where t2.id is not null GROUP BY t.activity_id) so on a.id = so.activity_id
+ </if>
WHERE a.`status` != 1 AND a.community_id = ${comActActivityVO.communityId}
<if test='comActActivityVO.type != null and comActActivityVO.type == 1'>
AND a.volunteer_max != 0
</if>
<if test='comActActivityVO.type != null and comActActivityVO.type == 2'>
AND a.volunteer_max = 0
+ </if>
+ <if test='comActActivityVO.type != null and comActActivityVO.type == 4'>
+ AND a.is_project = 1
</if>
<if test='comActActivityVO.rewardWay != null and comActActivityVO.rewardWay != 0'>
AND a.reward_way = #{comActActivityVO.rewardWay}
@@ -137,11 +150,12 @@
</select>
<select id="inforActivity" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
SELECT u.name sponsorName, ca.name communityName,
- count(if(s.is_volunteer=1,s.id,null))volunteer_now, count(if(s.is_volunteer=0,s.id,null))participant_now, a.*
+ count(if(s.is_volunteer=1,s.id,null))volunteer_now, count(if(s.is_volunteer=0,s.id,null))participant_now, a.*,t1.name as projectName
FROM com_act_activity a
left join sys_user u on a.sponsor_id=u.user_id
left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id
- left join com_act ca on a.community_id=ca.community_id where a.id = #{id} group by a.id
+ left join com_act ca on a.community_id=ca.community_id left join com_act_social_project t1 on a.project_id = t1.id where a.id = #{id} group by a.id
+
</select>
<select id="listActivityType" resultType="com.panzhihua.common.model.vos.community.ComActActivityTypeVO">
SELECT * FROM com_act_activity_type WHERE `type` = #{type} AND community_id = ${communityId} ORDER BY id ASC
@@ -251,4 +265,21 @@
</if>
ORDER BY id DESC
</select>
+
+ <select id="selectProjectActivity" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
+ SELECT a.id, a.activity_name, u.`name` sponsorName, a.activity_addr, a.participant_max, a.contact_name,
+ COUNT(if(s.is_volunteer=1,NULL,s.id))participant_now, a.volunteer_max,
+ COUNT(if(s.is_volunteer=1,s.id,NULL))volunteer_now, a.`status`, a.publish_at, a.is_qr_code,
+ a.begin_at, a.end_at, a.sign_up_begin, a.sign_up_end, a.reward_way, a.activity_type, a.have_integral_reward , a.cover , t1.evaluateLevel
+ FROM com_act_activity a
+ LEFT JOIN sys_user u ON a.sponsor_id=u.user_id
+ LEFT JOIN (SELECT * FROM com_act_act_sign WHERE `status` = 1) s ON a.id=s.activity_id
+ LEFT JOIN (select AVG(star_level) as evaluateLevel,activity_id from com_act_act_evaluate GROUP BY activity_id) t1 on a.id = t1.activity_id
+ WHERE is_project=1 order by t1.evaluateLevel desc
+ </select>
+
+ <select id="selectActivityBySocialWorker" resultType="com.panzhihua.common.model.vos.community.ComActActivityVO">
+ select t.* from com_act_activity t left join com_act_act_regist t1 on t.id=t1.activity_id where t1.user_id =
+ (select t1.user_id from com_act_social_worker t LEFT JOIN sys_user t1 on t.telephone = t1.phone where t.id = #{id})
+ </select>
</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
index aab16da..74719d4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
@@ -29,8 +29,36 @@
<if test="commonPage.keyword!=null and commonPage.keyword!=''">
and name like concat('%',#{commonPage.keyword},'%')
</if>
+ <if test="commonPage.paramId !=null">
+ and parent_id = #{commonPage.paramId}
+ </if>
</where>
order by create_time desc
</select>
+ <resultMap id="levelMap" type="com.panzhihua.common.model.vos.community.ComActColumnLevelVO">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <collection property="comActColumnVOList" column="id=parent_id" ofType="com.panzhihua.common.model.vos.community.ComActColumnVO" javaType="java.util.ArrayList">
+ <result property="id" column="sid"/>
+ <result property="name" column="sname"/>
+ </collection>
+ </resultMap>
+ <select id="queryLevel" resultMap="levelMap">
+ select t.id,t.name,t1.id as sid,t1.name as sname from com_act_column t left join com_act_column t1 on t.id =t1.parent_id
+ <where>
+ 1=1
+ <if test="communityId !=null ">
+ and t.community_id =#{communityId}
+ </if>
+ <if test="type !=null ">
+ and t.type =#{type}
+ </if>
+ <if test="parentId !=null">
+ and t.parent_id=#{parentId}
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml
new file mode 100644
index 0000000..32eb8d8
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActRaffleDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActRaffle" id="ComActRaffleBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="startTime" column="start_time"/>
+ <result property="stopTime" column="stop_time"/>
+ <result property="lotteryTime" column="lottery_time"/>
+ <result property="raffleStartTime" column="raffle_start_time"/>
+ <result property="raffleStopTime" column="raffle_stop_time"/>
+ <result property="workTime" column="work_time"/>
+ <result property="address" column="address"/>
+ <result property="longitude" column="longitude"/>
+ <result property="latitude" column="latitude"/>
+ <result property="phone" column="phone"/>
+ <result property="cover" column="cover"/>
+ <result property="createTime" column="create_time"/>
+ <result property="status" column="status"/>
+ <result property="createBy" column="create_by"/>
+ <result property="communityId" column="community_id"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO">
+ select t.*,t2.waitRaffleCount,t3.joinCount,t4.name as createName,t5.raffleCount,t6.prizeCount from com_act_raffle t
+ LEFT JOIN (select sum(surplus) as waitRaffleCount,raffle_id from com_act_raffle_prize GROUP BY raffle_id) t2 on t.id = t2.raffle_id
+ LEFT JOIN (select count(*) as joinCount,raffle_id from com_act_raffle_record GROUP BY raffle_id) t3 on t.id = t3.raffle_id
+ LEFT JOIN sys_user t4 on t.create_by = t4.user_id
+ LEFT JOIN (select count(*) as raffleCount,raffle_id from com_act_raffle_record where status >0 GROUP BY raffle_id) t5 on t.id = t5.raffle_id
+ LEFT JOIN (select sum(total) as prizeCount,raffle_id from com_act_raffle_prize GROUP BY raffle_id) t6 on t.id = t6.raffle_id
+ <where>
+ <if test="commonPage.communityId!=null">
+ and t.community_id = #{commonPage.communityId}
+ </if>
+ <if test="commonPage.status !=null">
+ and t.status =#{commonPage.status}
+ </if>
+ <if test="commonPage.keyword !=null">
+ and t.name like concat('%',#{commonPage.keyword},'%')
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+
+ <select id="selectById" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO">
+ select t.*,t2.waitRaffleCount,t3.joinCount,t4.name as createName,t5.raffleCount from com_act_raffle t
+ LEFT JOIN (select sum(surplus) as waitRaffleCount,raffle_id from com_act_raffle_prize GROUP BY raffle_id) t2 on t.id = t2.raffle_id
+ LEFT JOIN (select count(*) as joinCount,raffle_id from com_act_raffle_record GROUP BY raffle_id) t3 on t.id = t3.raffle_id
+ LEFT JOIN sys_user t4 on t.create_by = t4.user_id
+ LEFT JOIN (select count(*) as raffleCount,raffle_id from com_act_raffle_record where status >0 GROUP BY raffle_id) t5 on t.id = t5.raffle_id
+ where t.id=#{id}
+ </select>
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml
new file mode 100644
index 0000000..6d66098
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActRafflePrizeDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActRafflePrize" id="ComActRafflePrizeBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="total" column="total"/>
+ <result property="surplus" column="surplus"/>
+ <result property="image" column="image"/>
+ <result property="raffleId" column="raffle_id"/>
+ </resultMap>
+
+ <select id="selectByRaffleId" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeVO">
+ select * from com_act_raffle_prize where raffle_id = #{id}
+ </select>
+
+ <select id="selectCount" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeCount">
+ select sum(total) as total,sum(surplus) as surplus from com_act_raffle_prize where raffle_id = #{id}
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml
new file mode 100644
index 0000000..3324ae5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActRaffleRecordDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActRaffleRecord" id="ComActRaffleRecordBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="userId" column="user_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="prizeId" column="prize_id"/>
+ <result property="staffId" column="staff_id"/>
+ <result property="staffTime" column="staff_time"/>
+ <result property="status" column="status"/>
+ </resultMap>
+
+ <select id="selectByUserId" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
+ select t.*, t1.`name`, t1.image
+ from com_act_raffle_record t
+ LEFT JOIN com_act_raffle_prize t1 on t.prize_id = t1.id
+ where 1=1 <if test="userId !=null and userId !=0"> and t.user_id = #{userId} </if>
+ and t.raffle_id = #{raffleId}
+ </select>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO">
+ select t.*, t1.image, t1.name as prizeName, t2.nick_name, t2.phone, t2.`name` as username, t3.name as staffName
+ from com_act_raffle_record t
+ left join com_act_raffle_prize t1 on t.staff_id = t1.id
+ left join sys_user t2 on t.user_id = t2.user_id
+ left join sys_user t3 on t.staff_id = t3.user_id
+ <where>
+ <if test="commonPage.status!=null">
+ and t.status = #{commonPage.status}
+ </if>
+ <if test="commonPage.keyword!=null and commonPage.keyword!=''">
+ and (t2.name like concat('%',#{commonPage.keyword},'%') or t2.phone like
+ concat('%',#{commonPage.keyword},'%') or t1.name like concat('%',#{commonPage.keyword},'%') )
+ </if>
+ <if test="commonPage.paramId !=null">
+ and t.raffle_id = #{commonPage.paramId}
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml
new file mode 100644
index 0000000..cc8028d
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialMemberDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialMember" id="ComActSocialMemberBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="phone" column="phone"/>
+ <result property="orgId" column="org_id"/>
+ <result property="position" column="position"/>
+ <result property="idCard" column="id_card"/>
+ <result property="account" column="account"/>
+ <result property="password" column="password"/>
+ <result property="status" column="status"/>
+ <result property="image" column="image"/>
+ <result property="createTime" column="create_time"/>
+ <result property="streetId" column="street_id"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO">
+ select t.*,t1.name as orgName from com_act_social_member t left join com_act_social_org t1 on t.org_id = t1.id
+ <where>
+ 1=1
+ <if test="commonPage.keyword!=null and commonPage.keyword !=''">
+ and (t.name like concat('%',#{commonPage.keyword},'%') or t.phone like concat('%',#{commonPage.keyword},'%') or t.account like concat('%',#{commonPage.keyword},'%') )
+ </if>
+ <if test="commonPage.status!=null ">
+ and t.status = #{commonPage.status}
+ </if>
+ <if test="commonPage.paramId!=null ">
+ and t.org_id = #{commonPage.paramId}
+ </if>
+ <if test="commonPage.streetId!=null ">
+ and t.street_id = #{commonPage.streetId}
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+
+ <select id="detail" resultType="com.panzhihua.common.model.vos.ComActSocialMemberVO">
+ select t.*,t1.name from com_act_social_member t left join com_street t1 on t.street_id = t1.street_id
+ where t.id =#{id}
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
index 3e01510..40fd6b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
@@ -43,16 +43,24 @@
</resultMap>
<select id="pageList" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
- select t.*,t1.account,t1.password,t2.role_id as roleId from com_act_social_org t
+ select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName from com_act_social_org t
left join sys_user t1 on t.user_id = t1.user_id
left join sys_user_role t2 on t.user_id = t2.user_id
+ left join com_street t4 on t.street_id = t4.street_id
+ left join com_act_column t5 on t.service_type = t5.id
<where>
1=1
<if test="commonPage.type!=null">
and t.company_type =#{commonPage.type}
</if>
+ <if test="commonPage.type2!=null">
+ and t.service_type =#{commonPage.type2}
+ </if>
<if test="commonPage.name!=null and commonPage.name!=''">
and t.name like concat(#{commonPage.name},'%')
+ </if>
+ <if test="commonPage.keyword!=null and commonPage.keyword!=''">
+ and (t.name like concat('%',#{commonPage.keyword},'%') or t.contact_phone like concat('%',#{commonPage.keyword},'%') or t.corporation_name like concat(#{commonPage.keyword},'%') )
</if>
<if test="commonPage.serialNo!=null and commonPage.serialNo!=''">
and t.agency_code like concat(#{commonPage.serialNo},'%')
@@ -66,11 +74,42 @@
<if test="commonPage.paramId!=null">
and t.community_id = ${commonPage.paramId}
</if>
+ <if test="commonPage.communityId!=null">
+ and t.community_id =#{commonPage.communityId}
+ </if>
+ <if test="commonPage.streetId!=null">
+ and t.street_id =#{commonPage.streetId}
+ </if>
<if test="commonPage.phone!=null and commonPage.phone!=''">
and t.contact_phone like concat(#{commonPage.phone},'%')
</if>
+ <if test="commonPage.status!=null">
+ and t.status = #{commonPage.status}
+ </if>
+ <if test="commonPage.paramId2!=null">
+ and t.is_society = #{commonPage.paramId2}
+ </if>
+ <if test="commonPage.paramId2==null">
+ and t.is_society is null
+ </if>
</where>
order by t.create_at desc
</select>
+ <select id="detail" resultType="com.panzhihua.common.model.vos.community.ComActSocialOrgVO">
+ select t.*,t1.account,t1.password,t2.role_id as roleId,t4.name as streetName,t5.name as serviceName from com_act_social_org t
+ left join sys_user t1 on t.user_id = t1.user_id
+ left join sys_user_role t2 on t.user_id = t2.user_id
+ left join com_street t4 on t.street_id = t4.street_id
+ left join com_act_column t5 on t.service_type = t5.id
+ where t.id=#{id}
+ </select>
+
+ <select id="selectInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo">
+ select (select count(*) from com_act_social_org where street_id = 15 <if test="communityId!=null"> and community_id = #{communityId}</if>) count
+ </select>
+ <select id="selectType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
+ select count(*) count,t1.name from com_act_social_org t INNER JOIN com_act_column t1 on t.service_type = t1.id where t.street_id = 15 <if test="communityId!=null"> and t.community_id = #{communityId}</if> GROUP BY t1.id
+ </select>
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml
new file mode 100644
index 0000000..7a6df01
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialProjectDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialProject" id="ComActSocialProjectBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="type" column="type"/>
+ <result property="status" column="status"/>
+ <result property="createTime" column="create_time"/>
+ <result property="communityId" column="community_id"/>
+ <result property="streetId" column="street_id"/>
+ <result property="responsibility" column="responsibility"/>
+ <result property="parentId" column="parent_id"/>
+ <result property="url" column="url"/>
+ <result property="image" column="image"/>
+ <result property="content" column="content"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
+ select t.*,t1.name as columnName,t2.name as secondColumnName from com_act_social_project t
+ left join com_act_column t1 on t.column_id = t1.id
+ left join com_act_column t2 on t.second_column_id = t2.id
+ <where>
+ 1=1
+ <if test="commonPage.communityId !=0 and commonPage.communityId !=null">
+ and t.community_id =#{commonPage.communityId}
+ </if>
+ <if test="commonPage.streetId !=0 and commonPage.streetId !=null">
+ and t.street_id =#{commonPage.streetId}
+ </if>
+ <if test="commonPage.status !=null">
+ and t.status =#{commonPage.status}
+ </if>
+ <if test="commonPage.type !=null">
+ and t.type =#{commonPage.type}
+ </if>
+ <if test="commonPage.keyword !=null and commonPage.keyword !=''">
+ and (t.name like concat('%',#{commonPage.keyword},'%') or responsibility like concat('%',#{commonPage.keyword},'%') )
+ </if>
+ <if test="commonPage.beginTime !=null">
+ and t.create_time >= #{commonPage.beginTime}
+ </if>
+ <if test="commonPage.endTime !=null">
+ and #{commonPage.endTime} >= t.create_time
+ </if>
+ <if test="commonPage.paramId !=null">
+ and t.parent_id = #{commonPage.paramId}
+ </if>
+ </where>
+ order by t.create_time desc
+ </select>
+
+ <select id="getByApplet" resultType="com.panzhihua.common.model.vos.community.social.SocialProjectVO">
+ select t.*,t1.phone as streetPhone,t2.name as columnName,t3.name as secondColumnName from com_act_social_project t
+ LEFT JOIN com_street t1 on t.street_id = t1.street_id
+ LEFT JOIN com_act_column t2 on t.column_id = t2.id
+ LEFT JOIN com_act_column t3 on t.second_column_id = t3.id
+ where t.id =#{id}
+ </select>
+
+ <select id="selectBaseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo">
+ select (select count(*) from com_act_social_project where street_id =15 <if test="communityId!=null"> and community_id = #{communityId}</if>) count,
+ (select count(*) from com_act_social_project where street_id =15 and status >=2 <if test="communityId!=null"> and community_id = #{communityId}</if>) assigned,
+ (select count(*) from com_act_social_project where street_id =15 and 1 >=status <if test="communityId!=null"> and community_id = #{communityId}</if>) assign
+ </select>
+
+ <select id="selectType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
+ select count(id) as count,type as name from com_act_social_project where street_id = 15
+ <if test="orgName !=null and orgName!=''">
+ and responsibility=#{orgName}
+ </if>
+ <if test="communityId !=null">
+ and community_id=#{communityId}
+ </if>
+ GROUP BY type
+ </select>
+
+ <select id="selectActivity" resultType="integer">
+ select count(*) from com_act_activity
+ <where>
+ is_project = 1
+ <if test="type =1">
+ and volunteer_max > 0
+ </if>
+ <if test="type =2">
+ and volunteer_max = 0
+ </if>
+ <if test="communityId !=null">
+ and community_id = #{communityId}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectIndexBaseInfo" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo">
+ select (select count(*) from com_act_social_project where street_id = 15) projectCount,
+ (select count(*) from com_act_activity where is_project = 1) activityCount,
+ (select count(*) from com_act_social_worker where street_id = 15) socialWorkerCount,
+ (select count(*) from com_mng_population where street_id = 15) userCount,
+ (select count(*) from com_act_social_org where street_id = 15) socialOrgCount,
+ (select count(*) from com_act_social_worker_service) serviceCount
+ </select>
+
+ <select id="selectActivityCountMonth" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine">
+ select ( select count(id) from com_act_activity where status!=6 and is_project = 1 and publish_at >= DATE_FORMAT( CONCAT(#{year},'-',#{date},'-00'), '%Y-%m-00 00:00:00') and DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=publish_at) y,
+ (select count(id) from com_act_activity where status!=6 and is_project = 1 and DATE_FORMAT( LAST_DAY(CONCAT(#{year},'-',#{date},'-00')), '%Y-%m-%d 23:59:59') >=publish_at) countY
+ </select>
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml
new file mode 100644
index 0000000..3639241
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialProjectMemberDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialProjectMember"
+ id="ComActSocialProjectMemberBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="age" column="age"/>
+ <result property="image" column="image"/>
+ <result property="phone" column="phone"/>
+ <result property="type" column="type"/>
+ <result property="createTime" column="create_time"/>
+ <result property="projectId" column="project_id"/>
+ <result property="communityId" column="community_id"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO">
+ select t.*,t1.name as communityName from com_act_social_project_member t left join com_act t1 on t.community_id = t1.community_id where t.project_id = #{commonPage.paramId}
+ <if test="commonPage.type !=null">
+ and t.type=#{commonPage.type}
+ </if>
+ order by t.create_time desc
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml
new file mode 100644
index 0000000..c3abd51
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialProjectPublicityDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialProjectPublicity"
+ id="ComActSocialProjectPublicityBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="title" column="title"/>
+ <result property="image" column="image"/>
+ <result property="content" column="content"/>
+ <result property="projectId" column="project_id"/>
+ <result property="createTime" column="create_time"/>
+ <result property="views" column="views"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO">
+ select t.*,t1.name,t1.responsibility from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id order by is_top desc,create_time desc
+ </select>
+
+ <select id="selectOne" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO">
+ select t.*,t1.name,t1.responsibility,t2.name as streetName from com_act_social_project_publicity t left join com_act_social_project t1 on t.project_id = t1.id left join com_street t2 on t1.street_id = t2.street_id where t.id = #{id}
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml
new file mode 100644
index 0000000..98b5d0f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialProjectScheduleDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialProjectSchedule"
+ id="ComActSocialProjectScheduleBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="title" column="title"/>
+ <result property="content" column="content"/>
+ <result property="createTime" column="create_time"/>
+ <result property="projectId" column="project_id"/>
+ </resultMap>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml
new file mode 100644
index 0000000..49c3937
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialWorkerDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialWorker" id="ComActSocialWorkerBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="socialOrgId" column="social_org_id"/>
+ <result property="name" column="name"/>
+ <result property="telephone" column="telephone"/>
+ <result property="gen" column="gen"/>
+ <result property="streetId" column="street_id"/>
+ <result property="communityId" column="community_id"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createAt" column="create_at"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateAt" column="update_at"/>
+ <result property="idCard" column="id_card"/>
+ <result property="skillType" column="skill_type"/>
+ <result property="joinTime" column="join_time"/>
+ <result property="address" column="address"/>
+ <result property="image" column="image"/>
+ </resultMap>
+
+ <!-- 分页查询 -->
+ <select id="findByPage" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO"
+ parameterType="com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO">
+ SELECT a.*,b.name as socialOrgId,c.name as communityName,e.name as streetId
+ FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
+ left join com_act c on a.community_id = c.community_id
+ left join com_street e on a.street_id = e.street_id
+ <where>
+ <if test="pageComActSocialWorkerDTO.id!=null">
+ AND a.id = #{pageComActSocialWorkerDTO.id}
+ </if>
+ <if test="pageComActSocialWorkerDTO.socialOrgId!=null">
+ AND a.social_org_id = #{pageComActSocialWorkerDTO.socialOrgId}
+ </if>
+ <if test="pageComActSocialWorkerDTO.name!=null">
+ AND a.name = #{pageComActSocialWorkerDTO.name}
+ </if>
+ <if test="pageComActSocialWorkerDTO.keyword!=null and pageComActSocialWorkerDTO.keyword!=''">
+ AND (a.name like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') or a.telephone like concat('%',#{pageComActSocialWorkerDTO.keyword},'%') )
+ </if>
+ <if test="pageComActSocialWorkerDTO.ageBegin!=null">
+ AND a.age>=#{pageComActSocialWorkerDTO.ageBegin}
+ </if>
+ <if test="pageComActSocialWorkerDTO.ageEnd!=null">
+ AND #{pageComActSocialWorkerDTO.ageEnd} >= a.age
+ </if>
+ <if test="pageComActSocialWorkerDTO.telephone!=null">
+ AND a.telephone = #{pageComActSocialWorkerDTO.telephone}
+ </if>
+ <if test="pageComActSocialWorkerDTO.gen!=null">
+ AND a.gen = #{pageComActSocialWorkerDTO.gen}
+ </if>
+ <if test="pageComActSocialWorkerDTO.streetId!=null">
+ AND a.street_id = #{pageComActSocialWorkerDTO.streetId}
+ </if>
+ <if test="pageComActSocialWorkerDTO.communityId!=null and pageComActSocialWorkerDTO.communityId!=0">
+ AND a.community_id = #{pageComActSocialWorkerDTO.communityId}
+ </if>
+ <if test="pageComActSocialWorkerDTO.createBy!=null">
+ AND a.create_by = #{pageComActSocialWorkerDTO.createBy}
+ </if>
+ <if test="pageComActSocialWorkerDTO.updateBy!=null">
+ AND a.update_by = #{pageComActSocialWorkerDTO.updateBy}
+ </if>
+ </where>
+ </select>
+
+ <select id="queryAll" resultType="com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO">
+ SELECT a.social_org_id,a.name as name,a.birthday,a.telephone,a.gen,a.social_worker_code,a.skill_field,a.business_scope,b.name as socialOrgId,c.name as communityId,e.name as streetId
+ FROM com_act_social_worker a left join com_act_social_org b on a.social_org_id = b.id
+ left join com_act c on a.community_id = c.community_id
+ left join com_street e on a.street_id = e.street_id
+ <where>
+ <if test="socialOrgId!=null">
+ AND a.social_org_id = #{socialOrgId}
+ </if>
+ <if test="name!=null and name !=''">
+ AND a.name like concat('%',#{name},'%')
+ </if>
+ <if test="streetId!=null">
+ AND a.street_id = #{streetId}
+ </if>
+ <if test="communityId!=null and communityId!=0">
+ AND a.community_id = #{communityId}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectType" resultType="Integer">
+ select count(id) from com_act_social_worker where street_id = 15
+ <if test="type ==1">
+ and 30 >age
+ </if>
+ <if test="type ==2">
+ and 59 >=age and age >=30
+ </if>
+ <if test="type ==3">
+ and age >=60
+ </if>
+ <if test="communityId !=null">
+ and community_id=#{communityId}
+ </if>
+ </select>
+
+ <select id="selectSkillType" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo">
+ select count(*) count,t1.name from com_act_social_worker t INNER JOIN com_act_column t1 on t.skill_type = t1.id where t.street_id = 15 <if test="communityId!=null"> and t.community_id = #{communityId}</if> GROUP BY t1.id
+ </select>
+
+ <select id="selectActivity" resultType="com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO">
+ select t.* from com_act_social_worker t LEFT JOIN sys_user t1 on t.telephone = t1.phone where t1.user_id in (select distinct user_id from com_act_act_regist where activity_id =#{id} )
+ </select>
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml
new file mode 100644
index 0000000..a0bcaaa
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_community.dao.ComActSocialWorkerServiceDao">
+
+ <resultMap type="com.panzhihua.service_community.entity.ComActSocialWorkerService"
+ id="ComActSocialWorkerServiceBaseResultMap">
+ <result property="id" column="id"/>
+ <result property="workerId" column="worker_id"/>
+ <result property="senderId" column="sender_id"/>
+ <result property="status" column="status"/>
+ <result property="serviceId" column="service_id"/>
+ <result property="serviceType" column="service_type"/>
+ <result property="createTime" column="create_time"/>
+ <result property="resultContent" column="result_content"/>
+ <result property="resultUrl" column="result_url"/>
+ <result property="score" column="score"/>
+ </resultMap>
+
+ <select id="pageList" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO">
+ select t.*,t1.name as senderName from com_act_social_worker_service t
+ left join sys_user t1 on t.sender_id = t1.user_id
+ left join com_act_social_worker t2 on t.worker_id = t2.id
+ LEFT JOIN sys_user t3 on t2.telephone = t3.phone
+ where 1=1
+ <if test="commonPage.userId!=null">
+ and t3.user_id = #{commonPage.userId}
+ </if>
+ <if test="commonPage.status!=null">
+ and t.status = #{commonPage.status}
+ </if>
+ order by t.create_time desc
+ </select>
+
+ <select id="getById" resultType="com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO">
+ select t.*,t1.name as senderName from com_act_social_worker_service t left join sys_user t1 on t.sender_id = t1.user_id where t.id = #{id}
+ </select>
+
+</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
index d7fd34c..c34d62e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
@@ -31,13 +31,17 @@
// "</script>")
@Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title, d.jump_url, d.jump_type,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
- + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at,t.name as communityName \n"
+ + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at,t.name as communityName,d.policy_type \n"
+ "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id left join com_act t on d.community_id = t.community_id\n"
+ "where d.type=#{partyBuildingComPbDynVO.type} \n"
+ "<if test='partyBuildingComPbDynVO.communityId != null and partyBuildingComPbDynVO.communityId != 0'>"
+ "and d.community_id = ${partyBuildingComPbDynVO.communityId} \n" + " </if> "
+ "<if test='partyBuildingComPbDynVO.dynType != null and partyBuildingComPbDynVO.dynType != 0'>"
+ "and d.dyn_type = #{partyBuildingComPbDynVO.dynType} \n" + " </if> "
+ + "<if test='partyBuildingComPbDynVO.policyType != null and partyBuildingComPbDynVO.policyType != 0'>"
+ + "and d.policy_type = #{partyBuildingComPbDynVO.policyType} \n" + " </if> "
+ + "<if test='partyBuildingComPbDynVO.policyType == 0'>"
+ + "and d.policy_type is not null \n" + " </if> "
+ "<if test='partyBuildingComPbDynVO.title != null and partyBuildingComPbDynVO.title.trim() != ""'>"
+ "and d.title like concat(#{partyBuildingComPbDynVO.title},'%') \n" + " </if> "
+ "<if test='partyBuildingComPbDynVO.status != null and partyBuildingComPbDynVO.status != 0'>"
@@ -45,7 +49,7 @@
+ "<if test='partyBuildingComPbDynVO.publishAtBegin != null '>"
+ "AND d.publish_at BETWEEN #{partyBuildingComPbDynVO.publishAtBegin} \n"
+ "AND #{partyBuildingComPbDynVO.publishAtEnd} \n" + " </if> " + "GROUP BY\n" + "d.id\n"
- + "ORDER BY d.publish_at desc" + "</script>")
+ + "ORDER BY d.publish_at <if test='partyBuildingComPbDynVO.sort !=null and partyBuildingComPbDynVO.sort !=""'> asc </if> <if test='partyBuildingComPbDynVO.sort ==null'> desc</if>" + "</script>")
IPage<PartyBuildingComPbDynVO> pageYnamic(Page page,
@Param("partyBuildingComPbDynVO") PartyBuildingComPbDynVO partyBuildingComPbDynVO);
@@ -53,7 +57,7 @@
int timedTaskPartyBuildingStatus();
@Select("<script> " + "SELECT\n" + " distinct COUNT( u.id ) readingVolume,\n"
- + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type, \n"
+ + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,a.policy_type, \n"
+ " act.name as createByName,d.jump_type,d.jump_url " + "FROM\n"
+ "com_pb_dyn d LEFT JOIN com_act act ON d.community_id = act.community_id \n"
+ "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id " + "where d.id = #{id} " + " group by d.id " + "</script>")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java
index f68fc89..bacd3ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java
@@ -87,4 +87,8 @@
*/
private Integer jumpType;
+ /**
+ * 政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策
+ */
+ private Integer policyType;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index c3601dd..f3f3b1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -218,4 +218,20 @@
* @return
*/
int countPropertyWorker(@Param("userId") Long userId, @Param("communityId") Long userCommunityId);
+
+ /**
+ * 查看是否社工
+ * @param phone
+ * @param communityId
+ * @return
+ */
+ int countSocialWorker(@Param("phone") String phone, @Param("communityId") Long communityId);
+
+ /**
+ * 查看是否社会组织
+ * @param userId
+ * @return
+ */
+ int countSocialOrg(Long userId);
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
index 7dfe190..0e88262 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -197,4 +197,8 @@
*/
private String plaintextPassword;
+ /**
+ * 街道id
+ */
+ private Long streetId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 2a6ff6b..2d6673a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -376,6 +376,7 @@
loginUserInfoVO.setIsFourMember(2);
loginUserInfoVO.setIsCommunityWorker(2);
loginUserInfoVO.setIsPropertyWorker(2);
+ loginUserInfoVO.setIsSocialWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -421,6 +422,10 @@
loginUserInfoVO.setIsmemberrole(1);
} else if (isSysUser != null && isSysUser > 0) {
loginUserInfoVO.setIsmemberrole(1);
+ }
+ Integer countSocialWorker = userDao.countSocialWorker(phone,userCommunityId);
+ if(countSocialWorker>0){
+ loginUserInfoVO.setIsSocialWorker(1);
}
}
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);
@@ -710,6 +715,19 @@
loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
+ //判断账号类型
+ int countSocialOrg=userDao.countSocialOrg(userId);
+ if(countSocialOrg>0){
+ loginUserInfoVO.setUserType(3);
+ }
+ else {
+ if(loginUserInfoVO.getStreetId()!=null){
+ loginUserInfoVO.setUserType(1);
+ }
+ else {
+ loginUserInfoVO.setUserType(2);
+ }
+ }
return R.ok(loginUserInfoVO);
}
@@ -1109,6 +1127,43 @@
this.putMenuRole(menuRoleVO);
}
}
+ if(roleId.intValue()==777777777){
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setRoleName("超级管理员");
+ sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert > 0) {
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+ roleId = sysRoleDO1.getRoleId();
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ List<Long> menu=new ArrayList<>();
+ if(administratorsUserVO.getSocialType()==1){
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ }
+ else if(administratorsUserVO.getSocialType()==2){
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ }
+ else if(administratorsUserVO.getSocialType()==3){
+ menu.add(233L);
+ menu.add(237L);
+ }
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1132,7 +1187,7 @@
}
- if (insert > 0 && sysUserDO.getType() == 3) {// 添加的用户是社区账号时
+ if (insert > 0 && sysUserDO.getType() == 3 &&sysUserDO.getStreetId()==null) {// 添加的用户是社区账号时
// 添加网格综合治理管理后台用户
SysUserDO sysUserDOWangGe = new SysUserDO();
BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
@@ -1176,6 +1231,49 @@
public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
SysUserDO sysUserDO = new SysUserDO();
Long roleId = administratorsUserVO.getRoleId();
+ if(roleId.intValue()==777777777){
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setRoleName("三社超级管理员");
+ List<Long> menu=new ArrayList<>();
+ if(administratorsUserVO.getSocialType()==1){
+ sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(234L);
+ menu.add(235L);
+ menu.add(236L);
+ menu.add(237L);
+ }
+ else if(administratorsUserVO.getSocialType()==2){
+ sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(76L);
+ menu.add(234L);
+ menu.add(236L);
+ menu.add(237L);
+ menu.add(238L);
+ }
+ else if(administratorsUserVO.getSocialType()==3){
+ sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId());
+ menu.add(233L);
+ menu.add(237L);
+ }
+
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
+ SysRoleDO sysRoleDO1 = roleDAO.selectOne(
+ new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
+ if(sysRoleDO1!=null){
+ sysRoleDO=sysRoleDO1;
+ roleId = sysRoleDO.getRoleId();
+ }else{
+ roleDAO.insert(sysRoleDO);
+ // 新街道管理员角色设置固定三社权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setMenuIds(menu);
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+ }
+ }
SysRoleDO roleDO = roleDAO.selectById(roleId);
if (ObjectUtils.isEmpty(roleDO)) {
return R.fail("角色不存在");
@@ -1193,6 +1291,8 @@
throw new ServiceException("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
throw new ServiceException("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ throw new ServiceException("手机号已存在");
}
}
@@ -1270,7 +1370,12 @@
.anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
}
if (!menuIds.isEmpty()) {
- sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ if(menuRoleVO.getMenuIds().isEmpty()){
+ sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
+ }
+ else {
+ sysRoleMenuDAO.batchInsertWithRoleId(menuRoleVO.getMenuIds(), roleId);
+ }
}
// for (int i = 0; i < menuIds.size(); i++) {
// SysRoleMenuDO sysRoleMenuDO = sysRoleMenuDAO.selectOne(new QueryWrapper<SysRoleMenuDO>().lambda()
@@ -1352,7 +1457,7 @@
}
Long communityId = sysUserDO.getCommunityId();
Long communityId1 = administratorsUserVO.getCommunityId();
- if (communityId1.intValue() != communityId.intValue()) {
+ if (communityId1!=null&&communityId1.intValue() != communityId.intValue()) {
return R.fail("用户不属于当前平台");
}
// 删除用户
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
index 05e2b44..039477f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -533,4 +533,12 @@
WHERE user_id = #{userId} AND community_id = #{communityId}
</select>
+ <select id="countSocialWorker" resultType="integer">
+ select count(id) from com_act_social_worker where telephone = #{phone} and community_id = #{communityId}
+ </select>
+
+ <select id="countSocialOrg" resultType="Integer">
+ select count(id) from com_act_social_org where user_id = #{userId}
+ </select>
+
</mapper>
--
Gitblit v1.7.1