Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApplicationMiddle.java

@@ -105,4 +105,7 @@ public class ApplicationMiddle {
 
 	@ApiModelProperty(value = "择校原因")
 	private String chooseReason;
+
+	@ApiModelProperty(value = "录取编号")
+	private String offerId;
 }

common/src/main/java/com/jpsoft/campus/modules/base/entity/ApplicationPrimary.java

@@ -100,4 +100,7 @@ public class ApplicationPrimary {
 
     @ApiModelProperty(value = "所在社区")
     private String communityId;
+
+    @ApiModelProperty(value = "录取编号")
+    private String offerId;
 }

common/src/main/resources/mapper/base/ApplicationMiddle.xml

@@ -21,6 +21,7 @@
         <result property="communityId" column="community_id"/>
         <result property="chooseReason" column="choose_reason"/>
         <result property="hit" column="hit_"/>
+        <result property="offerId" column="offer_id"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.campus.modules.base.entity.ApplicationMiddle">
         <!--
@@ -30,7 +31,7 @@
         -->
         <![CDATA[
 		insert into base_application_middle
-	    (id_,create_by,create_time,update_by,update_time,del_flag,type_,status_,category_id,now_address,person_id,school_id,student_id,street_id,community_id,choose_reason,hit_)
+	    (id_,create_by,create_time,update_by,update_time,del_flag,type_,status_,category_id,now_address,person_id,school_id,student_id,street_id,community_id,choose_reason,hit_,offer_id)
 		values
 		(
 #{id,jdbcType= VARCHAR }
@@ -50,6 +51,7 @@
 ,#{communityId,jdbcType=VARCHAR}
 ,#{chooseReason,jdbcType=VARCHAR}
 ,#{hit,jdbcType=VARCHAR}
+,#{offerId,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -107,6 +109,9 @@
             <if test="hit != null">
                 hit_=#{hit,jdbcType=VARCHAR},
             </if>
+            <if test="offerId!=null">
+                offer_id=#{offerId,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>

common/src/main/resources/mapper/base/ApplicationPrimary.xml

@@ -20,6 +20,7 @@
         <result property="streetId" column="street_id"/>
         <result property="communityId" column="community_id"/>
         <result property="schoolId" column="school_id"/>
+        <result property="offerId" column="offer_id"/>
     </resultMap>
     <insert id="insert" parameterType="com.jpsoft.campus.modules.base.entity.ApplicationPrimary">
         <!--
@@ -30,7 +31,7 @@
         <![CDATA[
 		insert into base_application_primary
 	    (id_,create_by,create_time,update_by,update_time,del_flag,type_,
-	    status_,category_id,now_address,person_id,student_id,street_id,community_id,school_id,hit_)
+	    status_,category_id,now_address,person_id,student_id,street_id,community_id,school_id,hit_,offer_id)
 		values
 		(
 			#{id,jdbcType= VARCHAR }
@@ -49,6 +50,7 @@
 			,#{communityId,jdbcType=VARCHAR}
 			,#{schoolId,jdbcType=VARCHAR}
 			,#{hit,jdbcType= NUMERIC }
+			,#{offerId,jdbcType=VARCHAR}
 		)
 	]]>
     </insert>
@@ -103,6 +105,9 @@
             <if test="schoolId!=null">
                 school_id=#{schoolId,jdbcType=VARCHAR},
             </if>
+            <if test="offerId!=null">
+                offer_id=#{offerId,jdbcType=VARCHAR},
+            </if>
         </set>
         where id_=#{id}
     </update>