Commit 2debf90b by “Kongxiangkun”

excel导出字段修改

parent a4ea7ce2
...@@ -172,9 +172,9 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa ...@@ -172,9 +172,9 @@ public class DownloadResearchDetails extends AbstractDefaultTask<String, Downloa
//确定提交时间的位置 //确定提交时间的位置
int cellSize = 3; int cellSize = 4;
//第一个问题的位置 //第一个问题的位置
int index = 4; int index = 5;
//获取问题及其选项 //获取问题及其选项
if (CollectionUtils.isNotEmpty(viewAnswerVos)) { if (CollectionUtils.isNotEmpty(viewAnswerVos)) {
......
...@@ -1160,7 +1160,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio ...@@ -1160,7 +1160,7 @@ public class TrResearchQuestionServiceImpl extends ServiceImpl<TrResearchQuestio
RequestContext context = ContextHolder.get(); RequestContext context = ContextHolder.get();
Long companyId = context.getCompanyId(); Long companyId = context.getCompanyId();
Long siteId = context.getSiteId(); Long siteId = context.getSiteId();
LOG.info("投票列表入参, companyId:{}, siteId:{}, researchId:{}, start:", companyId, siteId, researchId, (pageNo - 1) * pageSize, pageSize); LOG.info("投票列表入参, companyId:{}, siteId:{}, researchId:{}, start:{}, range:{}", companyId, siteId, researchId, (pageNo - 1) * pageSize, pageSize);
VoteRankingVo voteRankingVo = researchQuestionMapper.getVoteResult(companyId, siteId, researchId, context.getAccountId(), false, (pageNo - 1) * pageSize , pageSize); VoteRankingVo voteRankingVo = researchQuestionMapper.getVoteResult(companyId, siteId, researchId, context.getAccountId(), false, (pageNo - 1) * pageSize , pageSize);
if(voteRankingVo != null){ if(voteRankingVo != null){
Integer finish = trResearchAnswerMapper.getResearchAnsweFinish(context.getAccountId(), researchId); Integer finish = trResearchAnswerMapper.getResearchAnsweFinish(context.getAccountId(), researchId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment