Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/DistinguishView.java

@@ -27,6 +27,8 @@ public class DistinguishView {
     private String licenseName;
     //企业法人
     private String licensePerson;
+    //驾驶证起始有效期
+    private String driverStartDate;
     //驾驶证有效期
     private String driverEndDate;
     //行驶证有效期

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java

@@ -848,8 +848,9 @@ public class EntityAnalyse {
             System.out.println(body);
             JSONObject jsonObject = JSONObject.parseObject(body);
             distinguishView.setDriverEndDate(jsonObject.getString("end_date"));
+            distinguishView.setDriverStartDate(jsonObject.getString("start_date"));
             String s = jsonObject.getString("vehicle_type");
-            if (s == "A2" || s == "B2") {
+            if ("A2".equals(s) || "B2".equals(s)) {
                 distinguishView.setAllowCar(s);
             }
             distinguishView.setIssuingAuthority(jsonObject.getString("issue_organization"));

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverCarInfoMapper.xml

@@ -197,6 +197,8 @@
         c.owner,
         c.use_nature as useNature,
         c.vehicle_type as vehicleType,
+        c.trailer_vehicle_type as trailerVehicleType,
+        c.trailer_car_code as trailerCarCode,
         c.car_long as carLong,
         c.car_width as carWidth,
         c.car_height as carHeight,