From 49c396970bf850cdcbb2bb30b6d824e69c527e5f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 18 二月 2022 15:21:58 +0800
Subject: [PATCH] [新增]仁和区离攀返攀导入特定样式功能
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java | 6
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java | 307 +++++++++----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java | 12
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java | 11
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java | 275 ++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java | 64 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 370 ++--------------
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 84 +--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 33
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java | 10
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java | 15
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java | 52 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java | 19
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 29
16 files changed, 728 insertions(+), 567 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index de2dfdb..a60cd5b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,149 +2,28 @@
import java.util.List;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
-import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
-import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
-import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
-import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
-import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
-import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordEditDTO;
-import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
-import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
-import com.panzhihua.common.model.dtos.community.ComSwSafetyWorkEditDTO;
-import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
-import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
-import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
-import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
-import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
-import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
-import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
-import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
-import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
-import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
-import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
-import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
-import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO;
-import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
-import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
-import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
-import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
-import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto;
-import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
-import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
-import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
-import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
-import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
-import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
+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.AddClusterAdminDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
-import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.cluster.admin.*;
+import com.panzhihua.common.model.dtos.community.convenient.*;
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.easyPhoto.AddEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.*;
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;
@@ -154,50 +33,12 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.*;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
-import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
+import com.panzhihua.common.model.dtos.community.rentingHouses.*;
+import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
-import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
-import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
-import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
-import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
-import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
+import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
@@ -205,130 +46,15 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
-import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
-import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
-import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
-import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
-import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
-import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
-import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
-import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
+import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
-import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
+import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
-import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
-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;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
-import com.panzhihua.common.model.vos.community.ComActColumnVO;
-import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
-import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComPropertyVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
-import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
-import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
-import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
-import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.dtos.vaccines.*;
+import com.panzhihua.common.model.vos.*;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -344,6 +70,7 @@
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -357,8 +84,6 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
-
-import javax.validation.Valid;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -5640,7 +5365,7 @@
* @return 预约登记详情
*/
@GetMapping("/reserve/admin/detail")
- R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
+ R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
/**
* 社区后台-根据社区id统计预约类数据
@@ -5755,6 +5480,15 @@
@PostMapping("/reserve/admin/register/list/export")
R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
+ /**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ @GetMapping("/reserve/admin/subject/selection/list")
+ List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
/**
* 查询预约登记题目列表
* @param reserveId 预约登记id
@@ -6278,7 +6012,7 @@
* @return 菜单列表
*/
@PostMapping("/common/data/population/second/listBack")
- public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+ R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
/**
* 微心愿处理人列表
@@ -6777,7 +6511,7 @@
* @return 编辑结果
*/
@PostMapping("/common/data/population/house/user/insert")
- public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+ R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
/**
* 编辑实有房屋信息
@@ -6787,7 +6521,7 @@
* @return 编辑结果
*/
@PostMapping("/common/data/population/house/user/edit")
- public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+ R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
/**
* 根据id查询
@@ -6797,7 +6531,7 @@
* @return 删除结果
*/
@GetMapping("/common/data/population/house/user/detail")
- public R detailHousesUser(@RequestParam("id") Long id);
+ R detailHousesUser(@RequestParam("id") Long id);
/**
* 社区后台-分页查询楼栋列表
@@ -6903,7 +6637,7 @@
* @return 所有数据
*/
@PostMapping("/comActWarehouseApply/queryAll")
- public R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
+ R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
/**
* 统计查询
@@ -6912,7 +6646,7 @@
* @return 所有数据
*/
@GetMapping("/comActWarehouseApply/selectStatics")
- public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
+ R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
/**
* 通过主键查询单条数据
@@ -6921,7 +6655,7 @@
* @return 单条数据
*/
@GetMapping("/comActWarehouseApply/{id}")
- public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
+ R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
/**
* 新增数据
@@ -6930,7 +6664,7 @@
* @return 新增结果
*/
@PostMapping("/comActWarehouseApply")
- public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+ R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
/**
* 修改数据
@@ -6939,7 +6673,7 @@
* @return 修改结果
*/
@PostMapping("/comActWarehouseApply/update")
- public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+ R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
/**
* 删除数据
@@ -6948,7 +6682,7 @@
* @return 删除结果
*/
@GetMapping("/comActWarehouseApply/del")
- public R comActWarehouseApplyDelete(@RequestParam("id") Long id);
+ R comActWarehouseApplyDelete(@RequestParam("id") Long id);
/**
* 生成二维码
@@ -6956,7 +6690,7 @@
* @return
*/
@PostMapping("/comActWarehouseApply/getQRCode")
- public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
+ R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
/**
* 社区Id查询基础配置
@@ -6964,7 +6698,7 @@
* @return
*/
@GetMapping("/comActWarehouseBase")
- public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
+ R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
/**
* 新增数据
@@ -6973,13 +6707,13 @@
* @return 新增结果
*/
@PostMapping("/comActWarehouseBase")
- public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
+ R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
/**
* 导出数据
*/
@PostMapping("/comActWarehouseApply/export")
- public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
+ R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
/**
* 后台导入捐赠物品
@@ -7055,7 +6789,7 @@
* @return 所有数据
*/
@PostMapping("/comActWarehouseOperation/queryAll")
- public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
+ R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
/**
* 物品领用
@@ -7071,7 +6805,7 @@
* @return
*/
@PostMapping("/comActActivityCode/getQRCode")
- public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+ R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
/**
* 重置二维码
@@ -7079,7 +6813,7 @@
* @return
*/
@PostMapping("/comActActivityCode/resetQRCode")
- public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+ R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
/**
* 实有房屋数据修复定时任务
@@ -8292,4 +8026,16 @@
@PostMapping("/common/data/history/filled")
R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
@RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ @GetMapping("act/getActBelongRegionCode")
+ String getActBelongRegionCode(@RequestParam("communityId") Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java
new file mode 100644
index 0000000..92af70b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/ForEachUtils.java
@@ -0,0 +1,52 @@
+package com.panzhihua.common.utlis;
+
+/**
+ * 应用模块名称
+ * <p>
+ * 代码描述
+ * <p>
+ * Copyright: Copyright (C) 2022 XXX, Inc. All rights reserved.
+ * <p>
+ * Company: 成都呐喊信息技术有限公司
+ * <p>
+ *
+ * @author manailin
+ * @since 2022/2/17 14:33
+ */
+import java.util.Objects;
+import java.util.function.BiConsumer;
+
+/**
+ *
+ * @author yangzhilong
+ * @date 7/15/2019
+ */
+public class ForEachUtils {
+
+ /**
+ *
+ * @param <T>
+ * @param startIndex
+ * 开始遍历的索引
+ * @param elements
+ * 集合
+ * @param action
+ */
+ public static <T> void forEach(int startIndex, Iterable<? extends T> elements,
+ BiConsumer<Integer, ? super T> action) {
+ Objects.requireNonNull(elements);
+ Objects.requireNonNull(action);
+ if (startIndex < 0) {
+ startIndex = 0;
+ }
+ int index = 0;
+ for (T element : elements) {
+ index++;
+ if (index <= startIndex) {
+ continue;
+ }
+
+ action.accept(index - 1, element);
+ }
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java
new file mode 100644
index 0000000..5d9f019
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java
@@ -0,0 +1,275 @@
+package com.panzhihua.community_backstage.aop;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.DatatypeConverter;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lyq 前端H5组件库工具类
+ */
+@Slf4j
+@Component
+public class RenheAssemblyUtils {
+
+ @Autowired
+ private CommunityService communityService;
+
+ private static List<String> automaticDataCompletion(List<String> chooseList, String selected) {
+ if (chooseList == null) {
+ chooseList = new ArrayList<>();
+ chooseList.add("是");
+ chooseList.add("否");
+ }
+ List<String> list = new ArrayList<>();
+ for (String item : chooseList) {
+ if (item.equals(selected)) {
+ list.add("√");
+ } else {
+ list.add("");
+ }
+ }
+ return list;
+ }
+
+ /**
+ * 数据转换--登记明细用户填写答案导出数据格式转换
+ *
+ * @param answerContentVOList
+ * 用户答题记录
+ * @return 用户填写答案数据
+ */
+ public List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
+ // 结果数据集合
+ List<List<Object>> resultList = new ArrayList<>();
+ // 构建单个用户数据
+ List<Object> userData = new ArrayList<>();
+
+ String noExport = "以上信息仅用于";
+ // 遍历答案列表
+ Long reserveRecordId = 0L;
+ Long reserveSubId = 0L;
+ Boolean isOldDuo = false;
+ StringBuffer sb = new StringBuffer();
+ if (answerContentVOList != null && answerContentVOList.size() > 0) {
+ int a = 0;
+ for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
+ a++;
+ if (answerContentVOList.size() == 26 && a == 9) {
+ userData.add(" ");
+ }
+ // 判断是文字描述直接跳过
+ if (userAnswers.getOptionType().equals(5) || (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport))) {
+ continue;
+ }
+ // 判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
+ if (reserveRecordId.equals(0L)) {
+ reserveRecordId = userAnswers.getReserveRecordId();
+ // userData.add(userAnswers.getNickName());
+ // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ }
+ // 根据reserveRecordId判断是否是第二条填报记录
+ if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
+ reserveSubId = 0L;
+
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ isOldDuo = false;
+ }
+ userData.add(0, " ");
+ userData.add(1, " ");
+ userData.add(2, " ");
+ userData.add(28, " ");
+ resultList.add(userData);
+ userData = new ArrayList<>();
+ reserveRecordId = userAnswers.getReserveRecordId();
+ // userData.add(userAnswers.getNickName());
+ // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
+ userData.add(userAnswers.getAnswerContent());
+ } else {
+ userData.add(" ");
+ }
+ } else {
+ if (reserveSubId.equals(0L)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ }
+
+ if (!reserveSubId.equals(userAnswers.getReserveSubId())) {
+ reserveSubId = userAnswers.getReserveSubId();
+
+ // 如果是承诺字段则不导出
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport)) {
+ continue;
+ }
+
+ // 判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if (userAnswers.getOptionType().equals(11)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ // userData.add(new
+ // File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
+ } else {
+ userData.add(" ");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ userData.add(" ");
+ log.error("导出转换图片失败！" + "/workspace/minio/data/files/" + userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf("files/") + 6));
+ }
+ continue;
+ }
+ // 如果是多选
+ if (userAnswers.getOptionType().equals(1)) {
+ List<String> selectionList =
+ communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
+ List<String> completionList =
+ automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ // 如果是单选
+ if (userAnswers.getOptionType().equals(0)) {
+ if (userAnswers.getAnswerContent().equals("男")
+ || userAnswers.getAnswerContent().equals("女")) {
+
+ } else {
+ List<String> completionList =
+ automaticDataCompletion(null, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ }
+ // 判断当前组件类型是否签名
+ if (userAnswers.getOptionType().equals(12)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+
+ if (userAnswers.getOptionType().equals(1)) {
+ isOldDuo = true;
+ sb.append(
+ userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ continue;
+ } else {
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ } else {
+ // 如果是承诺字段则不导出
+ if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
+ && userAnswers.getAnswerContent().contains(noExport)) {
+ continue;
+ }
+ // 判断当前的组件类型是否是图片上传，导出时需要导出图片
+ if (userAnswers.getOptionType().equals(11)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ userData.add(new URL(userAnswers.getAnswerContent()));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ // 如果是多选
+ if (userAnswers.getOptionType().equals(1)) {
+ List<String> selectionList =
+ communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
+ List<String> completionList =
+ automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ // 如果是单选
+ if (userAnswers.getOptionType().equals(0)) {
+ if (userAnswers.getAnswerContent().equals("男")
+ || userAnswers.getAnswerContent().equals("女")) {
+
+ } else {
+ List<String> completionList =
+ automaticDataCompletion(null, userAnswers.getAnswerContent());
+ userData.addAll(completionList);
+ continue;
+ }
+ }
+ // 判断当前组件类型是否签名
+ if (userAnswers.getOptionType().equals(12)) {
+ reserveSubId = userAnswers.getReserveSubId();
+ try {
+ // userData.add(new
+ // URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
+ userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
+ .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
+ } catch (Exception e) {
+ userData.add(" ");
+ log.error("导出转换图片失败！");
+ }
+ continue;
+ }
+ if (userAnswers.getOptionType().equals(1)) {
+ isOldDuo = true;
+ sb.append(
+ userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ continue;
+ } else {
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ isOldDuo = false;
+ }
+ sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ sb = new StringBuffer();
+ }
+ }
+ }
+ if (isOldDuo) {
+ String answer = sb.toString();
+ userData.add(answer.substring(0, answer.length() - 1));
+ }
+
+ userData.add(0, " ");
+ userData.add(1, " ");
+ userData.add(2, " ");
+ userData.add(28, " ");
+ resultList.add(userData);
+ }
+ return resultList;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
index bda8361..843d6bd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -1,23 +1,22 @@
package com.panzhihua.community_backstage.api;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.*;
import javax.annotation.Resource;
-import com.lowagie.text.DocumentException;
-import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.common.model.vos.community.reserve.*;
-import com.panzhihua.community_backstage.util.HtmlToPdfUtil;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.context.Context;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
@@ -31,49 +30,27 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.ReserveRecordStatusEnum;
import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
-import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
-import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
-import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
+import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailedExcelAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleExcelAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleListAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeListAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightExcelAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeStatisticsAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterExcelAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
+import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AssemblyUtils;
-import com.panzhihua.common.utlis.HomeQuarantineUtil;
+import com.panzhihua.common.utlis.ForEachUtils;
import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.community_backstage.aop.RenheAssemblyUtils;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.CustemSecondhandler;
import com.panzhihua.community_backstage.excel.Custemhandler;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
+import com.panzhihua.community_backstage.util.HtmlToPdfUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.thymeleaf.TemplateEngine;
-import org.thymeleaf.context.Context;
/**
* @description: 预约登记接口
@@ -85,7 +62,10 @@
@RestController
@RequestMapping("/reserve")
public class ComActReserveApi extends BaseController {
- private static final String key="nahankeji1234567";
+ private static final String key = "nahankeji1234567";
+
+ @Value("${minio.url}")
+ private String minioUrl;
@Resource
private CommunityService communityService;
@@ -95,11 +75,13 @@
private SFTPConfig sftpConfig;
@Resource
private TemplateEngine templateEngine;
+ @Resource
+ private RenheAssemblyUtils assemblyUtils;
@ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class)
@PostMapping("/page")
public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) {
- if(pageReserveDTO.getCommunityId()==null){
+ if (pageReserveDTO.getCommunityId() == null) {
Long communityId = this.getCommunityId();
pageReserveDTO.setCommunityId(communityId);
}
@@ -200,14 +182,16 @@
R r = communityService.makeStatisticsExportAdmin(makeStatisticsDTO);
if (R.isOk(r)) {
List<ComActReserveMakeRightExcelAdminVO> resultList = new ArrayList<>();
- List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class);
+ List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray
+ .parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class);
rightStatisticsList.forEach(rightStatistics -> {
ComActReserveMakeRightExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeRightExcelAdminVO();
BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
resultList.add(makeRightExcelAdminVO);
});
try {
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
@@ -218,8 +202,8 @@
InputStream inputStream = null;
try {
excelWriter = EasyExcel.write(fileName, ComActReserveMakeRightExcelAdminVO.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
WriteSheet writeSheet = EasyExcel.writerSheet("预约登记统计汇总导出数据").build();
excelWriter.write(resultList, writeSheet);
excelWriter.finish();
@@ -283,14 +267,17 @@
R r = communityService.exportMakeAdmin(pageMakeDTO);
if (R.isOk(r)) {
List<ComActReserveMakeDetailedExcelAdminVO> resultList = new ArrayList<>();
- List<ComActReserveMakeListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class);
+ List<ComActReserveMakeListAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class);
rightStatisticsList.forEach(rightStatistics -> {
- ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeDetailedExcelAdminVO();
+ ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO =
+ new ComActReserveMakeDetailedExcelAdminVO();
BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
resultList.add(makeRightExcelAdminVO);
});
try {
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
@@ -301,8 +288,8 @@
InputStream inputStream = null;
try {
excelWriter = EasyExcel.write(fileName, ComActReserveMakeDetailedExcelAdminVO.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
WriteSheet writeSheet = EasyExcel.writerSheet("预约明细导出数据").build();
excelWriter.write(resultList, writeSheet);
excelWriter.finish();
@@ -359,14 +346,16 @@
R r = communityService.registerStatisticsExportAdmin(registerStatisticsDTO);
if (R.isOk(r)) {
List<ComActReserveRegisterExcelAdminVO> resultList = new ArrayList<>();
- List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class);
+ List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class);
rightStatisticsList.forEach(rightStatistics -> {
ComActReserveRegisterExcelAdminVO makeRightExcelAdminVO = new ComActReserveRegisterExcelAdminVO();
BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
resultList.add(makeRightExcelAdminVO);
});
try {
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
@@ -377,8 +366,8 @@
InputStream inputStream = null;
try {
excelWriter = EasyExcel.write(fileName, ComActReserveRegisterExcelAdminVO.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
WriteSheet writeSheet = EasyExcel.writerSheet("登记统计汇总导出数据").build();
excelWriter.write(resultList, writeSheet);
excelWriter.finish();
@@ -447,7 +436,8 @@
R r = communityService.exportMakeHandleAdmin(pageMakeHandleDTO);
if (R.isOk(r)) {
List<ComActReserveMakeHandleExcelAdminVO> resultList = new ArrayList<>();
- List<ComActReserveMakeHandleListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class);
+ List<ComActReserveMakeHandleListAdminVO> rightStatisticsList =
+ JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class);
rightStatisticsList.forEach(rightStatistics -> {
ComActReserveMakeHandleExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeHandleExcelAdminVO();
BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
@@ -455,7 +445,8 @@
resultList.add(makeRightExcelAdminVO);
});
try {
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
@@ -466,8 +457,8 @@
InputStream inputStream = null;
try {
excelWriter = EasyExcel.write(fileName, ComActReserveMakeHandleExcelAdminVO.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .registerWriteHandler(new CustomSheetWriteHandler()).build();
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .registerWriteHandler(new CustomSheetWriteHandler()).build();
WriteSheet writeSheet = EasyExcel.writerSheet("预约处理列表导出数据").build();
excelWriter.write(resultList, writeSheet);
excelWriter.finish();
@@ -502,6 +493,18 @@
@ApiOperation(value = "导出登记明细")
@PostMapping("/register/list/export")
public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
+ if (regionCode.equals("510411")) {
+ ComActReserveDetailAdminVO reserverRecord =
+ communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
+ if (reserverRecord.getTitle().equals("离攀返攀")) {
+ return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
+ }
+ }
String ftpUrl = "/mnt/data/web/excel/";
String name = "登记明细导出数据.xlsx";
String noHaed = "承诺";
@@ -608,15 +611,19 @@
}
}
- @ApiOperation(value = "导出居家隔离统计")
- @PostMapping("/register/list/export/homeQuarantine")
- public R exportRegisterHomeQuarantineStatistics(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
- String name= "居家隔离统计表.xlsx";
+ /**
+ * 仁和区离攀返攀特别定制excel方法。对于其他区不适用。
+ *
+ * @param pageReserveRegisterDetailedAdminDTO
+ * @return
+ */
+ public R renheExportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
String ftpUrl = "/mnt/data/web/excel/";
+ String name = "仁和区入攀返攀人员信息统计表模板.xlsx";
String noHaed = "承诺";
- List<List<Object>> datalist = new ArrayList<>();
try {
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
@@ -626,13 +633,109 @@
InputStream inputStream = null;
try {
/**
- * 组合导出数据
- * 用户问卷答案
+ * 组合导出数据 用户问卷答案new FileInputStream
+ */
+ R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
+ QuestnaireAnswersDTO questnaireAnswersDTOS = JSON
+ .parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
+ // 数据转换
+ List<List<Object>> datalist = assemblyUtils.ReserveData(questnaireAnswersDTOS.getAnswers());
+ ForEachUtils.forEach(0, datalist, (index, data) -> {
+ data.set(0, index + 1);
+ ForEachUtils.forEach(1, data, (indexitem, item) -> {
+ if (indexitem == 18 && item.equals("√")) {
+ String number = "√ /".concat(data.get(20).toString());
+ data.set(18, number);
+ }
+ });
+ data.remove(20);
+ });
+ WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+ // 设置头居中
+ headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ // 设置头字体
+ WriteFont headWriteFont = new WriteFont();
+ headWriteFont.setFontHeightInPoints((short)8);
+ headWriteFont.setBold(true);
+ headWriteCellStyle.setWriteFont(headWriteFont);
+
+ WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+ // 设置表格内容字体
+ WriteFont writeFont = new WriteFont();
+ writeFont.setFontHeightInPoints((short)11);
+ // 设置 水平居中
+ contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ // 设置 垂直居中
+ contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ contentWriteCellStyle.setWriteFont(writeFont);
+
+ contentWriteCellStyle.setWrapped(true);
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy =
+ new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+
+ URL url = new URL(minioUrl.replace("files/", "web/excel/仁和区入攀返攀人员信息统计表.xlsx"));
+ // 打开连接
+ URLConnection con = url.openConnection();
+ // 输入流
+ InputStream is = con.getInputStream();
+ excelWriter = EasyExcel.write(fileName).withTemplate(is)
+ .registerWriteHandler(horizontalCellStyleStrategy).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").build();
+ writeSheet.setRelativeHeadRowIndex(0);
+ excelWriter.write(datalist, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(sftpConfig.getExcelUrl() + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+ @ApiOperation(value = "导出居家隔离统计")
+ @PostMapping("/register/list/export/homeQuarantine")
+ public R exportRegisterHomeQuarantineStatistics(
+ @RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
+ String name = "居家隔离统计表.xlsx";
+ String ftpUrl = "/mnt/data/web/excel/";
+ String noHaed = "承诺";
+ List<List<Object>> datalist = new ArrayList<>();
+ try {
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ /**
+ * 组合导出数据 用户问卷答案
*/
R exportResultR = communityService.exportHomeQuarantine(pageReserveRegisterDetailedAdminDTO);
- HomeQuarantineRegisterExportVO exportVO = JSON.parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class);
+ HomeQuarantineRegisterExportVO exportVO = JSON
+ .parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class);
List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs();
- //构造表头
+ // 构造表头
List<List<String>> headList = new ArrayList<List<String>>();
String firstRowContent = "重点地区或高风险地区来攀返攀人员信息统计表（居家隔离表）";
List<String> head0 = new ArrayList<>();
@@ -644,14 +747,14 @@
head1.add("登记时间");
headList.add(head1);
subVOList.forEach(sub -> {
- if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午") &&
- !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) {
+ if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午")
+ && !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) {
List<String> headn = new ArrayList<>();
headn.add(firstRowContent);
- if(!sub.getContent().equals(noHaed)){
- if(sub.getType() == 11){
+ if (!sub.getContent().equals(noHaed)) {
+ if (sub.getType() == 11) {
headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
- }else{
+ } else {
headn.add(sub.getContent());
}
headList.add(headn);
@@ -662,36 +765,33 @@
head2.add(firstRowContent);
head2.add("隔离体温情况");
headList.add(head2);
- //数据转换
+ // 数据转换
datalist = exportVO.getDataList();
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
- //设置头居中
+ // 设置头居中
headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
- //设置头字体
+ // 设置头字体
WriteFont headWriteFont = new WriteFont();
headWriteFont.setFontHeightInPoints((short)6);
headWriteFont.setBold(true);
headWriteCellStyle.setWriteFont(headWriteFont);
-
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
- //设置表格内容字体
+ // 设置表格内容字体
WriteFont writeFont = new WriteFont();
writeFont.setFontHeightInPoints((short)6);
- //设置 水平居中
+ // 设置 水平居中
contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
- //设置 垂直居中
+ // 设置 垂直居中
contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
contentWriteCellStyle.setWriteFont(writeFont);
contentWriteCellStyle.setWrapped(true);
HorizontalCellStyleStrategy horizontalCellStyleStrategy =
- new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+ new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
-
- excelWriter = EasyExcel.write(fileName)
- .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new CustemSecondhandler())
- .build();
+ excelWriter = EasyExcel.write(fileName).registerWriteHandler(horizontalCellStyleStrategy)
+ .registerWriteHandler(new CustemSecondhandler()).build();
WriteSheet writeSheet = EasyExcel.writerSheet("居家隔离统计表").head(headList).build();
excelWriter.write(datalist, writeSheet);
excelWriter.finish();
@@ -742,16 +842,17 @@
@ApiOperation(value = "导出登记明细列表", response = ComActReserveRegisterDetailedVO.class)
@PostMapping("/register/detailed/list/export")
public R registerDetailedListExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
- R r=communityService.registerDetailedListAdminExport(detailedAdminDTO);
- if(r.getData()!=null){
- List<ReservePdfExportVO> reservePdfExportVOS = (List<ReservePdfExportVO>) r.getData();
- if(!reservePdfExportVOS.isEmpty()&&reservePdfExportVOS.size()<=100){
- String name="承诺书.pdf";
+ R r = communityService.registerDetailedListAdminExport(detailedAdminDTO);
+ if (r.getData() != null) {
+ List<ReservePdfExportVO> reservePdfExportVOS = (List<ReservePdfExportVO>)r.getData();
+ if (!reservePdfExportVOS.isEmpty() && reservePdfExportVOS.size() <= 100) {
+ String name = "承诺书.pdf";
String uuid = UUID.randomUUID().toString().replace("-", "");
- String ftpUrl = "/mnt/data/web/excel/"+uuid+"/";
- SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
+ String ftpUrl = "/mnt/data/web/excel/" + uuid + "/";
+ SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
+ sftpConfig.getPort());
sftp.login();
- boolean existDir = sftp.isExistDir(ftpUrl +name);
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
if (!existDir) {
String property = System.getProperty("user.dir");
String fileName = property + File.separator + name;
@@ -759,13 +860,13 @@
model.put("reservePdfExportVOS", reservePdfExportVOS);
Context ctx = new Context();
ctx.setVariables(model);
- String htmlcontext =null;
- if(detailedAdminDTO.getPdfType()==1){
- htmlcontext=templateEngine.process("/gasSafety", ctx);
+ String htmlcontext = null;
+ if (detailedAdminDTO.getPdfType() == 1) {
+ htmlcontext = templateEngine.process("/gasSafety", ctx);
}
- if(detailedAdminDTO.getPdfType()==2){
- htmlcontext=templateEngine.process("/forestFire", ctx);
- }
+ if (detailedAdminDTO.getPdfType() == 2) {
+ htmlcontext = templateEngine.process("/forestFire", ctx);
+ }
InputStream inputStream = null;
try {
HtmlToPdfUtil.topdf(htmlcontext, fileName);
@@ -790,10 +891,10 @@
}
}
}
- return R.ok(sftpConfig.getExcelUrl() +uuid+ "/" + name);
+ return R.ok(sftpConfig.getExcelUrl() + uuid + "/" + name);
}
}
- return R.ok(null,"当前数据量太大，请根据筛选条件优化到100条以内");
+ return R.ok(null, "当前数据量太大，请根据筛选条件优化到100条以内");
}
@ApiOperation(value = "查询登记明细详情", response = ComActReserveRegisterDetailedVO.class)
@@ -804,7 +905,7 @@
@ApiOperation("对外用户提交数据")
@PostMapping("/commit/noToken")
- public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
+ public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO) {
return communityService.reserveCommitNoToken(comActReserveCommitVO);
}
@@ -816,7 +917,7 @@
@ApiOperation(value = "删除预约登记记录")
@GetMapping("/record/delete")
- public R deleteRecord(@RequestParam("recordId")Long recordId){
+ public R deleteRecord(@RequestParam("recordId") Long recordId) {
return communityService.deleteRecord(recordId);
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index e505d4b..476aa48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -1,23 +1,21 @@
package com.panzhihua.service_community.api;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
+import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
-import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO;
-import com.panzhihua.service_community.model.dos.ComActReserveRecordDO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.service_community.service.*;
-import com.panzhihua.common.model.dtos.community.reserve.*;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* 预约登记
@@ -94,7 +92,7 @@
* @return 预约登记详情
*/
@GetMapping("/admin/detail")
- public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){
+ public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) {
return comActReserveService.detailReserveAdmin(reserveId);
}
@@ -306,6 +304,17 @@
}
/**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ @GetMapping("/admin/subject/selection/list")
+ public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) {
+ return comActReserveSubService.subjectSelectionListAdmin(reserveSubId);
+ }
+ /**
* 分页查询登记明细列表
* @param detailedAdminDTO 请求参数
* @return 登记明细列表
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 13782bb..cfa283e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -4,32 +4,15 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
-import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
-import com.panzhihua.service_community.model.dos.*;
-import com.panzhihua.service_community.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -37,62 +20,27 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
-import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
-import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
-import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
-import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.BatchhouseVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActPrizeVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthVO;
-import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
-import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.common.utlis.AgeUtils;
-import com.panzhihua.common.utlis.ClazzUtils;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.IdCard;
-import com.panzhihua.common.utlis.WxUtil;
-import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.common.utlis.*;
+import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
+import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.service.*;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
@@ -2543,4 +2491,18 @@
public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
}
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ @GetMapping("act/getActBelongRegionCode")
+ public String getActBelongRegionCode(@RequestParam("communityId") Long communityId) {
+ return comActActivityService.getActBelongRegionCode(communityId);
+ }
}
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..e4c0539 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
@@ -4,10 +4,6 @@
import java.util.List;
import java.util.Map;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -16,9 +12,9 @@
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.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -270,4 +266,15 @@
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);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ String getActBelongRegionCode(@Param("communityId") Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java
index 3cf1a03..82a437b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveSubMapper.java
@@ -1,13 +1,13 @@
package com.panzhihua.service_community.dao;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
-import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
-import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
+import java.util.List;
+
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
+import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
/**
* @auther lyq
@@ -25,5 +25,5 @@
List<ComActReserveSubListVO> getReserveSubjectList(@Param("reserveId") Long reserveId);
-
+ List<String> subjectSelectionListAdmin(@Param("reserveSubId") Long reserveSubId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
index 85993d7..efe0399 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -293,4 +293,15 @@
* @return
*/
R addActivityType(ComActActivityTypeVO comActActivityTypeVO);
+
+ /**
+ * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+ *
+ * @param communityId
+ * 社区ID
+ * @return String 区域code
+ * @author manailin
+ * @date 2022/2/17 10:09
+ */
+ String getActBelongRegionCode(Long communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
index 38b727b..8e3c35c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveService.java
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.community.reserve.*;
-import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
+import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.service_community.model.dos.ComActReserveDO;
/**
@@ -76,7 +76,7 @@
* @param reserveId 预约登记id
* @return 预约登记详情
*/
- R detailReserveAdmin(Long reserveId);
+ R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId);
/**
* 社区后台-根据社区id统计预约类数据
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java
index fc7f07a..06f4a34 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveSubService.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.service;
+import java.util.List;
+
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
@@ -18,4 +20,12 @@
*/
R subjectListAdmin(Long reserveId);
+ /**
+ * 查询预约登记题目下属选择项列表
+ *
+ * @param reserveSubId
+ * 预约登记id
+ * @return 查询预约登记题目下属选择项列表
+ */
+ List<String> subjectSelectionListAdmin(Long reserveSubId);
}
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..0373c10 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
@@ -10,19 +10,11 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
-import com.panzhihua.service_community.dao.*;
-import com.panzhihua.service_community.model.dos.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -42,21 +34,15 @@
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActPictureVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
-import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
+import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
+import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActActivityCode;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -1087,4 +1073,9 @@
}
return R.ok();
}
+
+ @Override
+ public String getActBelongRegionCode(Long communityId) {
+ return baseMapper.getActBelongRegionCode(communityId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
index ae15670..9f328e5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveServiceImpl.java
@@ -1,20 +1,33 @@
package com.panzhihua.service_community.service.impl;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
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.google.common.collect.Lists;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
+import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
-import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
+import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexBackReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubSelectionVO;
@@ -22,46 +35,15 @@
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
-import com.panzhihua.service_community.dao.ComActReserveMapper;
-import com.panzhihua.service_community.dao.ComActReserveSubMapper;
-import com.panzhihua.service_community.model.dos.*;
-import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
import com.panzhihua.service_community.service.ComActReserveRecordService;
import com.panzhihua.service_community.service.ComActReserveService;
import com.panzhihua.service_community.service.ComActReserveSubSelectionService;
+
+import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
/**
* @auther lyq
@@ -686,7 +668,7 @@
* @return 预约登记详情
*/
@Override
- public R detailReserveAdmin(Long reserveId){
+ public R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId) {
ComActReserveDetailAdminVO reserveDetailAdminVO = new ComActReserveDetailAdminVO();
//查询预约登记信息
ComActReserveDO reserveDO = this.baseMapper.selectById(reserveId);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
index b34a535..ea6c1ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveSubServiceImpl.java
@@ -1,16 +1,18 @@
package com.panzhihua.service_community.service.impl;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.dao.ComActReserveSubMapper;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
import com.panzhihua.service_community.service.ComActReserveSubService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -45,4 +47,9 @@
return R.ok(resultList);
}
+ @Override
+ public List<String> subjectSelectionListAdmin(Long reserveSubId) {
+ return baseMapper.subjectSelectionListAdmin(reserveSubId);
+ }
+
}
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..9080d7a 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
@@ -251,4 +251,8 @@
</if>
ORDER BY id DESC
</select>
+
+ <select id="getActBelongRegionCode" resultType="java.lang.String">
+ SELECT district_adcode FROM com_mng_struct_area_district WHERE district_adcode = ( SELECT area_code FROM com_street WHERE street_id =( SELECT street_id FROM com_act WHERE community_id = #{communityId} ))
+ </select>
</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml
index c16a082..202c08f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml
@@ -25,4 +25,8 @@
select id,content,`type` from com_act_reserve_sub where reserve_id = #{reserveId} order by id asc
</select>
+ <select id="subjectSelectionListAdmin" resultType="java.lang.String">
+ select content from com_act_reserve_sub_selection where reserve_sub_id = #{reserveSubId} order by id asc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1