xiao547607 4 rokov pred
rodič
commit
4380430700

+ 2 - 0
common/src/main/java/com/jpsoft/bus/modules/bus/entity/RouteInfo.java

@@ -51,4 +51,6 @@ public class RouteInfo {
     private String regionId;
     @ApiModelProperty(value = "地区翻译")
     private String regionName;
+    @ApiModelProperty(value = "间隔时间(分钟)")
+    private Integer interval;
 }

+ 0 - 2
common/src/main/java/com/jpsoft/bus/modules/bus/entity/ShiftInfo.java

@@ -66,6 +66,4 @@ public class ShiftInfo implements Serializable {
     private String currentStationName;
     @ApiModelProperty(value = "终点站")
     private String endStationName;
-    @ApiModelProperty(value = "间隔时间(分钟)")
-    private Integer interval;
 }

+ 6 - 1
common/src/main/resources/mapper/bus/RouteInfo.xml

@@ -19,6 +19,7 @@
 			<result property="companyName" column="company_name" />
 			<result property="regionId" column="region_id"/>
 			<result property="regionName" column="region_name" />
+			<result property="interval" column="interval_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.RouteInfo">
 	<!--
@@ -29,7 +30,7 @@
 	<![CDATA[
 		insert into bus_route_info
 	    (id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time,
-	    region_id)
+	    region_id,interval_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -45,6 +46,7 @@
 ,#{startTime,jdbcType=VARCHAR}
 ,#{endTime,jdbcType=VARCHAR}
             ,#{regionId,jdbcType=VARCHAR}
+			,#{interval,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -90,6 +92,9 @@
 			<if test="regionId!=null">
 				region_id=#{regionId,jdbcType= VARCHAR },
 			</if>
+			<if test="interval!=null">
+				interval_=#{interval,jdbcType= NUMERIC },
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

+ 1 - 7
common/src/main/resources/mapper/bus/ShiftInfo.xml

@@ -25,7 +25,6 @@
 			<result property="startStationName" column="start_station_name" />
 			<result property="currentStationName" column="current_station_name" />
 			<result property="endStationName" column="end_station_name" />
-			<result property="interval" column="interval_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.ShiftInfo">
 	<!--
@@ -35,8 +34,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_
+	    (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
 	    )
 		values
 		(
@@ -55,7 +53,6 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{finishTime,jdbcType= TIMESTAMP }
-,#{interval,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -107,9 +104,6 @@
 				<if test="finishTime!=null">
 		finish_time=#{finishTime,jdbcType= TIMESTAMP },
 		</if>
-			<if test="interval!=null">
-				interval_=#{interval,jdbcType= NUMERIC },
-			</if>
 		</set>
 	where id_=#{id}
 	</update>