食堂考核模块调整

src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -9,7 +9,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
 import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
 import com.xjrsoft.module.assessment.service.IAssessmentTemplatePlanService;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo;
+import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplateQuestionVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,20 +41,20 @@ public class AssessmentPlanAnswerController {
     @GetMapping(value = "/student-page")
     @ApiOperation(value="考核计划答题列表-学生端(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerPageVo>> studentPage(@Valid AssessmentPlanAnswerPageDto dto){
+    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> studentPage(@Valid AssessmentPlanAnswerPageDto dto){
         dto.setStudentUserId(StpUtil.getLoginIdAsLong());
-        Page<AssessmentPlanAnswerPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<AssessmentPlanAnswerPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerPageVo.class);
+        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
         return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/teacher-page")
     @ApiOperation(value="考核计划答题列表-教师端(分页)")
     @SaCheckPermission("assessmenttemplateplan:detail")
-    public RT<PageOutput<AssessmentPlanAnswerPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto){
+    public RT<PageOutput<AssessmentPlanAnswerStudentPageVo>> teacherPage(@Valid AssessmentPlanAnswerPageDto dto){
         dto.setTeacherId(StpUtil.getLoginIdAsLong());
-        Page<AssessmentPlanAnswerPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<AssessmentPlanAnswerPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerPageVo.class);
+        Page<AssessmentPlanAnswerStudentPageVo> page = planService.getTeacherPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<AssessmentPlanAnswerStudentPageVo> pageOutput = ConventPage.getPageOutput(page, AssessmentPlanAnswerStudentPageVo.class);
         return RT.ok(pageOutput);
     }
 

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

@@ -36,4 +36,6 @@ public class AssessmentPlanAnswerPageDto extends PageInput {
 
     @ApiModelProperty("是否确认(0:否 1:是)")
     private Integer isConfirm;
+
+
 }

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

@@ -73,10 +73,15 @@ public class AssessmentPlanAnswerResult implements Serializable {
     @ApiModelProperty("学生id")
     private Long studentUserId;
     /**
-    * 学生id(assessment_plan_question[category=3的id])
+    * 选项id(assessment_plan_question[category=3的id])
     */
+    @ApiModelProperty("选项id(assessment_plan_question[category=2的id])")
+    private Long questionId;
+    /**
+     * 选项id(assessment_plan_question[category=3的id])
+     */
     @ApiModelProperty("选项id(assessment_plan_question[category=3的id])")
-    private Long assessmentPlanQuestionId;
+    private Long answerId;
     /**
     * 考核计划id(assessment_template_plan)
     */

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

@@ -84,5 +84,6 @@ public class AssessmentPlanAnswerStudent implements Serializable {
     @ApiModelProperty("考核计划id(assessment_template_plan)")
     private Long assessmentTemplatePlanId;
 
-
+    @ApiModelProperty("状态(0:未答题 1:已答题)")
+    private Integer submitStatus;
 }

src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentTemplatePlanMapper.java

@@ -5,7 +5,7 @@ import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
 import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
 import com.xjrsoft.module.assessment.entity.AssessmentTemplatePlan;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo;
+import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -26,7 +26,7 @@ public interface AssessmentTemplatePlanMapper extends MPJBaseMapper<AssessmentTe
     Page<AssessmentTemplatePlanPageVo> getPage(Page<AssessmentTemplatePlanPageVo> page, AssessmentTemplatePlanPageDto dto);
 
 
-    Page<AssessmentPlanAnswerPageVo> getTeacherPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto);
+    Page<AssessmentPlanAnswerStudentPageVo> getTeacherPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto);
 
-    Page<AssessmentPlanAnswerPageVo> getStudentPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto);
+    Page<AssessmentPlanAnswerStudentPageVo> getStudentPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto);
 }

src/main/java/com/xjrsoft/module/assessment/service/IAssessmentTemplatePlanService.java

@@ -9,7 +9,7 @@ import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
 import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanDto;
 import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanTimeDto;
 import com.xjrsoft.module.assessment.entity.AssessmentTemplatePlan;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo;
+import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplateQuestionVo;
 
@@ -53,12 +53,12 @@ public interface IAssessmentTemplatePlanService extends MPJBaseService<Assessmen
     /**
      * 考核答题分页查询(学生端)
      */
-    Page<AssessmentPlanAnswerPageVo> getStudentPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto);
+    Page<AssessmentPlanAnswerStudentPageVo> getStudentPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto);
 
     /**
      * 考核答题分页查询(教师端)
      */
-    Page<AssessmentPlanAnswerPageVo> getTeacherPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto);
+    Page<AssessmentPlanAnswerStudentPageVo> getTeacherPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto);
 
     /**
      * 班主任确认

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

@@ -28,7 +28,7 @@ import com.xjrsoft.module.assessment.mapper.AssessmentQuestionMapper;
 import com.xjrsoft.module.assessment.mapper.AssessmentTemplateMapper;
 import com.xjrsoft.module.assessment.mapper.AssessmentTemplatePlanMapper;
 import com.xjrsoft.module.assessment.service.IAssessmentTemplatePlanService;
-import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo;
+import com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentQuestionVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo;
 import com.xjrsoft.module.assessment.vo.AssessmentTemplateQuestionVo;
@@ -233,12 +233,12 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
     }
 
     @Override
-    public Page<AssessmentPlanAnswerPageVo> getStudentPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto) {
+    public Page<AssessmentPlanAnswerStudentPageVo> getStudentPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto) {
         return templatePlanMapper.getStudentPage(page, dto);
     }
 
     @Override
-    public Page<AssessmentPlanAnswerPageVo> getTeacherPage(Page<AssessmentPlanAnswerPageVo> page, AssessmentPlanAnswerPageDto dto) {
+    public Page<AssessmentPlanAnswerStudentPageVo> getTeacherPage(Page<AssessmentPlanAnswerStudentPageVo> page, AssessmentPlanAnswerPageDto dto) {
         return templatePlanMapper.getTeacherPage(page, dto);
     }
 

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerStudentPageVo.java

@@ -0,0 +1,71 @@
+package com.xjrsoft.module.assessment.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 考核计划分页列表出参
+* @Author dzx
+* @Date: 2024-04-01
+* @Version 1.0
+*/
+@Data
+public class AssessmentPlanAnswerStudentPageVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private String id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Long score;
+    /**
+    * 计划开始时间
+    */
+    @ApiModelProperty("计划开始时间")
+    private Date startTime;
+    /**
+    * 计划结束时间
+    */
+    @ApiModelProperty("计划结束时间")
+    private Date endTime;
+    /**
+    * 状态(0:未发布 1:已发布)
+    */
+    @ApiModelProperty("状态(0:未发布 1:已发布)")
+    private Integer status;
+    /**
+    * 考核模板id(assessment_template)
+    */
+    @ApiModelProperty("考核模板id(assessment_template)")
+    private Long assessmentTemplateId;
+
+    /**
+     * 考核模板id(assessment_template)
+     */
+    @ApiModelProperty("考核模板名称(assessment_template)")
+    private String assessmentTemplateName;
+
+    @ApiModelProperty("是否确认(0:否 1:是)")
+    private Integer isConfirm;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("班级名称")
+    private String className;
+
+    @ApiModelProperty("状态(0:未答题 1:已答题)")
+    private Integer submitStatus;
+
+}

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerPageVo.java → src/main/java/com/xjrsoft/module/assessment/vo/AssessmentPlanAnswerTeacherPageVo.java

@@ -12,7 +12,7 @@ import java.util.Date;
 * @Version 1.0
 */
 @Data
-public class AssessmentPlanAnswerPageVo {
+public class AssessmentPlanAnswerTeacherPageVo {
 
     /**
     * 
@@ -65,4 +65,5 @@ public class AssessmentPlanAnswerPageVo {
     @ApiModelProperty("班级名称")
     private String className;
 
+
 }

src/main/java/com/xjrsoft/module/assessment/vo/AssessmentTemplateQuestionListVo.java

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.assessment.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @title: 考核模板表单出参
+* @Author dzx
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class AssessmentTemplateQuestionListVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Long score;
+
+
+    /**
+    * assessmentQuestion
+    */
+    @ApiModelProperty("assessmentQuestion子表")
+    private List<AssessmentQuestionVo> children;
+
+}

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

@@ -22,9 +22,9 @@
         </if>
         ORDER BY t1.create_date DESC
     </select>
-    <select id="getStudentPage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo">
+    <select id="getStudentPage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo">
         SELECT t1.id,t1.name,t1.score,t1.start_time,t1.status,t1.end_time,t2.name AS assessment_template_name,
-        t1.assessment_template_id,t3.is_confirm FROM assessment_template_plan t1
+        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
         WHERE t1.delete_mark = 0 AND t1.status = 1 AND t3.student_user_id = #{dto.studentUserId}
@@ -43,7 +43,7 @@
         </if>
         ORDER BY t1.create_date asc
     </select>
-    <select id="getTeacherPage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerPageVo">
+    <select id="getTeacherPage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentPlanAnswerStudentPageVo">
         SELECT t1.id,t1.name,t1.score,t1.start_time,t1.status,t1.end_time,t2.name AS assessment_template_name,
         t1.assessment_template_id,t3.is_confirm,t3.class_id,t4.name as class_name FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id