Ver Fonte

feat:行车日志增加字段

wangweiyu há 4 anos atrás
pai
commit
4fdc4e4400

+ 9 - 0
src/main/java/com/aoyang/tms/entity/WorkLog.java

@@ -59,6 +59,15 @@ public class WorkLog implements Serializable {
     @TableField("order_id")
     @TableField("order_id")
     private String orderId;
     private String orderId;
 
 
+    @ApiModelProperty(value = "作业地点id")
+    @TableField("spot_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long spotId;
+
+    @ApiModelProperty(value = "作业地点名")
+    @TableField("spot_name")
+    private String spotName;
+
     @ApiModelProperty(value = "物流公司id")
     @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     @JsonFormat(shape = JsonFormat.Shape.STRING)

+ 3 - 1
src/main/resources/mapper/WorkLogMapper.xml

@@ -22,12 +22,14 @@
         <result column="jing_weight" property="jingWeight" />
         <result column="jing_weight" property="jingWeight" />
         <result column="start_time" property="startTime" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="end_time" property="endTime" />
+        <result column="spot_id" property="spotId" />
+        <result column="spot_name" property="spotName" />
     </resultMap>
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id, cycle_id, title, note, order_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, creater, creater_name, create_date,
         id, cycle_id, title, note, order_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, creater, creater_name, create_date,
-        pi_weight, mao_weight, jing_weight, start_time, end_time
+        pi_weight, mao_weight, jing_weight, start_time, end_time, spot_id, spot_name
     </sql>
     </sql>
 
 
 </mapper>
 </mapper>