食堂考核答题端调整

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

@@ -0,0 +1,27 @@
+package com.xjrsoft.module.assessment.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+
+/**
+* @title: 考核答题提交入参
+* @Author dzx
+* @Date: 2024-04-01
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class AssessmentQuestionResultDto implements Serializable {
+
+
+    @ApiModelProperty("考核计划id")
+    private Long assessmentTemplatePlanId;
+
+    @ApiModelProperty("登录者id")
+    private Long userId;
+
+}

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

@@ -1,9 +1,11 @@
 package com.xjrsoft.module.assessment.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.assessment.dto.AssessmentQuestionResultDto;
 import com.xjrsoft.module.assessment.entity.AssessmentPlanAnswerResult;
 import com.xjrsoft.module.assessment.vo.AssessmentQuestionResultVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,5 +18,5 @@ import java.util.List;
 @Mapper
 public interface AssessmentPlanAnswerResultMapper extends MPJBaseMapper<AssessmentPlanAnswerResult> {
 
-    List<AssessmentQuestionResultVo> getResultList(Long id);
+    List<AssessmentQuestionResultVo> getResultList(@Param("dto") AssessmentQuestionResultDto dto);
 }

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

@@ -13,6 +13,7 @@ import com.xjrsoft.module.assessment.dto.AddAssessmentTemplatePlanDto;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerPageDto;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanAnswerSubmitDto;
 import com.xjrsoft.module.assessment.dto.AssessmentPlanSubmitDto;
+import com.xjrsoft.module.assessment.dto.AssessmentQuestionResultDto;
 import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto;
 import com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanSureDto;
 import com.xjrsoft.module.assessment.dto.UpdateAssessmentTemplatePlanDto;
@@ -266,8 +267,10 @@ public class AssessmentTemplatePlanServiceImpl extends MPJBaseServiceImpl<Assess
             .eq(AssessmentPlanQuestion::getDeleteMark, DeleteMark.NODELETE.getCode())
             .eq(AssessmentPlanQuestion::getAssessmentTemplatePlanId, id)
         );
-
-        List<AssessmentQuestionResultVo> resultList = resultMapper.getResultList(id);
+        AssessmentQuestionResultDto resultDto = new AssessmentQuestionResultDto();
+        resultDto.setAssessmentTemplatePlanId(id);
+        resultDto.setUserId(StpUtil.getLoginIdAsLong());
+        List<AssessmentQuestionResultVo> resultList = resultMapper.getResultList(resultDto);
         Map<Long, String> resultMap = new HashMap<>();
         for (AssessmentQuestionResultVo resultVo : resultList) {
             resultMap.put(resultVo.getQuestionId(), resultVo.getAnswer());

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xjrsoft.module.assessment.mapper.AssessmentTemplatePlanMapper">
-    <select id="getResultList" resultType="com.xjrsoft.module.assessment.vo.AssessmentQuestionResultVo">
+<mapper namespace="com.xjrsoft.module.assessment.mapper.AssessmentPlanAnswerResultMapper">
+    <select id="getResultList" parameterType="com.xjrsoft.module.assessment.dto.AssessmentQuestionResultDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentQuestionResultVo">
         SELECT question_id,GROUP_CONCAT(answer_id) as answer FROM assessment_plan_answer_result
-        WHERE assessment_template_plan_id = #{id} GROUP BY question_id
+        WHERE assessment_template_plan_id = #{dto.assessmentTemplatePlanId} AND student_user_id = #{dto.userId} GROUP BY question_id
     </select>
 </mapper>