(*)导向目标查询;

education-api/src/main/java/com/education/api/controller/admin/education/GoalInfoController.java

@@ -5,6 +5,7 @@ import com.education.common.base.BaseController;
 import com.education.common.utils.Result;
 import com.education.common.utils.ResultCode;
 import com.education.model.dto.GoalInfoDto;
+import com.education.model.dto.GoalInfoReqDto;
 import com.education.model.entity.ExtKnowledgePoint;
 import com.education.model.entity.GoalInfo;
 import com.education.model.request.PageParam;
@@ -62,12 +63,17 @@ public class GoalInfoController extends BaseController {
     /**
      * 查询导向目标列表
      * @param pageParam
-     * @param goalInfo
+     * @param goalInfoReqDto
      * @return
      */
     @GetMapping
     //@RequiresPermissions("system:extKnowledgePoint:list")
-    public Result selectPage(PageParam pageParam, GoalInfo goalInfo) {
+    public Result selectPage(PageParam pageParam, GoalInfoReqDto goalInfoReqDto) {
+        GoalInfo goalInfo = new GoalInfo();
+        goalInfo.setSchoolType(goalInfoReqDto.getSchoolType());
+        goalInfo.setGradeId(goalInfoReqDto.getGradeId());
+        goalInfo.setCourseId(goalInfoReqDto.getCourseId());
+        goalInfo.setgOriented(goalInfoReqDto.getGOriented());
         return Result.success(goalInfoService.selectPageList(pageParam, goalInfo));
     }
 }

education-business/src/main/java/com/education/business/service/education/GoalInfoService.java

@@ -3,6 +3,7 @@ package com.education.business.service.education;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.education.common.model.PageInfo;
 import com.education.common.utils.Result;
+import com.education.model.dto.GoalInfoReqDto;
 import com.education.model.entity.GoalInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.education.model.request.PageParam;

education-business/src/main/java/com/education/business/service/education/impl/GoalInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.education.business.service.BaseService;
 import com.education.common.enums.LoginEnum;
 import com.education.common.model.PageInfo;
 import com.education.common.utils.Result;
+import com.education.model.dto.GoalInfoReqDto;
 import com.education.model.entity.GoalInfo;
 import com.education.business.service.education.GoalInfoService;
 import com.education.business.mapper.education.GoalInfoMapper;

education-business/src/main/resources/mapper/education/GoalInfoMapper.xml

@@ -5,25 +5,26 @@
 <mapper namespace="com.education.business.mapper.education.GoalInfoMapper">
 
     <resultMap id="BaseResultMap" type="com.education.model.dto.GoalInfoDto">
-            <id property="id" column="id" />
-            <result property="subjectId" column="subject_id" />
-            <result property="schoolType" column="school_type" />
-            <result property="courseSectionId" column="course_section_id" />
-            <result property="courseId" column="course_id" />
-            <result property="gradeId" column="grade_id" />
-            <result property="courseName" column="course_name" />
-            <result property="courseSectionName" column="course_section_name"/>
-            <result property="content" column="content" />
-            <result property="gOriented" column="g_oriented" />
-            <result property="pScoreStd" column="p_score_std" />
-            <result property="sScoreStd" column="s_score_std" />
-            <result property="rScoreStd" column="r_score_std" />
-            <result property="eScoreStd" column="e_score_std" />
-            <result property="nScoreStd" column="n_score_std" />
-            <result property="createUser" column="create_user" />
-            <result property="createDate" column="create_date" />
-            <result property="updateDate" column="update_date" />
-            <result property="knowPoints" column="know_points" />
+        <id property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="schoolType" column="school_type"/>
+        <result property="courseSectionId" column="course_section_id"/>
+        <result property="courseId" column="course_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="courseName" column="course_name"/>
+        <result property="courseSectionName" column="course_section_name"/>
+        <result property="content" column="content"/>
+        <result property="gOriented" column="g_oriented"/>
+        <result property="pScoreStd" column="p_score_std"/>
+        <result property="sScoreStd" column="s_score_std"/>
+        <result property="rScoreStd" column="r_score_std"/>
+        <result property="eScoreStd" column="e_score_std"/>
+        <result property="nScoreStd" column="n_score_std"/>
+        <result property="createUser" column="create_user"/>
+        <result property="knowPoints" column="know_points"/>
+        <result property="publishFlag" column="publish_flag"/>
+        <result property="createDate" column="create_date"/>
+        <result property="updateDate" column="update_date"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -38,7 +39,7 @@
         left join course_info
         on  goal_info.course_id = course_info.id
         left join course_section
-        ON  goal_info.course_id = course_section.course_id AND     goal_info.course_section_id = course_section.id
+        ON  goal_info.course_id = course_section.course_id AND goal_info.course_section_id = course_section.id
         <where>
             <if test="goalInfo.gOriented != null and goalInfo.gOriented != ''">
                 <bind name="gOriented" value="'%' + goalInfo.gOriented + '%'"/>
@@ -49,13 +50,21 @@
                 and goal_info.subject_id = #{goalInfo.subjectId}
             </if>
 
-            <if test="goalInfo.courseSectionId != null">
-                and goal_info.course_section_id = #{goalInfo.courseSectionId}
+            <if test="goalInfo.gradeId != null">
+                and goal_info.grade_id = #{goalInfo.gradeId}
+            </if>
+
+            <if test="goalInfo.schoolType != null">
+                and goal_info.school_type = #{goalInfo.schoolType}
             </if>
 
             <if test="goalInfo.courseId != null">
                 and goal_info.course_id = #{goalInfo.courseId}
             </if>
+
+            <if test="goalInfo.courseSectionId != null">
+                and goal_info.course_section_id = #{goalInfo.courseSectionId}
+            </if>
         </where>
     </select>
 </mapper>

education-model/src/main/java/com/education/model/dto/GoalInfoReqDto.java

@@ -0,0 +1,28 @@
+package com.education.model.dto;
+
+import lombok.Data;
+
+@Data
+public class GoalInfoReqDto {
+    /**
+     * 阶段id
+     */
+    private Integer schoolType;
+
+    /**
+     * 年级，可为空
+     */
+    private Integer gradeId;
+
+    /**
+     * 课程id
+     */
+    private Integer courseId;
+
+    /**
+     * 导向目标G
+     */
+    private String gOriented;
+
+
+}

education-model/src/main/java/com/education/model/entity/GoalInfo.java

@@ -138,38 +138,26 @@ public class GoalInfo extends BaseEntity<GoalInfo>{
         this.knowPoints = knowPoints;
     }
 
-    public @NotNull Integer getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(@NotNull Integer createUser) {
-        this.createUser = createUser;
-    }
-
-    @Override
-    public Date getCreateDate() {
-        return createDate;
+    public Integer getPublishFlag() {
+        return publishFlag;
     }
 
-    @Override
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setPublishFlag(Integer publishFlag) {
+        this.publishFlag = publishFlag;
     }
 
-    @Override
-    public Date getUpdateDate() {
-        return updateDate;
+    public @NotNull Integer getCreateUser() {
+        return createUser;
     }
 
-    @Override
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
+    public void setCreateUser(@NotNull Integer createUser) {
+        this.createUser = createUser;
     }
 
     /**
      * 学科名称
      */
-    @NotNull
+    @NotNull(groups = {Add.class,Update.class})
     private Integer subjectId;
 
     /**
@@ -183,7 +171,7 @@ public class GoalInfo extends BaseEntity<GoalInfo>{
     private Integer courseSectionId;
 
     /**
-     * 
+     * 课程id
      */
     private Integer courseId;
 
@@ -198,7 +186,7 @@ public class GoalInfo extends BaseEntity<GoalInfo>{
     /**
      * 导向目标G
      */
-    @NotEmpty
+    @NotEmpty(groups = {Add.class,Update.class})
     private String gOriented;
 
     /**
@@ -229,23 +217,15 @@ public class GoalInfo extends BaseEntity<GoalInfo>{
     //知识点
     private String knowPoints;
 
+    //发布标识,0-未发布，1-已发布
+    private Integer publishFlag;
+
     /**
      * 创建人
      */
-    @NotNull
+    @NotNull(groups = {Add.class,Update.class})
     private Integer createUser;
 
-    /**
-     * 
-     */
-    private Date createDate;
-
-    /**
-     * 
-     */
-    private Date updateDate;
-
-
     public interface Add extends Default {}
     public interface Update extends Default{}
 }