update

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -43,8 +43,8 @@ public class UserController extends BaseController {
 //    @ApiOperation(value = "根据乐团编号、用户手机，查询用户详情")
 //    @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "用户手机", required = true, dataType = "String"),
 //            @ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
-    public Object getUserDetailByPhone(String phone,Integer clazzId){
-        if(StringUtils.isEmpty(phone) || clazzId == null){
+    public Object getUserDetailByPhone(String phone,Integer clazzId,Integer cityId){
+        if(StringUtils.isEmpty(phone) || clazzId == null || cityId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
         if(applyInfoService.mecUserIsExist(phone)){
@@ -55,8 +55,15 @@ public class UserController extends BaseController {
         	return failed(Constants.PARAM_EXIST_ERROR_MSG);
         }
         School school = schoolService.get(clazzId);
-        if(userByPhone != null){
-        	userByPhone.setPushStatus(school.getStatus());
+        if(school != null){
+            if(school.getCityId() == null){
+                school.setCityId(cityId);
+                school.setUpdateTime(new Date());
+                schoolService.update(school);
+            }
+            if(userByPhone != null){
+                userByPhone.setPushStatus(school.getStatus());
+            }
         }
         return succeed(userByPhone);
     }

src/main/java/com/ym/mec/collectfee/entity/ApplyInfo.java

@@ -48,7 +48,7 @@ public class ApplyInfo {
 
 	/** 学校名称 */
 	@XStreamOmitField
-	private String school;
+	private Integer schoolId;
 
 	/** 年级 */
 	@XStreamOmitField
@@ -200,12 +200,12 @@ public class ApplyInfo {
 		return this.city;
 	}
 
-	public void setSchool(String school){
-		this.school = school;
+	public Integer getSchoolId() {
+		return schoolId;
 	}
 
-	public String getSchool(){
-		return this.school;
+	public void setSchoolId(Integer schoolId) {
+		this.schoolId = schoolId;
 	}
 
 	public void setGrade(String grade){

src/main/java/com/ym/mec/collectfee/entity/School.java

@@ -30,13 +30,31 @@ public class School {
 	
 	/** 学校名称 */
 	private String schoolName;
+
+	private Integer cityId;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public String geteDeposit() {
+		return eDeposit;
+	}
+
+	public void seteDeposit(String eDeposit) {
+		this.eDeposit = eDeposit;
+	}
+
+	public Integer getCityId() {
+		return cityId;
+	}
+
+	public void setCityId(Integer cityId) {
+		this.cityId = cityId;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

src/main/java/com/ym/mec/collectfee/service/ApplyInfoService.java

@@ -4,7 +4,6 @@ import com.ym.mec.collectfee.common.page.PageInfo;
 import com.ym.mec.collectfee.common.service.BaseService;
 import com.ym.mec.collectfee.entity.*;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -13,7 +13,7 @@
 		<result column="sex_" property="sex" />
 		<result column="birthday_" property="birthday" />
 		<result column="city_" property="city" />
-		<result column="school_" property="school" />
+		<result column="school_id_" property="schoolId" />
 		<result column="course_id_" property="courseId" />
 		<result column="class_id_" property="classId" />
 		<result column="branch_id_" property="branchId" />
@@ -37,7 +37,7 @@
 		<result column="sex_" property="sex" />
 		<result column="birthday_" property="birthday" />
 		<result column="city_" property="city" />
-		<result column="school_" property="school" />
+		<result column="school_id_" property="schoolId" />
 		<result column="course_id_" property="courseId" />
 		<result column="class_id_" property="classId" />
 		<result column="branch_id_" property="branchId" />
@@ -68,8 +68,8 @@
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.collectfee.entity.ApplyInfo" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO apply_info (course_id_,class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,update_time_,create_time_) VALUES
-		(#{courseId},#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{school},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{updateTime},#{createTime})
+		INSERT INTO apply_info (course_id_,class_id_,user_id_,branch_id_,name_,sex_,birthday_,city_,school_id_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,update_time_,create_time_) VALUES
+		(#{courseId},#{classId},#{userId},#{branchId},#{name},#{sex},#{birthday},#{city},#{schoolId},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{updateTime},#{createTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -88,8 +88,8 @@
 			<if test="subId != null">
 				sub_id_ = #{subId},
 			</if>
-			<if test="school != null">
-				school_ = #{school},
+			<if test="schoolId != null">
+				school_id_ = #{schoolId},
 			</if>
 			<if test="isAdjust != null">
 				is_adjust_ = #{isAdjust},

src/main/resources/config/mybatis/SchoolMapper.xml

@@ -14,6 +14,7 @@
 		<result column="branch_name_" property="branchName" />
 		<result column="e_deposit__" property="eDeposit" />
 		<result column="school_id_" property="schoolId" />
+		<result column="city_id_" property="cityId" />
 		<result column="school_name_" property="schoolName" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -36,7 +37,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO school (id_,name_,status_,branch_id_,branch_name_,e_deposit__,school_id_,school_name_,create_time_,update_time_) VALUES(#{id},#{name},#{status},#{branchId},#{branchName},#{eDeposit},#{schoolId},#{schoolName},#{createTime},#{updateTime})
+		INSERT INTO school (city_id_,id_,name_,status_,branch_id_,branch_name_,e_deposit__,school_id_,school_name_,create_time_,update_time_)
+		VALUES(#{cityId},#{id},#{name},#{status},#{branchId},#{branchName},#{eDeposit},#{schoolId},#{schoolName},#{createTime},#{updateTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -49,6 +51,9 @@
 			<if test="schoolId != null">
 				school_id_ = #{schoolId},
 			</if>
+			<if test="cityId != null">
+				city_id_ = #{cityId},
+			</if>
 			<if test="eDeposit != null">
 				e_deposit__ = #{eDeposit},
 			</if>