|
|
|
@ -536,18 +536,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
|
throw new RenException(ArticleConstant.SELECT_STAFF_EXCEPTION); |
|
|
|
} |
|
|
|
CustomerStaffDTO staffDTO = resultStaff.getData(); |
|
|
|
//4.2:调用gov-org服务，查询当前人员所属组织机构信息
|
|
|
|
Result<CustomerAgencyDTO> resultAgency = govOrgSelfFeignClient.getAgencyByStaffId(formDTO.getStaffId()); |
|
|
|
if (null == resultAgency.getData()) { |
|
|
|
throw new RenException(ArticleConstant.SELECT_AGRNCY_EXCEPTION); |
|
|
|
} |
|
|
|
CustomerAgencyDTO agencyDTO = resultAgency.getData(); |
|
|
|
//4.2:查询文章表数据
|
|
|
|
ArticleEntity articleEntity = baseDao.selectById(formDTO.getArticleId()); |
|
|
|
//4.3:新增操作表数据
|
|
|
|
ArticleOperateRecordEntity recordEntity = new ArticleOperateRecordEntity(); |
|
|
|
recordEntity.setCustomerId(formDTO.getCustomerId()); |
|
|
|
recordEntity.setCustomerId(articleEntity.getCustomerId()); |
|
|
|
recordEntity.setArticleId(formDTO.getArticleId()); |
|
|
|
recordEntity.setOpUser(agencyDTO.getOrganizationName() + "-" + staffDTO.getRealName()); |
|
|
|
recordEntity.setContent(recordEntity.getOpUser() + ArticleConstant.OFF_LINE_ARTICLE); |
|
|
|
recordEntity.setOpUser(articleEntity.getPublisherName() + "-" + staffDTO.getRealName()); |
|
|
|
recordEntity.setContent(String.format(ArticleConstant.OFF_LINE_ARTICLE_MSG, articleEntity.getPublisherName(), staffDTO.getRealName(), articleEntity.getTitle())); |
|
|
|
recordEntity.setOpType(ArticleConstant.OFFLINE); |
|
|
|
recordEntity.setOpTime(date); |
|
|
|
articleOperateRecordService.insert(recordEntity); |
|
|
|
@ -641,4 +637,25 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit |
|
|
|
return baseDao.selectArticleList(articlePageFormDTO.getGridId(),articlePageFormDTO.getTagIdList()); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param formDTO |
|
|
|
* @return |
|
|
|
* @Author sun |
|
|
|
* @Description 党建声音-政府端-可下线网格列表 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public ArticleGridResultDTO publishGridList(PublishGridListFormDTO formDTO) { |
|
|
|
/*//1:查询当前文章发布范围内还未下线网格列表
|
|
|
|
ArticlePublishRangeEntity rangeEntity = new ArticlePublishRangeEntity(); |
|
|
|
rangeEntity.setArticleId(formDTO.getArticleId()); |
|
|
|
rangeEntity.setPublishStatus(ArticleConstant.PUBLISHED); |
|
|
|
List<ArticlePublishRangeEntity> rangeEntityList = articlePublishRangeDao.selectByArticleId(rangeEntity); |
|
|
|
if(null==rangeEntityList||rangeEntityList.size()<NumConstant.ONE){ |
|
|
|
return new ArticleGridResultDTO(); |
|
|
|
} |
|
|
|
List<String> gridIdList = rangeEntityList.stream().map(ArticlePublishRangeEntity::getGridId).collect(Collectors.toList()); |
|
|
|
formDTO.setGridIdList(gridIdList);*/ |
|
|
|
|
|
|
|
return null; |
|
|
|
} |
|
|
|
} |
sunyuchao
5 years ago