|
|
|
@ -36,6 +36,7 @@ import com.epmet.dto.IcPartyActivityDTO; |
|
|
|
import com.epmet.dto.IcPartyUnitDTO; |
|
|
|
import com.epmet.dto.form.PartyActivityFormDTO; |
|
|
|
import com.epmet.dto.form.demand.SubCodeFormDTO; |
|
|
|
import com.epmet.dto.result.ActivityStatisticsDTO; |
|
|
|
import com.epmet.dto.result.demand.OptionDTO; |
|
|
|
import com.epmet.entity.IcPartyActivityEntity; |
|
|
|
import com.epmet.excel.IcPartyActivityImportExcel; |
|
|
|
@ -149,7 +150,13 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD |
|
|
|
@Override |
|
|
|
public IcPartyActivityDTO get(String id) { |
|
|
|
IcPartyActivityEntity entity = baseDao.selectById(id); |
|
|
|
return ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class); |
|
|
|
SubCodeFormDTO codeFormDTO = new SubCodeFormDTO(); |
|
|
|
codeFormDTO.setCustomerId(entity.getCustomerId()); |
|
|
|
codeFormDTO.setParentCategoryCode("1010"); |
|
|
|
Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); |
|
|
|
IcPartyActivityDTO dto = ConvertUtils.sourceToTarget(entity, IcPartyActivityDTO.class); |
|
|
|
dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); |
|
|
|
return dto; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -287,4 +294,81 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD |
|
|
|
return new Result().ok(str); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 联建活动统计 |
|
|
|
* |
|
|
|
* @param formDTO |
|
|
|
* @Param formDTO |
|
|
|
* @Return {@link List< OptionDTO>} |
|
|
|
* @Author zhaoqifeng |
|
|
|
* @Date 2021/12/9 14:55 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<OptionDTO> statistics(PartyActivityFormDTO formDTO) { |
|
|
|
List<OptionDTO> list = new ArrayList<>(); |
|
|
|
if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) { |
|
|
|
setDate(formDTO); |
|
|
|
} |
|
|
|
ActivityStatisticsDTO dto = baseDao.getStatistics(formDTO); |
|
|
|
|
|
|
|
OptionDTO unit = new OptionDTO(); |
|
|
|
unit.setLabel("组织单位"); |
|
|
|
unit.setValue(dto.getUnitCount()); |
|
|
|
list.add(unit); |
|
|
|
OptionDTO activity = new OptionDTO(); |
|
|
|
activity.setLabel("组织活动"); |
|
|
|
activity.setValue(dto.getActivityCount()); |
|
|
|
list.add(activity); |
|
|
|
|
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 联建活动统计列表 |
|
|
|
* |
|
|
|
* @param formDTO |
|
|
|
* @Param formDTO |
|
|
|
* @Return {@link PageData< IcPartyActivityDTO>} |
|
|
|
* @Author zhaoqifeng |
|
|
|
* @Date 2021/12/9 16:24 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public PageData<IcPartyActivityDTO> getActivityList(TokenDto tokenDto, PartyActivityFormDTO formDTO) { |
|
|
|
if (null == formDTO.getStartTime() && null == formDTO.getEndTime()) { |
|
|
|
setDate(formDTO); |
|
|
|
} |
|
|
|
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); |
|
|
|
LambdaQueryWrapper<IcPartyActivityEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
wrapper.eq(IcPartyActivityEntity::getAgencyId, formDTO.getAgencyId()); |
|
|
|
wrapper.eq(StringUtils.isNotBlank(formDTO.getServiceMatter()), IcPartyActivityEntity::getServiceMatter, formDTO.getServiceMatter()); |
|
|
|
wrapper.ge(null != formDTO.getStartTime(),IcPartyActivityEntity::getActivityTime, formDTO.getStartTime()); |
|
|
|
wrapper.le(null != formDTO.getEndTime(), IcPartyActivityEntity::getActivityTime, formDTO.getEndTime()); |
|
|
|
wrapper.orderByDesc(IcPartyActivityEntity::getActivityTime); |
|
|
|
List<IcPartyActivityEntity> list = baseDao.selectList(wrapper); |
|
|
|
List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class); |
|
|
|
|
|
|
|
IcPartyUnitDTO unitDTO = new IcPartyUnitDTO(); |
|
|
|
unitDTO.setAgencyId(formDTO.getAgencyId()); |
|
|
|
if (CollectionUtils.isNotEmpty(dtoList)) { |
|
|
|
Map<String, String> option = icPartyUnitService.option(unitDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); |
|
|
|
SubCodeFormDTO codeFormDTO = new SubCodeFormDTO(); |
|
|
|
codeFormDTO.setCustomerId(tokenDto.getCustomerId()); |
|
|
|
codeFormDTO.setParentCategoryCode("1010"); |
|
|
|
Map<String, String> categoryMap = icResiDemandDictService.querySubCodeList(codeFormDTO).stream().collect(Collectors.toMap(OptionDTO::getValue, OptionDTO::getLabel)); |
|
|
|
dtoList.forEach(dto -> { |
|
|
|
dto.setServiceMatterName(categoryMap.get(dto.getServiceMatter())); |
|
|
|
dto.setUnitName(option.get(dto.getUnitId())); |
|
|
|
}); |
|
|
|
} |
|
|
|
PageInfo<IcPartyActivityDTO> pageInfo = new PageInfo<>(dtoList); |
|
|
|
return new PageData<>(dtoList, pageInfo.getTotal()); |
|
|
|
} |
|
|
|
|
|
|
|
private void setDate(PartyActivityFormDTO formDTO) { |
|
|
|
String start = DateUtils.getBeforeNDay(30); |
|
|
|
formDTO.setEndTime(DateUtils.parse(start.concat("000000"), DateUtils.DATE_TIME_NO_SPLIT)); |
|
|
|
String end = DateUtils.format(new Date(), DateUtils.DATE_PATTERN); |
|
|
|
formDTO.setEndTime(DateUtils.parse(end.concat(" 23:59:59"), DateUtils.DATE_TIME_PATTERN)); |
|
|
|
} |
|
|
|
|
|
|
|
} |
zhaoqifeng
4 years ago