食堂评价调整

src/main/java/com/xjrsoft/module/assessment/service/impl/AssessmentTemplatePlanServiceImpl.java

@@ -631,9 +631,20 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                     twoQuestion.setResult(answerStr);
                 }else if(AssessQuestionTypeEnum.SCALE.getCode().equals(twoQuestion.getType())){
                     twoQuestion.setResult(resultList.get(0).getAnswerId() + "星");
+                }else if(AssessQuestionTypeEnum.JUDGE.getCode().equals(twoQuestion.getType())){
+                    List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null)
+                            .map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
+                    String replace = answerList.toString().replace("[", "").replace("]", "");
+                    if("1".equals(replace)){
+                        twoQuestion.setResult("是");
+                    }else if("0".equals(replace)){
+                        twoQuestion.setResult("否");
+                    }
                 }else{
-                    List<String> answerList = resultList.stream().map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
-                    twoQuestion.setResult(answerList.toString().replace("[", "").replace("]", ""));
+                    List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
+                    if(!answerList.isEmpty()){
+                        twoQuestion.setResult(answerList.toString().replace("[", "").replace("]", ""));
+                    }
                 }
             }
         }
@@ -698,7 +709,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                 }else if(AssessQuestionTypeEnum.SCALE.getCode().equals(question.getType())){
                     rowData.add(resultList.get(0).getAnswerId() + "星");
                 }else if(AssessQuestionTypeEnum.TEXT.getCode().equals(question.getType())){
-                    rowData.add(resultList.get(0).getAnswerId() + "星");
+                    List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
+                    if(!answerList.isEmpty()){
+                        rowData.add(answerList.toString().replace("[", "").replace("]", ""));
+                    }
                 }else if(AssessQuestionTypeEnum.JUDGE.getCode().equals(question.getType())){
                     List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null)
                             .map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
@@ -709,8 +723,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
                         rowData.add("否");
                     }
                 }else{
-                    List<String> answerList = resultList.stream().map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
-                    rowData.add(answerList.toString().replace("[", "").replace("]", ""));
+                    List<String> answerList = resultList.stream().filter(x -> x.getAnswerId() != null).map(AssessmentPlanAnswerDetailVo::getAnswerId).collect(Collectors.toList());
+                    if(!answerList.isEmpty()){
+                        rowData.add(answerList.toString().replace("[", "").replace("]", ""));
+                    }
                 }
             }
             dataList.add(rowData);
@@ -780,28 +796,28 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
         cell.setCellValue("序号");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
-        sheet.setColumnWidth(cellNumber, 10 * 3 * 256);
+        sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
         cellNumber ++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("班级");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
-        sheet.setColumnWidth(cellNumber, 10 * 3 * 256);
+        sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
         cellNumber ++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("学生姓名");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
-        sheet.setColumnWidth(cellNumber, 10 * 3 * 256);
+        sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
         cellNumber ++;
         cell = row.createCell(cellNumber);
         cell.setCellValue("提交时间");
         cell.setCellStyle(cellStyle);
         sheet.addMergedRegion(new CellRangeAddress(rowNumber, 1, cellNumber, cellNumber));
-        sheet.setColumnWidth(cellNumber, 10 * 3 * 256);
+        sheet.setColumnWidth(cellNumber, 5 * 3 * 256);
 
         cellNumber ++;
         for (AssessmentPlanQuestion question : oneQuesList) {
@@ -834,7 +850,7 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             Cell cell = row.createCell(cellNumber);
             cell.setCellValue(question.getName());
             cell.setCellStyle(cellStyle);
-            sheet.setColumnWidth(cellNumber, 30 * 3 * 256);
+            sheet.setColumnWidth(cellNumber, 20 * 3 * 256);
             cellNumber ++;
         }
     }

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -96,7 +96,7 @@
         (SELECT COUNT(*) FROM assessment_plan_answer_student WHERE delete_mark = 0 AND assessment_template_plan_id = t1.id) AS allCount
         FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
-        WHERE t1.delete_mark = 0 AND t1.status = 1
+        WHERE t1.delete_mark = 0 AND t1.status in (1, 2)
         <if test="dto.keyword != null and dto.keyword != ''">
             and t1.name like concat('%', #{dto.keyword}, '%')
         </if>