志愿表新增字段

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="userMap" type="cn.wisenergy.model.app.Volunteer">
         <id column="id" property="id"/>
         <result column="type" property="type"/>
+        <result column="scheme_id" property="schemeId"/>
         <result column="major_name" property="majorName"/>
         <result column="academy" property="academy"/>
         <result column="course_demand" property="courseDemand"/>
@@ -30,18 +31,19 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        type,major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
+        type,scheme_id,major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
         lowest_rank,is_delete,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{type},#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum},
+        #{type},#{scheme},#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum},
         #{launchNum},
         #{lowestMark}, #{lowestRank},#{isDelete},now(),now()
     </sql>
 
     <sql id="updateCondition">
         <if test="type != null">type = #{type},</if>
+        <if test="scheme != null">scheme = #{scheme},</if>
         <if test="majorName != null">major_name = #{majorName},</if>
         <if test="academy != null">academy =#{academy},</if>
         <if test="courseDemand != null">course_demand =#{courseDemand},</if>
@@ -59,6 +61,7 @@
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
         <if test="type != null">and type = #{type}</if>
+        <if test="scheme != null">and scheme = #{scheme}</if>
         <if test="majorName != null">and major_name = #{majorName}</if>
         <if test="academy != null">and academy =#{academy}</if>
         <if test="courseDemand != null">and course_demand =#{courseDemand}</if>

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

@@ -40,6 +40,12 @@ public class Volunteer extends BaseEntity implements Serializable {
             "5：专科专业分类6：专科美术一批 7：专科文学编导一批 8：专科体育一批", name = "type")
     private Integer type;
 
+    /**
+     * 方案id
+     */
+    @ApiModelProperty(value = "方案id", name = "schemeId")
+    private Integer schemeId;
+
     /**
      * 专业名称
      */