|
|
|
@ -39,8 +39,8 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
private GovProjectFeignClient govProjectFeignClient; |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 议题详情 |
|
|
|
* @param issueDetail |
|
|
|
* @Description 议题详情 |
|
|
|
* @author zxc |
|
|
|
* @date 2020/5/11 10:04 |
|
|
|
*/ |
|
|
|
@ -50,18 +50,18 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
//议题信息
|
|
|
|
Result<IssueResultDTO> issueResultDTOResult = govIssueFeignClient.detail(issueDetail); |
|
|
|
IssueResultDTO issueResult = issueResultDTOResult.getData(); |
|
|
|
if (issueResult==null){ |
|
|
|
if (issueResult == null) { |
|
|
|
return issueDetailResult; |
|
|
|
} |
|
|
|
BeanUtils.copyProperties(issueResult,issueDetailResult); |
|
|
|
BeanUtils.copyProperties(issueResult, issueDetailResult); |
|
|
|
//话题发起人
|
|
|
|
IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO(); |
|
|
|
initiatorFormDTO.setUserId(issueResult.getUserId()); |
|
|
|
if (!StringUtils.isBlank(issueResult.getUserId())) { |
|
|
|
IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData(); |
|
|
|
if (initiatorResult==null){ |
|
|
|
if (initiatorResult == null) { |
|
|
|
issueDetailResult.setIssueInitiator(""); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
issueDetailResult.setIssueInitiator(initiatorResult.getIssueInitiator()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -70,9 +70,9 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
belongGridName.setGridId(issueResult.getGridId()); |
|
|
|
if (!StringUtils.isBlank(issueResult.getGridId())) { |
|
|
|
BelongGridNameResultDTO belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName).getData(); |
|
|
|
if (belongGridNameResult==null){ |
|
|
|
if (belongGridNameResult == null) { |
|
|
|
issueDetailResult.setBelongsGridName(""); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
issueDetailResult.setBelongsGridName(belongGridNameResult.getBelongsGridName()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -81,9 +81,9 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
topicInfoFormDTO.setTopicId(issueResult.getTopicId()); |
|
|
|
if (!StringUtils.isBlank(issueResult.getTopicId())) { |
|
|
|
TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData(); |
|
|
|
if (topicInfoDTOResult==null){ |
|
|
|
if (topicInfoDTOResult == null) { |
|
|
|
issueDetailResult.setTopicInfo(new TopicInfoDTO()); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
issueDetailResult.setTopicInfo(topicInfoDTOResult); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -91,8 +91,8 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 议题表决折线图 |
|
|
|
* @param issueId |
|
|
|
* @Description 议题表决折线图 |
|
|
|
* @author zxc |
|
|
|
* @date 2020/5/12 8:49 |
|
|
|
*/ |
|
|
|
@ -103,12 +103,12 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 支持议题 |
|
|
|
* @param issueId |
|
|
|
* @Description 支持议题 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void support(TokenDto tokenDto,IssueIdFormDTO issueId) { |
|
|
|
public void support(TokenDto tokenDto, IssueIdFormDTO issueId) { |
|
|
|
VoteFormDTO voteFormDTO = new VoteFormDTO(); |
|
|
|
voteFormDTO.setAttitude("support"); |
|
|
|
voteFormDTO.setCreatedBy(tokenDto.getUserId()); |
|
|
|
@ -117,12 +117,12 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 反对议题 |
|
|
|
* @param issueId |
|
|
|
* @Description 反对议题 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void oppose(TokenDto tokenDto,IssueIdFormDTO issueId) { |
|
|
|
public void oppose(TokenDto tokenDto, IssueIdFormDTO issueId) { |
|
|
|
VoteFormDTO voteFormDTO = new VoteFormDTO(); |
|
|
|
voteFormDTO.setAttitude("opposition"); |
|
|
|
voteFormDTO.setCreatedBy(tokenDto.getUserId()); |
|
|
|
@ -131,8 +131,8 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 表决中议题详情——支持、反对数 |
|
|
|
* @param issueId |
|
|
|
* @Description 表决中议题详情——支持、反对数 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@ -142,9 +142,9 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 满意度评价初始化——已关闭 |
|
|
|
* @param tokenDto |
|
|
|
* @param issueId |
|
|
|
* @Description 满意度评价初始化——已关闭 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@ -157,9 +157,9 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 满意度评价初始化——已转项目 |
|
|
|
* @param tokenDto |
|
|
|
* @param projectId |
|
|
|
* @Description 满意度评价初始化——已转项目 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@ -172,19 +172,19 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 提交满意度评价——已关闭 |
|
|
|
* @param evaluateFormDTO |
|
|
|
* @Description 提交满意度评价——已关闭 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void evaluate(TokenDto tokenDto,EvaluateFormDTO evaluateFormDTO) { |
|
|
|
public void evaluate(TokenDto tokenDto, EvaluateFormDTO evaluateFormDTO) { |
|
|
|
evaluateFormDTO.setUserId(tokenDto.getUserId()); |
|
|
|
govIssueFeignClient.evaluate(evaluateFormDTO); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 提交满意度评价——已转项目 |
|
|
|
* @param projectEvaluateFormDTO |
|
|
|
* @Description 提交满意度评价——已转项目 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@ -194,15 +194,15 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 满意度评价列表——已关闭 |
|
|
|
* @param formDTO |
|
|
|
* @Description 满意度评价列表——已关闭 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<EvaluationListResultDTO> evaluationList(EvaluationListFormDTO formDTO) { |
|
|
|
Result<List<EvaluationListResultDTO>> listResult = govIssueFeignClient.evaluationList(formDTO); |
|
|
|
List<EvaluationListResultDTO> data = listResult.getData(); |
|
|
|
if (data.size()==NumConstant.ZERO||data==null){ |
|
|
|
if (data.size() == NumConstant.ZERO || data == null) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
//获取头像和昵称 eg:山东路168号-周先生
|
|
|
|
@ -224,14 +224,14 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 满意度评价列表——已转项目 |
|
|
|
* @param formDTO |
|
|
|
* @Description 满意度评价列表——已转项目 |
|
|
|
* @author zxc |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<EvaluationListResultDTO> projectEvaluationList(ProjectEvaluationListFormDTO formDTO) { |
|
|
|
List<ProjectEvaluationListResultDTO> listResult = govProjectFeignClient.projectEvaluationList(formDTO).getData(); |
|
|
|
if (listResult.size()==NumConstant.ZERO||listResult.equals(null)){ |
|
|
|
if (listResult.size() == NumConstant.ZERO || listResult.equals(null)) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
//获取头像和昵称 eg:山东路168号-周先生
|
|
|
|
@ -251,4 +251,13 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
})).collect(Collectors.toList()); |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO formDTO) { |
|
|
|
List<ShiftProjectListResultDTO> resultList = govIssueFeignClient.getShiftProjectList(formDTO).getData(); |
|
|
|
if (null == resultList || resultList.size() == NumConstant.ZERO) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
} |
|
|
|
|
zhaoqifeng
5 years ago