用户信息

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -34,7 +34,7 @@ public class WorkerInfo {
 
     @ApiModelProperty(value = "司机1电话")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverPhoneOne;
+    private String driverPhoneOne;
 
     @ApiModelProperty(value = "司机1姓名")
     private String driverNameOne;
@@ -45,7 +45,7 @@ public class WorkerInfo {
 
     @ApiModelProperty(value = "司机2电话")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverPhoneTwo;
+    private String driverPhoneTwo;
 
     @ApiModelProperty(value = "司机2姓名")
     private String driverNameTwo;
@@ -54,7 +54,7 @@ public class WorkerInfo {
     private String escortName;
 
     @ApiModelProperty(value = "押运员电话")
-    private Long escortPhone;
+    private String escortPhone;
 
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
@@ -72,7 +72,7 @@ public class WorkerInfo {
     private int time;
 
     @ApiModelProperty(value = "直接返回文字空车或重车")
-    private int isZhongche;
+    private String isZhongche;
 
     @ApiModelProperty(value = "装车运单数量")
     private int zhuangcheNumber;

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -71,6 +71,7 @@ public class CommonServiceImpl implements CommonService {
 
             //已收车
             if (truck.getTmsStatus() == 0) {
+                workerInfo.setIsZhongche("空车");
                 workerInfo.setZhuangcheNumber(0);
                 workerInfo.setXiecheNumber(0);
             }
@@ -81,9 +82,18 @@ public class CommonServiceImpl implements CommonService {
         if (truckDrivers != null && truckDrivers.size() > 0) {
             workerInfo.setDriverIdOne(truckDrivers.get(0).getDriverId());
             workerInfo.setDriverNameOne(truckDrivers.get(0).getDriverName());
+
+            User user = findUser(truckDrivers.get(0).getDriverId());
+            if (user != null) {
+                workerInfo.setDriverPhoneOne(user.getMobile());
+            }
             if (truckDrivers.size() > 1) {
                 workerInfo.setDriverIdTwo(truckDrivers.get(1).getDriverId());
                 workerInfo.setDriverNameTwo(truckDrivers.get(1).getDriverName());
+                user = findUser(truckDrivers.get(1).getDriverId());
+                if (user != null) {
+                    workerInfo.setDriverPhoneTwo(user.getMobile());
+                }
             }
         }
 
@@ -96,6 +106,10 @@ public class CommonServiceImpl implements CommonService {
         if (truckEscort != null) {
             workerInfo.setEscortId(truckEscort.getUserId());
             workerInfo.setEscortName(truckEscort.getEscortName());
+            User user = findUser(truckEscort.getUserId());
+            if (user != null) {
+                workerInfo.setEscortPhone(user.getMobile());
+            }
         }
 
         return workerInfo;