From 737d4baca08b918593fd644e66901e08a47e821d Mon Sep 17 00:00:00 2001 From: YUJT Date: Wed, 15 Jun 2022 18:25:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyActivityServiceImpl.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index ce0b172893..c645ffbc55 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -179,8 +179,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceItemList=icServiceItemDictService.queryDictList(entity.getCustomerId()); - Map categoryMap=serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + List serviceItemList = icServiceItemDictService.queryDictList(entity.getCustomerId()); + Map categoryMap = serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); List services = icActivityServiceRelationService.getServiceList(id); List serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList()); dto.setServiceMatterList(services); @@ -213,7 +213,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceItemList=icServiceItemDictService.queryDictList(tokenDto.getCustomerId()); - Map categoryMap=serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + List serviceItemList = icServiceItemDictService.queryDictList(tokenDto.getCustomerId()); + Map categoryMap = serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); //获取联建单位 IcPartyUnitDTO unitDTO = new IcPartyUnitDTO(); unitDTO.setAgencyId(staffInfoCache.getAgencyId()); @@ -341,43 +341,43 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl%s", obj.getRowNum())); iterator.remove(); - } else if(StringUtils.isBlank(obj.getTarget())) { + } else if (StringUtils.isBlank(obj.getTarget())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动目标为空"); fileList.add(failed); log.warn(String.format("活动目标为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getContent())) { + } else if (StringUtils.isBlank(obj.getContent())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动内容为空"); fileList.add(failed); log.warn(String.format("活动内容为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getActivityTime())) { + } else if (StringUtils.isBlank(obj.getActivityTime())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动时间为空"); fileList.add(failed); log.warn(String.format("活动时间为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getAddress())) { + } else if (StringUtils.isBlank(obj.getAddress())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动地址为空"); fileList.add(failed); log.warn(String.format("活动地址为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getLatitude())) { + } else if (StringUtils.isBlank(obj.getLatitude())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动地址纬度为空"); fileList.add(failed); log.warn(String.format("活动地址纬度为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getLongitude())) { + } else if (StringUtils.isBlank(obj.getLongitude())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动地址经度为空"); fileList.add(failed); log.warn(String.format("活动地址经度为空,行号->%s", obj.getRowNum())); - } else if(StringUtils.isBlank(obj.getResult())) { + } else if (StringUtils.isBlank(obj.getResult())) { IcPartyActivityImportFailedExcel failed = ConvertUtils.sourceToTarget(obj, IcPartyActivityImportFailedExcel.class); failed.setErrorInfo("活动结果为空"); fileList.add(failed); @@ -540,7 +540,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO) { - if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) { + // unitId 不为空（按单位查询）时，不需要限制活动创建时间 + if (null == formDTO.getStartTime() && null == formDTO.getEndTime() && StringUtils.isBlank(formDTO.getUnitId())) { setDate(formDTO); } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); @@ -554,8 +555,8 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl option = icPartyUnitService.options(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); //获取服务事项字典 - List serviceItemList=icServiceItemDictService.queryDictList(tokenDto.getCustomerId()); - Map categoryMap=serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); + List serviceItemList = icServiceItemDictService.queryDictList(tokenDto.getCustomerId()); + Map categoryMap = serviceItemList.stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); //数据组装 dtoList.forEach(dto -> { //联建单位ID与单位名匹配 @@ -617,6 +618,7 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl