Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -3,13 +3,12 @@ package com.ym.mec.auth.api.client;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.ym.mec.auth.api.client.fallback.SysUserFeignServiceFallback;
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.config.FeignConfiguration;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "auth-server", configuration = FeignConfiguration.class, fallback = SysUserFeignServiceFallback.class)
 public interface SysUserFeignService {

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -5,7 +5,6 @@ import org.springframework.stereotype.Component;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.entity.SysUser;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @Component
 public class SysUserFeignServiceFallback implements SysUserFeignService {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/School.java

@@ -51,6 +51,10 @@ public class School {
 	
 	@ApiModelProperty(value = "补贴", required = false)
 	private BigDecimal subsidy;
+	
+	private Integer cooperationOrganId;
+	
+	private String remark;
 
 	public void setId(Integer id) {
 		this.id = id;
@@ -140,6 +144,22 @@ public class School {
 		this.subsidy = subsidy;
 	}
 
+	public Integer getCooperationOrganId() {
+		return cooperationOrganId;
+	}
+
+	public void setCooperationOrganId(Integer cooperationOrganId) {
+		this.cooperationOrganId = cooperationOrganId;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/resources/config/mybatis/SchoolMapper.xml

@@ -18,6 +18,8 @@
         <result column="contact_name_" property="contactName"/>
         <result column="longitude_latitude_" property="longitudeLatitude"/>
         <result column="subsidy_" property="subsidy"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="remark_" property="remark"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -39,8 +41,8 @@
         </selectKey>
         -->
         INSERT INTO school
-        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_)
-        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy})
+        (id_,name_,organ_id_,address_,contact_phone_,create_time_,update_time_,contact_name_,longitude_latitude_,subsidy_,cooperation_organ_id_,remark_)
+        VALUES(#{id},#{name},#{organId},#{address},#{contactPhone},now(),now(),#{contactName},#{longitudeLatitude},#{subsidy},#{cooperationOrganId},#{remark})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -74,6 +76,12 @@
             <if test="subsidy != null">
                 subsidy_ = #{subsidy},
             </if>
+            <if test="cooperationOrganId != null">
+                cooperation_organ_id_ = #{cooperationOrganId},
+            </if>
+            <if test="remark != null">
+                remark_ = #{remark},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>