Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/bus/modules/bus/entity/ShiftInfo.java

@@ -68,6 +68,4 @@ public class ShiftInfo implements Serializable {
     private String endStationName;
     @ApiModelProperty(value = "间隔时间(分钟)")
     private Integer interval;
-    @ApiModelProperty(value = "半径(米)")
-    private Integer radius;
 }

common/src/main/java/com/jpsoft/bus/modules/bus/entity/StationInfo.java

@@ -44,4 +44,6 @@ public class StationInfo {
     private Date updateTime;
         @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
+    @ApiModelProperty(value = "半径(米)")
+    private Integer radius;
 }

common/src/main/resources/mapper/bus/ShiftInfo.xml

@@ -26,7 +26,6 @@
 			<result property="currentStationName" column="current_station_name" />
 			<result property="endStationName" column="end_station_name" />
 			<result property="interval" column="interval_" />
-			<result property="radius" column="radius_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
 	<!--
@@ -37,7 +36,7 @@
 	<![CDATA[
 		insert into bus_shift_info
 	    (id_,driver_id,vehicle_id,route_id,start_station_id,current_station_id,current_station_status,status_,end_station_id,create_by,create_time,update_by,update_time,del_flag,finish_time,
-	    interval_,radius_
+	    interval_
 	    )
 		values
 		(
@@ -57,7 +56,6 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{finishTime,jdbcType= TIMESTAMP }
 ,#{interval,jdbcType= NUMERIC }
-,#{radius,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -112,9 +110,6 @@
 			<if test="interval!=null">
 				interval_=#{interval,jdbcType= NUMERIC },
 			</if>
-			<if test="radius!=null">
-				radius_=#{radius,jdbcType= NUMERIC },
-			</if>
 		</set>
 	where id_=#{id}
 	</update>

common/src/main/resources/mapper/bus/StationInfo.xml

@@ -16,6 +16,7 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="radius" column="radius_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.StationInfo">
 	<!--
@@ -25,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into bus_station_info
-	    (id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,sort_no,route_id,name_,longitude_,latitude_,classify_,create_by,create_time,update_by,update_time,del_flag,radius_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -40,6 +41,7 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
+,#{radius,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -82,6 +84,9 @@
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
 		</if>
+			<if test="radius!=null">
+				radius_=#{radius,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>