ソースを参照

食堂考核,文本题增加人数统计

dzx 1 年間 前
コミット
71be5ffa54

+ 12 - 4
src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -62,8 +62,6 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -467,8 +465,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
                             optionList.add(questionVo);
                         }
                     }
-                }
-                if("judge_question".equals(twoQuestion.getType())){
+                }else if("judge_question".equals(twoQuestion.getType())){
                     optionList.add(new AssessmentQuestionOptionResultVo(){{
                         setName("是");
                         Integer count = answerCountMap.get(twoQuestion.getId().toString() + "1");
@@ -492,6 +489,17 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
                             }});
                         }
                     }
+                }else if("text_question".equals(twoQuestion.getType())) {
+                    for (AssessmentPlanQuestion assessmentQuestion : questionList) {
+                        if(assessmentQuestion.getCategory() == 3 && assessmentQuestion.getParentId().equals(twoQuestion.getId())){
+                            AssessmentQuestionOptionResultVo questionVo = BeanUtil.toBean(assessmentQuestion, AssessmentQuestionOptionResultVo.class);
+                            Integer count = answerCountMap.get(assessmentQuestion.getParentId().toString() + assessmentQuestion.getId().toString());
+                            questionVo.setCount(count == null?0:count);
+
+                            questionVo.setPercentage(vo.getStudentCount());
+                            optionList.add(questionVo);
+                        }
+                    }
                 }
                 twoQuestion.setResultList(optionList);
             }