4.24bug优化

cloud-research-service/src/main/java/com/yizhi/research/application/service/impl/ResearchServiceImpl.java

@@ -440,6 +440,20 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
         List<Research> records = researchMapper.apiListResearch(researchIdsInRange, context.getAccountId(),
                 context.getSiteId(), model.getDate(), pageVo.getState(), pageVo.getBizType(), new RowBounds(page.getOffset(), page.getLimit()));
 
+        if (!CollectionUtils.isEmpty(records)) {
+            for (Research r : records) {
+
+                TrResearchAnswer answer = new TrResearchAnswer();
+                answer.setResearchId(r.getId());
+                answer.setAccountId(context.getAccountId());
+                answer.setFinish(1);
+                EntityWrapper<TrResearchAnswer> wrapper = new EntityWrapper<TrResearchAnswer>(answer);
+                List<TrResearchAnswer> answers = researchAnswerMapper.selectList(wrapper);
+                if (answers.size() > 0) {
+                    r.setFinishState(1);
+                }
+            }
+        }
         // 如果是已完成：还要判断是否过期
         if (pageVo.getState() != null && pageVo.getState().equals(1)) {
             if (!CollectionUtils.isEmpty(records)) {
@@ -891,6 +905,17 @@ public class ResearchServiceImpl extends ServiceImpl<ResearchMapper, Research> i
             research.setVoteNum(0);
         }
 
+
+        TrResearchAnswer answer = new TrResearchAnswer();
+        answer.setResearchId(research.getId());
+        answer.setAccountId(requestContext.getAccountId());
+        answer.setFinish(1);
+        EntityWrapper<TrResearchAnswer> wrapper = new EntityWrapper<TrResearchAnswer>(answer);
+        List<TrResearchAnswer> answers = researchAnswerMapper.selectList(wrapper);
+        if (answers.size() > 0) {
+            research.setFinishState(1);
+        }
+
         return research;
     }
 }