瀏覽代碼

线路人员关联表

xiao547607 4 年之前
父節點
當前提交
fc53c4f542

+ 4 - 16
common/src/main/java/com/jpsoft/bus/modules/bus/entity/RouteAccount.java

@@ -18,8 +18,10 @@ import lombok.Data;
 public class RouteAccount {
         @ApiModelProperty(value = "主键")
     private String id;
-        @ApiModelProperty(value = "路线")
-    private String name;
+        @ApiModelProperty(value = "线路ID")
+    private String routeId;
+        @ApiModelProperty(value = "营收用户ID")
+    private String accountId;
         @ApiModelProperty(value = "创建人")
     private String createBy;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@@ -34,18 +36,4 @@ public class RouteAccount {
     private Date updateTime;
         @ApiModelProperty(value = "是否删除")
     private Boolean delFlag;
-        @ApiModelProperty(value = "地图路线(坐标用|分隔,经纬度用,)")
-    private String mapPath;
-        @ApiModelProperty(value = "单位编号")
-    private String companyId;
-        @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-        @ApiModelProperty(value = "开始时间")
-    private String startTime;
-        @ApiModelProperty(value = "结束时间")
-    private String endTime;
-        @ApiModelProperty(value = "地区id")
-    private String regionId;
-        @ApiModelProperty(value = "间隔时间(分钟)")
-    private Integer interval;
 }

+ 11 - 41
common/src/main/resources/mapper/bus/RouteAccount.xml

@@ -5,19 +5,13 @@
 <mapper namespace="com.jpsoft.bus.modules.bus.dao.RouteAccountDAO">
 	<resultMap id="RouteAccountMap" type="com.jpsoft.bus.modules.bus.entity.RouteAccount">
 		<id property="id" column="id_" />
-			<result property="name" column="name_" />
+			<result property="routeId" column="route_id" />
+			<result property="accountId" column="account_id" />
 			<result property="createBy" column="create_by" />
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
-			<result property="mapPath" column="map_path" />
-			<result property="companyId" column="company_id" />
-			<result property="goodsId" column="goods_id" />
-			<result property="startTime" column="start_time" />
-			<result property="endTime" column="end_time" />
-			<result property="regionId" column="region_id" />
-			<result property="interval" column="interval_" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.bus.entity.RouteAccount">
 	<!--
@@ -27,23 +21,17 @@
 	-->
 	<![CDATA[
 		insert into bus_route_account
-	    (id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time,region_id,interval_)
+	    (id_,route_id,account_id,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
 #{id,jdbcType=VARCHAR}
-,#{name,jdbcType=VARCHAR}
+,#{routeId,jdbcType=VARCHAR}
+,#{accountId,jdbcType=VARCHAR}
 ,#{createBy,jdbcType=VARCHAR}
 ,#{createTime,jdbcType= TIMESTAMP }
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
-,#{mapPath,jdbcType=VARCHAR}
-,#{companyId,jdbcType=VARCHAR}
-,#{goodsId,jdbcType=VARCHAR}
-,#{startTime,jdbcType=VARCHAR}
-,#{endTime,jdbcType=VARCHAR}
-,#{regionId,jdbcType=VARCHAR}
-,#{interval,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -53,8 +41,11 @@
 	<update id="update" parameterType="com.jpsoft.bus.modules.bus.entity.RouteAccount">
 		update bus_route_account
 		<set>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
+				<if test="routeId!=null">
+		route_id=#{routeId,jdbcType=VARCHAR},
+		</if>
+				<if test="accountId!=null">
+		account_id=#{accountId,jdbcType=VARCHAR},
 		</if>
 				<if test="createBy!=null">
 		create_by=#{createBy,jdbcType=VARCHAR},
@@ -70,34 +61,13 @@
 		</if>
 				<if test="delFlag!=null">
 		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-				<if test="mapPath!=null">
-		map_path=#{mapPath,jdbcType=VARCHAR},
-		</if>
-				<if test="companyId!=null">
-		company_id=#{companyId,jdbcType=VARCHAR},
-		</if>
-				<if test="goodsId!=null">
-		goods_id=#{goodsId,jdbcType=VARCHAR},
-		</if>
-				<if test="startTime!=null">
-		start_time=#{startTime,jdbcType=VARCHAR},
-		</if>
-				<if test="endTime!=null">
-		end_time=#{endTime,jdbcType=VARCHAR},
-		</if>
-				<if test="regionId!=null">
-		region_id=#{regionId,jdbcType=VARCHAR},
-		</if>
-				<if test="interval!=null">
-		interval_=#{interval,jdbcType= NUMERIC },
 		</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="RouteAccountMap">
 		select 
-id_,name_,create_by,create_time,update_by,update_time,del_flag,map_path,company_id,goods_id,start_time,end_time,region_id,interval_		from bus_route_account where id_=#{0}
+id_,route_id,account_id,create_by,create_time,update_by,update_time,del_flag		from bus_route_account where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from bus_route_account where id_=#{0}