1、周次查询调整

2、食堂评价调整

src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentTemplatePlanDto.java

@@ -54,7 +54,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     /**
      * 选人方式
      */
-    @ApiModelProperty("选人方式(全部：all 随机：random)")
+    @ApiModelProperty("选人方式(全部：all 随机：random 指定：appoint)")
     private String type;
 
     /**
@@ -69,4 +69,7 @@ public class AddAssessmentTemplatePlanDto implements Serializable {
     @ApiModelProperty("学期id(base_semester)")
     private Long baseSemesterId;
 
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
+
 }

src/main/java/com/xjrsoft/module/assessment/entity/AssessmentTemplatePlan.java

@@ -111,7 +111,7 @@ public class AssessmentTemplatePlan implements Serializable {
     /**
      * 选人方式
      */
-    @ApiModelProperty("选人方式(全部：all 随机：random)")
+    @ApiModelProperty("选人方式(全部：all 随机：random 指定：appoint)")
     private String type;
 
     /**
@@ -142,4 +142,8 @@ public class AssessmentTemplatePlan implements Serializable {
     @EntityMapping(thisField = "id", joinField = "assessmentTemplatePlanId")
     private List<AssessmentPlanAnswerStudent> assessmentPlanAnswerStudentList;
 
+
+    @ApiModelProperty("就读方式(xjr_dictionary_item[stduy_status])")
+    private String stduyStatus;
+
 }

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

@@ -130,6 +130,7 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
             for (BaseClass baseClass : classList) {
                 classIds.add(baseClass.getId());
             }
+            dto.setClassIds(classIds);
         }else if("random".equals(dto.getType())){
             List<Integer> randomList = new ArrayList<>();
             Random random = new Random();
@@ -143,8 +144,9 @@ class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<AssessmentTem
             for (Integer i : randomList) {
                 classIds.add(classList.get(i).getId());
             }
+            dto.setClassIds(classIds);
         }
-        dto.setClassIds(classIds);
+
         //存入班级，并根据选人方式存入答题学生
         for (Long classId : dto.getClassIds()) {
             AssessmentPlanAnswerClass answerClass = new AssessmentPlanAnswerClass();

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -55,6 +55,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.time.DayOfWeek;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -162,13 +163,19 @@ public class ScheduleController {
     @ApiOperation(value="获取当前周次")
     @SaCheckPermission("schedule:detail")
     public RT<Integer> currentWeek(CourseTableDto dto){
+        LocalDateTime now = LocalDateTime.now();
         List<BaseSemester> semesterList = semesterService.list(
                 new QueryWrapper<BaseSemester>().lambda()
                         .eq(BaseSemester::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .le(BaseSemester::getEndDate, now)
+                        .ge(BaseSemester::getStartDate, now)
                         .orderByDesc(BaseSemester::getStartDate)
         );
+        if(semesterList.isEmpty()){
+            return RT.error("未能查询到当前周次");
+        }
         BaseSemester baseSemester = semesterList.get(0);
-        LocalDateTime now = LocalDateTime.now();
+
         if(dto.getScheduleDate() != null){
             now = dto.getScheduleDate();
         }

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

@@ -30,8 +30,9 @@
         t1.assessment_template_id,t3.is_confirm,t3.submit_status FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         LEFT JOIN assessment_plan_answer_student t3 ON t3.assessment_template_plan_id = t1.id
+        left join base_student_school_roll t4 on t3.student_user_id = t4.user_id
         WHERE t1.delete_mark = 0 AND t1.status = 1 AND t3.student_user_id = #{dto.studentUserId}
-        and t3.is_confirm = 1
+        and t3.is_confirm = 1 and t1.stduy_status = t4.stduy_status
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>