收班状态修改。

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,44 +12,44 @@ import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 /**
-  描述:bus_shift_info的实体类
+ * 描述:bus_shift_info的实体类
  */
 @Data
 @ApiModel(value = "bus_shift_info的实体类")
 public class ShiftInfo {
-        @ApiModelProperty(value = "车辆班次编号")
+    @ApiModelProperty(value = "车辆班次编号")
     private String id;
-        @ApiModelProperty(value = "司机")
-    private Long  driverId;
-        @ApiModelProperty(value = "车辆编号")
+    @ApiModelProperty(value = "司机")
+    private Long driverId;
+    @ApiModelProperty(value = "车辆编号")
     private String vehicleId;
-        @ApiModelProperty(value = "路线编号")
+    @ApiModelProperty(value = "路线编号")
     private String routeId;
-        @ApiModelProperty(value = "起始站")
+    @ApiModelProperty(value = "起始站")
     private String startStationId;
-        @ApiModelProperty(value = "当前站点")
+    @ApiModelProperty(value = "当前站点")
     private String currentStationId;
-        @ApiModelProperty(value = "状态值")
+    @ApiModelProperty(value = "状态值(1：进行中，2：结束)")
     private String status;
-        @ApiModelProperty(value = "终点站")
+    @ApiModelProperty(value = "终点站")
     private String endStationId;
-        @ApiModelProperty(value = "创建人")
+    @ApiModelProperty(value = "创建人")
     private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-        @ApiModelProperty(value = "更新人")
+    @ApiModelProperty(value = "更新人")
     private String updateBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-        @ApiModelProperty(value = "是否删除")
+    @ApiModelProperty(value = "是否删除")
     private Boolean delFlag = false;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "是否收班（到达终点站，乘客全部下车）")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ApiModelProperty(value = "是否收班（到达终点站，乘客全部下车）")
     private Date finishTime;
 
     @ApiModelProperty(value = "司机")

web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -1016,6 +1016,7 @@ public class DriverApiController {
 
             ShiftInfo shiftInfo = shiftInfoList.get(0);
 
+            shiftInfo.setStatus("2");
             shiftInfo.setFinishTime(new Date());
             shiftInfo.setUpdateTime(new Date());
             shiftInfo.setUpdateBy(subject);