Browse Source

解决报错

dzx 1 year ago
parent
commit
9246200a12

+ 8 - 0
src/main/java/com/xjrsoft/module/assessment/controller/AssessmentPlanAnswerController.java

@@ -77,4 +77,12 @@ public class AssessmentPlanAnswerController {
         boolean isSuccess = planService.sure(dto);
         return RT.ok(isSuccess);
     }
+
+    @PostMapping(value="save-answer")
+    @ApiOperation(value = "班主任确认考核")
+    @SaCheckPermission("assessmenttemplateplan:add")
+    public RT<Boolean> saveAnswer(@Valid @RequestBody AssessmentTemplatePlanSureDto dto){
+        boolean isSuccess = planService.sure(dto);
+        return RT.ok(isSuccess);
+    }
 }

+ 58 - 0
src/main/java/com/xjrsoft/module/assessment/dto/AddAssessmentPlanAnswerResultDto.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.assessment.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 考核模板题目
+* @Author dzx
+* @Date: 2024-03-29
+* @Version 1.0
+*/
+@Data
+public class AddAssessmentPlanAnswerResultDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Integer sortCode;
+    /**
+    * 题目题干
+    */
+    @ApiModelProperty("题目题干")
+    private String name;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Long score;
+    /**
+    * 题目类型
+    */
+    @ApiModelProperty("题目类型")
+    private String type;
+    /**
+    * 是否必填(1:是 0:否)
+    */
+    @ApiModelProperty("是否必填(1:是 0:否)")
+    private Short required;
+    /**
+    * 考核模板id(assessment_template)
+    */
+    @ApiModelProperty("考核模板id(assessment_template)")
+    private Long assessmentTemplateId;
+
+    @ApiModelProperty("小题")
+    private List<AddAssessmentPlanAnswerResultDto> children;
+
+    @ApiModelProperty("assessmentQuestionOptions子表")
+    private List<AddAssessmentQuestionOptionsDto> options;
+
+}

+ 87 - 0
src/main/java/com/xjrsoft/module/assessment/entity/AssessmentPlanAnswerResult.java

@@ -0,0 +1,87 @@
+package com.xjrsoft.module.assessment.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+* @title: 考核模板题目
+* @Author dzx
+* @Date: 2024-04-01
+* @Version 1.0
+*/
+@Data
+@TableName("assessment_plan_answer_result")
+@ApiModel(value = "assessment_plan_answer_result", description = "考核答题结果")
+public class AssessmentPlanAnswerResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 学生id
+    */
+    @ApiModelProperty("学生id")
+    private Long studentUserId;
+    /**
+    * 学生id(assessment_plan_question[category=3的id])
+    */
+    @ApiModelProperty("选项id(assessment_plan_question[category=3的id])")
+    private Long assessmentPlanQuestionId;
+    /**
+    * 考核计划id(assessment_template_plan)
+    */
+    @ApiModelProperty("考核计划id(assessment_template_plan)")
+    private Long assessmentTemplatePlanId;
+
+
+}

+ 1 - 1
src/main/java/com/xjrsoft/module/assessment/mapper/AssessmentQuestionMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Update;
 */
 @Mapper
 public interface AssessmentQuestionMapper extends MPJBaseMapper<AssessmentQuestion> {
-    @Update("update assessment_question set delete_mark = 1,modify_date = now(),modify_user_id = #{loginId} WHERE assessment_question_id = #{assessmentTemplateId}")
+    @Update("update assessment_question set delete_mark = 1,modify_date = now(),modify_user_id = #{loginId} WHERE assessment_template_id = #{assessmentTemplateId}")
     Boolean deleteByAssessmentQuestionId(Long assessmentTemplateId, Long loginId);
 }