修改

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

@@ -68,6 +68,10 @@ public class HyCommonRoute extends BaseModel<HyCommonRoute> {
      * 收货地区
      */
     private String unloadArea;
+    /**
+     * 显示标识（1显示2隐藏）
+     */
+    private String displayFlag;
 
     /**
      * 起始地

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

@@ -1,16 +1,18 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.io.Serializable;
-
+import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -78,7 +80,87 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
      */
     private String addressUrl;
     /**
-     * 认证状态key（1审核中3未通过5已通过）
+     * 道路运输证
+     */
+    private String operationCertificate;
+    /**
+     * 道路运输证号
+     */
+    private String operationCertificateNumber;
+    /**
+     * 道路运输证有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date operationCertificateValidityDate;
+    /**
+     * 挂车道路运输证
+     */
+    private String trailerOperationCertificate;
+    /**
+     * 挂车道路运输证号
+     */
+    private String trailerOperationCertificateNumber;
+    /**
+     * 挂车运输证有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date trailerOperationCertificateValidityDate;
+    /**
+     * 行驶证主页
+     */
+    private String drivingLicenseHomePage;
+    /**
+     * 行驶证副页
+     */
+    private String drivingLicenseBackPage;
+    /**
+     * 行驶证档案编号
+     */
+    private String drivingLicenseNumber;
+    /**
+     * 行驶证有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date drivingLicenseValidityDate;
+    /**
+     * 挂车行驶证主页
+     */
+    private String trailerLicenseHomePage;
+    /**
+     * 挂车行驶证副页
+     */
+    private String trailerLicenseBackPage;
+    /**
+     * 挂车行驶证档案编号
+     */
+    private String trailerLicenseNumber;
+    /**
+     * 挂车行驶证有效期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date trailerLicenseValidityDate;
+    /**
+     * 行驶证过期标识（1是）
+     */
+    private String drivingOverdueFlag;
+    /**
+     * 挂车行驶证过期标识（1是）
+     */
+    private String trailerOverdueFlag;
+    /**
+     * 道路运输证过期标识（1是）
+     */
+    private String operationOverdueFlag;
+    /**
+     * 挂车运输证过期标识（1是）
+     */
+    private String trailerOperationOverdueFlag;
+    /**
+     * 认证状态key（1审核中3未通过5已通过9已过期）
      */
     private String statusKey;
     /**

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

@@ -99,42 +99,6 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date driverLicenseValidityDate;
-    /**
-     * 行驶证主页
-     */
-    private String drivingLicenseHomePage;
-    /**
-     * 行驶证副页
-     */
-    private String drivingLicenseBackPage;
-    /**
-     * 行驶证档案编号
-     */
-    private String drivingLicenseNumber;
-    /**
-     * 行驶证有效期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date drivingLicenseValidityDate;
-    /**
-     * 挂车行驶证主页
-     */
-    private String trailerLicenseHomePage;
-    /**
-     * 挂车行驶证副页
-     */
-    private String trailerLicenseBackPage;
-    /**
-     * 挂车行驶证档案编号
-     */
-    private String trailerLicenseNumber;
-    /**
-     * 挂车行驶证有效期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date trailerLicenseValidityDate;
     /**
      * 从业资格证
      */
@@ -145,34 +109,6 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date qualificationCertificateValidityDate;
-    /**
-     * 道路运输证
-     */
-    private String operationCertificate;
-    /**
-     * 道路运输证号
-     */
-    private String operationCertificateNumber;
-    /**
-     * 道路运输证有效期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date operationCertificateValidityDate;
-    /**
-     * 挂车道路运输证
-     */
-    private String trailerOperationCertificate;
-    /**
-     * 挂车道路运输证号
-     */
-    private String trailerOperationCertificateNumber;
-    /**
-     * 挂车运输证有效期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date trailerOperationCertificateValidityDate;
     /**
      * 认证状态key（1审核中3未通过5已认证7已禁用9已过期）
      */
@@ -189,26 +125,10 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      * 驾驶证过期标识（1是）
      */
     private String driverOverdueFlag;
-    /**
-     * 行驶证过期标识（1是）
-     */
-    private String drivingOverdueFlag;
-    /**
-     * 挂车行驶证过期标识（1是）
-     */
-    private String trailerOverdueFlag;
     /**
      * 从业资格证过期标识（1是）
      */
     private String qualificationOverdueFlag;
-    /**
-     * 道路运输证过期标识（1是）
-     */
-    private String operationOverdueFlag;
-    /**
-     * 挂车运输证过期标识（1是）
-     */
-    private String trailerOperationOverdueFlag;
     /**
      * 第一次认证标识(1是)
      */

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

@@ -430,6 +430,11 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String carNumber;
+    /**
+     * 装车净重（吨）
+     */
+    @TableField(exist = false)
+    private String weight;
 
     /**
      * 调用类型：1货主 2 司机

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonRouteServiceImpl.java

@@ -31,6 +31,7 @@ public class CommonRouteServiceImpl extends ServiceImpl<CommonRouteMapper, HyCom
     public String add(HyCommonRoute hyCommonRoute){
         //新增主键id
         hyCommonRoute.setId(IdGenerator.generateUUID());
+        hyCommonRoute.setDisplayFlag("1");
         this.insert(hyCommonRoute);
         return "OK";
     }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -135,38 +135,19 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
         if (hyDriverCarInfo1 != null) {
             //通过
             if ("1".equals(hyDriverCarInfo.getFlag())) {
-                hyDriverCarInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
-                hyDriverCarInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
-//                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
-//                UnimallMessage messageDO = new UnimallMessage();
-//                messageDO.setAdminId(commonUser.getId());
-//                messageDO.setCustomer(commonUser.getUserName());
-//                messageDO.setOperation("审核通知");
-//                messageDO.setResult("您的司机认证申请已审核通过");
-//                messageDO.setGmtUpdate(new java.util.Date());
-//                messageDO.setGmtCreate(new Date());
-//                messageDO.setTaskId(IdGenerator.generateUUID());
-//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-//                messageDO.setPath("XXXXX");
-//                webSocket.sendOneMessage(messageDO);
+                hyDriverCarInfo.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverCarInfo.setStatus(StatusEnum.TASK_REJECT.getName());
+                hyDriverCarInfo.setDrivingOverdueFlag("0");
+                hyDriverCarInfo.setTrailerOverdueFlag("0");
+                hyDriverCarInfo.setOperationOverdueFlag("0");
+                hyDriverCarInfo.setTrailerOperationOverdueFlag("0");
             }
             //驳回
             else if("2".equals(hyDriverCarInfo.getFlag())){
-                hyDriverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                hyDriverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_FAILED.getName());
                 this.updateById(hyDriverCarInfo);
-//                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
-//                UnimallMessage messageDO = new UnimallMessage();
-//                messageDO.setAdminId(commonUser.getId());
-//                messageDO.setCustomer(commonUser.getUserName());
-//                messageDO.setOperation("驳回通知");
-//                messageDO.setResult("您的司机认证申请已被驳回");
-//                messageDO.setGmtUpdate(new java.util.Date());
-//                messageDO.setGmtCreate(new Date());
-//                messageDO.setTaskId(IdGenerator.generateUUID());
-//                messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-//                messageDO.setPath("XXXXX");
-//                webSocket.sendOneMessage(messageDO);
+
             }
             //更改车辆状态信息
             this.updateById(hyDriverCarInfo1);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -123,16 +123,6 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         if (hyDriverInfoList.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_NUMBER_ERROR);
         }
-        //货车信息新增
-        List<HyDriverCarInfo> hyDriverCarInfoList = hyDriverInfo.getHyDriverCarInfoList();
-        if (!CollectionUtils.isEmpty(hyDriverCarInfoList)) {
-            for (HyDriverCarInfo hyDriverCarInfo : hyDriverCarInfoList) {
-                hyDriverCarInfo.setId(IdGenerator.generateUUID());
-                hyDriverCarInfo.setDriverId(hyDriverInfo.getId());
-                hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-                hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            }
-        }
         //收款人账户信息新增
         List<HyDriverPayeeInfo> hyDriverPayeeInfoList = hyDriverInfo.getHyDriverPayeeInfoList();
         if (!CollectionUtils.isEmpty(hyDriverPayeeInfoList)) {
@@ -142,10 +132,9 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
             }
         }
         boolean one = this.insert(hyDriverInfo);
-        boolean two = driverCarInfoService.insertBatch(hyDriverCarInfoList);
         boolean three = driverPayeeInfoService.insertBatch(hyDriverPayeeInfoList);
         // 假如 都成功返回ok
-        if (one && two && three) {
+        if (one && three) {
             return "OK";
         } else {
             return "NG";
@@ -215,13 +204,10 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
                 hyDriverInfo1.setOverdueFlag("0");
                 hyDriverInfo1.setDriverOverdueFlag("0");
-                hyDriverInfo1.setDrivingOverdueFlag("0");
-                hyDriverInfo1.setTrailerOverdueFlag("0");
                 hyDriverInfo1.setQualificationOverdueFlag("0");
-                hyDriverInfo1.setOperationOverdueFlag("0");
-                hyDriverInfo1.setTrailerOperationOverdueFlag("0");
                 hyDriverInfo1.setRejectReason(null);
                 hyDriverInfo1.setRejectReasonDescription(null);
+
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
@@ -277,7 +263,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         if (commonUser != null){
             hyDriverInfo1.setAvatarUrl(commonUser.getAvatarUrl());
         }
-        //查询货主信息
+        //查询车辆信息
         List<HyDriverCarInfo> hyDriverCarInfos = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>().eq("driver_id", hyDriverInfo1.getId())
                 .eq("delete_flag","0"));
         if (!CollectionUtils.isEmpty(hyDriverCarInfos)){

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -57,6 +57,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
     @Autowired
     private IDriverInfoService driverInfoService;
+    @Autowired
+    private IDriverCarInfoService driverCarInfoService;
 
 
     /**
@@ -270,70 +272,6 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     newsInfo.setNewsType("系统消息");
                     newsInfoService.addNewsInfo(newsInfo);
                 }
-                //行驶证
-                int result3 = driverInfo.getDrivingLicenseValidityDate().compareTo(date1);
-                if (result3 < 0) {
-                    driverInfo.setDrivingOverdueFlag("1");
-                    driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
-                    driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
-                    driverInfoService.updateById(driverInfo);
-                }
-                //行驶证到期前10天
-                int result310 = driverInfo.getDrivingLicenseValidityDate().compareTo(date10);
-                if (result310 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //行驶证到期前3天
-                int result33 = driverInfo.getDrivingLicenseValidityDate().compareTo(date3);
-                if (result33 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //挂车行驶证
-                int result4 = driverInfo.getTrailerLicenseValidityDate().compareTo(date1);
-                if (result4 < 0) {
-                    driverInfo.setTrailerOverdueFlag("1");
-                    driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
-                    driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
-                    driverInfoService.updateById(driverInfo);
-                }
-                //挂车行驶证到期前10天
-                int result410 = driverInfo.getTrailerLicenseValidityDate().compareTo(date10);
-                if (result410 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //挂车行驶证到期前3天
-                int result43 = driverInfo.getTrailerLicenseValidityDate().compareTo(date3);
-                if (result43 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
                 //从业资格证
                 int result5 = driverInfo.getQualificationCertificateValidityDate().compareTo(date1);
                 if (result5 < 0) {
@@ -366,72 +304,146 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                     newsInfo.setNewsType("系统消息");
                     newsInfoService.addNewsInfo(newsInfo);
                 }
-                //道路运输证
-                int result6 = driverInfo.getOperationCertificateValidityDate().compareTo(date1);
-                if (result6 < 0) {
-                    driverInfo.setOperationOverdueFlag("1");
-                    driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
-                    driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
-                    driverInfoService.updateById(driverInfo);
-                }
-                //道路运输证到期前10天
-                int result610 = driverInfo.getOperationCertificateValidityDate().compareTo(date10);
-                if (result610 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //道路运输证到期前3天
-                int result63 = driverInfo.getOperationCertificateValidityDate().compareTo(date3);
-                if (result63 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //挂车运输证
-                int result7 = driverInfo.getTrailerOperationCertificateValidityDate().compareTo(date1);
-                if (result7 < 0) {
-                    driverInfo.setTrailerOperationOverdueFlag("1");
-                    driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_OVERDUE.getName());
-                    driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
-                    driverInfoService.updateById(driverInfo);
-                }
-                //挂车运输证到期前10天
-                int result710 = driverInfo.getTrailerOperationCertificateValidityDate().compareTo(date10);
-                if (result710 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
-                //挂车运输证到期前3天
-                int result73 = driverInfo.getTrailerOperationCertificateValidityDate().compareTo(date3);
-                if (result73 == 0) {
-                    //发送系统消息
-                    NewsInfo newsInfo = new NewsInfo();
-                    newsInfo.setReCommonId(driverInfo.getCommonId());
-                    newsInfo.setBussId(driverInfo.getId());
-                    newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。");
-                    newsInfo.setNewsTypeKey("1");
-                    newsInfo.setNewsType("系统消息");
-                    newsInfoService.addNewsInfo(newsInfo);
-                }
             });
         }
+
+            //查询车辆
+            List<HyDriverCarInfo> hyDriverCarInfos = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>().eq("delete_flag", "0"));
+            if (!CollectionUtils.isEmpty(hyDriverCarInfos)) {
+                hyDriverCarInfos.forEach(hyDriverCarInfo -> {
+                    //查询司机
+                    HyDriverInfo hyDriverInfo = driverInfoService.selectById(hyDriverCarInfo.getDriverId());
+                    //行驶证
+                    int result3 = hyDriverCarInfo.getDrivingLicenseValidityDate().compareTo(date1);
+                    if (result3 < 0) {
+                        hyDriverCarInfo.setDrivingOverdueFlag("1");
+                        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_OVERDUE.getName());
+                        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
+                        driverCarInfoService.updateById(hyDriverCarInfo);
+                    }
+                    //行驶证到期前10天
+                    int result310 = hyDriverCarInfo.getDrivingLicenseValidityDate().compareTo(date10);
+                    if (result310 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //行驶证到期前3天
+                    int result33 = hyDriverCarInfo.getDrivingLicenseValidityDate().compareTo(date3);
+                    if (result33 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //挂车行驶证
+                    int result4 = hyDriverCarInfo.getTrailerLicenseValidityDate().compareTo(date1);
+                    if (result4 < 0) {
+                        hyDriverCarInfo.setTrailerOverdueFlag("1");
+                        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_OVERDUE.getName());
+                        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
+                        driverCarInfoService.updateById(hyDriverCarInfo);
+                    }
+                    //挂车行驶证到期前10天
+                    int result410 = hyDriverCarInfo.getTrailerLicenseValidityDate().compareTo(date10);
+                    if (result410 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //挂车行驶证到期前3天
+                    int result43 = hyDriverCarInfo.getTrailerLicenseValidityDate().compareTo(date3);
+                    if (result43 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的挂车行驶证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+
+                    //道路运输证
+                    int result6 = hyDriverCarInfo.getOperationCertificateValidityDate().compareTo(date1);
+                    if (result6 < 0) {
+                        hyDriverCarInfo.setOperationOverdueFlag("1");
+                        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_OVERDUE.getName());
+                        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
+                        driverCarInfoService.updateById(hyDriverCarInfo);
+                    }
+                    //道路运输证到期前10天
+                    int result610 = hyDriverCarInfo.getOperationCertificateValidityDate().compareTo(date10);
+                    if (result610 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //道路运输证到期前3天
+                    int result63 = hyDriverCarInfo.getOperationCertificateValidityDate().compareTo(date3);
+                    if (result63 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的道路运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //挂车运输证
+                    int result7 = hyDriverCarInfo.getTrailerOperationCertificateValidityDate().compareTo(date1);
+                    if (result7 < 0) {
+                        hyDriverCarInfo.setTrailerOperationOverdueFlag("1");
+                        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_OVERDUE.getName());
+                        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_OVERDUE.getFlag());
+                        driverCarInfoService.updateById(hyDriverCarInfo);
+                    }
+                    //挂车运输证到期前10天
+                    int result710 = hyDriverCarInfo.getTrailerOperationCertificateValidityDate().compareTo(date10);
+                    if (result710 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                    //挂车运输证到期前3天
+                    int result73 = hyDriverCarInfo.getTrailerOperationCertificateValidityDate().compareTo(date3);
+                    if (result73 == 0) {
+                        //发送系统消息
+                        NewsInfo newsInfo = new NewsInfo();
+                        newsInfo.setReCommonId(hyDriverInfo.getCommonId());
+                        newsInfo.setBussId(hyDriverCarInfo.getId());
+                        newsInfo.setNewsContent("您的挂车运输证即将到期，请尽快到“我的-管理车辆”中更新，逾期将影响运费支付。");
+                        newsInfo.setNewsTypeKey("1");
+                        newsInfo.setNewsType("系统消息");
+                        newsInfoService.addNewsInfo(newsInfo);
+                    }
+                });
+        }
     }
 
     /**

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

@@ -29,10 +29,6 @@ public class PdfUtil  implements InitializingBean{
     @Autowired
     private IOrderInfoService orderInfoService;
     @Autowired
-    private IFreightInfoService freightInfoService;
-    @Autowired
-    private ICarrierInfoService carrierInfoService;
-    @Autowired
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
     private IDriverInfoService driverInfoService;
@@ -172,25 +168,29 @@ public class PdfUtil  implements InitializingBean{
                     form.setField(name, orderInfo.getContactPersonName());break;
                 case "fill_22" :
                     form.setField(name, orderInfo.getContactPersonPhone());break;
-                case "fill_3_2" :
+                case "fill_2_2" :
                     form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
                             +publishTaskInfo.getSendDetailedAddress());break;
-                case "fill_4_2" :
+                case "fill_3_2" :
                     form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
                             +publishTaskInfo.getUnloadDetailedAddress());break;
-                case "fill_5_2" :
+                case "fill_4_2" :
                     form.setField(name, publishTaskInfo.getGoodsName());break;
+                case "fill_5_2" :
+                    form.setField(name, orderInfo.getWeight());break;
                 case "fill_6_2" :
                     form.setField(name, orderInfo.getFreightCars());break;
                 case "fill_7_2" :
                     form.setField(name, publishTaskInfo.getTaskDescription());break;
                 case "Text1" :
                     form.setField(name, orderInfo.getFreightCars());break;
+                case "Text21" :
+                    form.setField(name, orderInfo.getWeight());break;
                 case "Text2" :
                     form.setField(name, String.valueOf(orderInfo.getAdvanceCharge()));break;
                 case "fill_1_2" :
                     form.setField(name, hyDriverPayeeInfo.getBankCard());break;
-                case "fill_2_2" :
+                case "fill_1_3" :
                     form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
                 case "Text3" :
                     form.setField(name, "甲方");break;
@@ -249,7 +249,7 @@ public class PdfUtil  implements InitializingBean{
                     form.setField(name, now.get(Calendar.MONTH)+1+"");break;
                 case "Text20" :
                     form.setField(name, now.get(Calendar.DAY_OF_MONTH)+"");break;
-                case "fill_1_3" :
+                case "fill_1_4" :
                     form.setField(name, "1");break;
                 case "fill_2_3" :
                     form.setField(name, orderInfo1.getDriverName());break;
@@ -302,24 +302,24 @@ public class PdfUtil  implements InitializingBean{
     }
 
     public  String transactionContract(OrderInfo orderInfo) throws IOException, DocumentException, URISyntaxException {//利用模板生成pdf
-
-        //订单信息
+//订单信息
         OrderInfo orderInfo1 = orderInfoService.selectById(orderInfo.getId());
-        //运费信息
-        FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
-                .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
-        //承运信息
-        HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>()
-                .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
-        //查询司机收款银行
+        //查询司机信息
         HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",orderInfo1.getCommonId())
                 .eq("delete_flag","0"));
         HyDriverPayeeInfo hyDriverPayeeInfo = driverPayeeInfoService.selectOne(new EntityWrapper<HyDriverPayeeInfo>().eq("driver_id", hyDriverInfo.getId())
                 .eq("delete_flag","0"));
+        HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>().eq("driver_id", hyDriverInfo.getId())
+                .eq("car_number",orderInfo.getCarNumber()).eq("delete_flag","0"));
+        //任务信息
+        PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectOne(new EntityWrapper<PublishTaskInfo>().eq("id",orderInfo1.getTaskId())
+                .eq("delete_flag","0"));
+
+
         //模板路径
-        String pdfTmp = "templates" + File.separator + "TranContract.pdf";
+        String pdfTmp = "templates" + File.separator + "Contract.pdf";
         //生成的新文件路径
-        String newPDFPath ="templates" + File.separator + "TranContract1.pdf";
+        String newPDFPath = "templates" + File.separator + "Contract1.pdf";
         PdfReader reader;
         FileOutputStream out;
         ByteArrayOutputStream bos;
@@ -344,9 +344,9 @@ public class PdfUtil  implements InitializingBean{
         AcroFields form = stamper.getAcroFields();
         Iterator<String> it = form.getFields().keySet().iterator();
         Calendar start= Calendar.getInstance();
-        start.setTime(hyCarrierInfo.getLoadingDate());
+        start.setTime(orderInfo.getStartDates());
         Calendar end= Calendar.getInstance();
-        end.setTime(hyCarrierInfo.getUnloadingDate());
+        end.setTime(orderInfo.getEndDates());
         Calendar now= Calendar.getInstance();
         now.setTime(new Date());
         float fontSize = 12f;
@@ -370,223 +370,144 @@ public class PdfUtil  implements InitializingBean{
             //填写内容部分
             switch (name){
                 case "fill_1" :
-                    form.setField(name, orderInfo1.getContractNo());break;
-                case "Text1" :
-                    form.setField(name, orderInfo1.getCargoOwner());break;
-                case "Text2" :
-                    form.setField(name, orderInfo1.getDriverName());break;
-                case "Text4" :
-                    form.setField(name, orderInfo1.getGoodsName());break;
-                case "fill_30" :
-                    form.setField(name, "散装");break;
-                case "fill_31" :
-                    form.setField(name, "重量"+"");break;
-                case "fill_32" :
-                    form.setField(name, "货值"+"");break;
-                case "fill_33" :
-                    form.setField(name, orderInfo1.getFreight()+"");break;
-                case "fill_34" :
-                    form.setField(name, "运输损耗"+"");break;
-                case "Text5" :
-                    form.setField(name, "运费总价"+"");break;
+                    form.setField(name, "黑龙江中天昊元贸易有限公司");break;
                 case "fill_2" :
-                    form.setField(name, freightInfo.getFreightPayable()+"");break;
+                    form.setField(name, orderInfo1.getDriverName());break;
                 case "fill_3" :
-                    form.setField(name, "大写");break;
+                    form.setField(name, "91230230MA1BNL7Q93");break;
                 case "fill_4" :
-                    form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
+                    form.setField(name, hyDriverInfo.getNumberCard());break;
+                case "fill_23" :
+                    form.setField(name, orderInfo.getCarNumber());break;
+                case "fill_24" :
+                    form.setField(name, orderInfo.getTrailerNumber());break;
                 case "fill_5" :
-                    form.setField(name, hyDriverPayeeInfo.getPayeeName());break;
+                    form.setField(name, hyDriverCarInfo.getOwner());break;
+                case "fill_6" :
+                    form.setField(name, start.get(Calendar.YEAR)+"");break;
                 case "fill_7" :
-                    form.setField(name, hyDriverPayeeInfo.getBankCard()+"");break;
+                    form.setField(name, start.get(Calendar.MONTH)+1+"");break;
                 case "fill_8" :
-                    form.setField(name, "纳税人识别号");break;
-                case "undefined_2" :
-                    form.setField(name, orderInfo1.getCompName());break;
+                    form.setField(name, start.get(Calendar.DAY_OF_MONTH)+"");break;
+                case "fill_9" :
+                    form.setField(name, end.get(Calendar.YEAR)+"");break;
                 case "fill_10" :
-                    form.setField(name, "开户银行"+"卡号");break;
+                    form.setField(name, end.get(Calendar.MONTH)+1+"");break;
                 case "fill_11" :
-                    form.setField(name, "地址"+orderInfo1.getCargoOwnerPhone());break;
+                    form.setField(name, end.get(Calendar.DAY_OF_MONTH)+"");break;
                 case "fill_12" :
-                    form.setField(name, "汽运");break;
+                    form.setField(name, publishTaskInfo.getSender());break;
                 case "fill_13" :
-                    form.setField(name, hyCarrierInfo.getCarNo());break;
+                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
+                            +publishTaskInfo.getSendDetailedAddress());break;
                 case "fill_14" :
-                    form.setField(name, orderInfo1.getSendPrivate());break;
+                    form.setField(name, publishTaskInfo.getSenderPhone());break;
                 case "fill_15" :
-                    form.setField(name, orderInfo1.getSendCity());break;
+                    form.setField(name, publishTaskInfo.getReceiver());break;
                 case "fill_16" :
-                    form.setField(name, orderInfo1.getSendArea());break;
+                    form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
+                            +publishTaskInfo.getUnloadDetailedAddress());break;
+                case "fill_17" :
+                    form.setField(name, publishTaskInfo.getReceiverPhone());break;
                 case "fill_18" :
-                    form.setField(name, orderInfo1.getSendDetailedAddress());break;
+                    form.setField(name, orderInfo1.getDriverName());break;
                 case "fill_19" :
-                    form.setField(name, orderInfo1.getUnloadPrivate());break;
+                    form.setField(name, hyDriverCarInfo.getCarType());break;
                 case "fill_20" :
-                    form.setField(name, orderInfo1.getUnloadCity());break;
+                    form.setField(name, orderInfo1.getDriverPhone());break;
                 case "fill_21" :
-                    form.setField(name, orderInfo1.getUnloadArea());break;
-                case "fill_23" :
-                    form.setField(name, orderInfo1.getUnloadDetailedAddress());break;
-                case "fill_24" :
-                    form.setField(name, Math.round(10)+"");break;
-                case "fill_25" :
-                    form.setField(name, start.get(Calendar.YEAR)+"");break;
-                case "fill_26" :
-                    form.setField(name, start.get(Calendar.MONTH)+1+"");break;
-                case "Text6" :
-                    form.setField(name, start.get(Calendar.DAY_OF_MONTH)+"");break;
-                case "fill_27" :
-                    form.setField(name, end.get(Calendar.YEAR)+"");break;
-                case "fill_28" :
-                    form.setField(name, end.get(Calendar.MONTH)+1+"");break;
-                case "Text7" :
-                    form.setField(name, end.get(Calendar.DAY_OF_MONTH)+"");break;
-                case "fill_1_2" :
-                    form.setField(name, orderInfo1.getCargoOwner());break;
+                    form.setField(name, orderInfo.getContactPersonName());break;
+                case "fill_22" :
+                    form.setField(name, orderInfo.getContactPersonPhone());break;
                 case "fill_3_2" :
-                    form.setField(name, orderInfo1.getCargoOwnerPhone());break;
+                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
+                            +publishTaskInfo.getSendDetailedAddress());break;
+                case "fill_4_2" :
+                    form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
+                            +publishTaskInfo.getUnloadDetailedAddress());break;
                 case "fill_5_2" :
-                    form.setField(name, "联系地址");break;
+                    form.setField(name, publishTaskInfo.getGoodsName());break;
+                case "fill_6_2" :
+                    form.setField(name, orderInfo.getFreightCars());break;
                 case "fill_7_2" :
-                    form.setField(name, "e-mail");break;
-                case "fill_9" :
-                    form.setField(name, orderInfo1.getCargoOwnerPhone());break;
+                    form.setField(name, publishTaskInfo.getTaskDescription());break;
+                case "Text1" :
+                    form.setField(name, orderInfo.getFreightCars());break;
+                case "Text2" :
+                    form.setField(name, String.valueOf(orderInfo.getAdvanceCharge()));break;
+                case "fill_1_2" :
+                    form.setField(name, hyDriverPayeeInfo.getBankCard());break;
                 case "fill_2_2" :
-                    form.setField(name, orderInfo1.getDriverName());break;
-                case "fill_4_2" :
-                    form.setField(name, orderInfo1.getDriverPhone());break;
-                case "fill_6" :
-                    form.setField(name, "联系地址");break;
-                case "fill_8_2" :
-                    form.setField(name, "e-mail");break;
-                case "fill_10_2" :
-                    form.setField(name, orderInfo1.getDriverPhone());break;
+                    form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
                 case "Text3" :
-//                    if(tranContractDTO.getFirstSignatureImg() == null || tranContractDTO.getFirstSignatureImg().isEmpty()){
-//                        break;
-//                    }
-//                    Image image1 = Image.getInstance(new URL(tranContractDTO.getFirstSignatureImg()));
-//                    image1.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image1.setAbsolutePosition(x, y);
-//                    under.addImage(image1);
-                    break;
-                case "Text12" :
-//                    if(tranContractDTO.getFirstLawpersonImg() == null || tranContractDTO.getFirstLawpersonImg().isEmpty()){
-//                        break;
-//                    }
-//                    Image image2 = Image.getInstance(new URL(tranContractDTO.getFirstLawpersonImg()));
-//                    image2.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image2.setAbsolutePosition(x, y);
-//                    under.addImage(image2);
-                    break;
-                case "Text8" :
-                    form.setField(name, orderInfo1.getSendCity() + orderInfo1.getSendArea());break;
-                case "Text14" :
-//                    if(tranContractDTO.getSecondSignatureImg() == null || tranContractDTO.getSecondSignatureImg().isEmpty()){
-//                        break;
-//                    }
-//                    Image image3 = Image.getInstance(new URL(tranContractDTO.getSecondSignatureImg()));
-//                    image3.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image3.setAbsolutePosition(x, y);
-//                    under.addImage(image3);
+                    form.setField(name, "甲方");break;
+                case "Text4" :
+                    form.setField(name, "甲方");break;
+                case "Text5" :
+                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
+                        break;
+                    }
+                    Image image1 = Image.getInstance(new URL(orderInfo1.getDriverAutograph()));
+                    image1.scaleToFit(signRect.getWidth(), signRect.getHeight());
+                    image1.setAbsolutePosition(x, y);
+                    under.addImage(image1);
                     break;
-                case "Text13" :
-                    if(orderInfo.getDriverAutograph() == null || orderInfo.getDriverAutograph().isEmpty()){
+                case "Text6" :
+                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
                         break;
                     }
-                    Image image4 = Image.getInstance(new URL(orderInfo.getDriverAutograph()));
-                    image4.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image4.setAbsolutePosition(x, y);
-                    under.addImage(image4); break;
+                    Image image2 = Image.getInstance(new URL(orderInfo1.getDriverAutograph()));
+                    image2.scaleToFit(signRect.getWidth(), signRect.getHeight());
+                    image2.setAbsolutePosition(x, y);
+                    under.addImage(image2);
+                    break;
+                case "Text7" :
+                    form.setField(name, "辽宁省营口市鲅鱼圈区蝴蝶泉路龙港花园北一门");break;
+                case "Text8" :
+                    form.setField(name, "123456");break;
                 case "Text9" :
-                    form.setField(name, now.get(Calendar.YEAR)+"");break;
+                    form.setField(name, "123456@163.com");break;
                 case "Text10" :
-                    form.setField(name, now.get(Calendar.MONTH)+1+"");break;
+                    form.setField(name, "老王");break;
                 case "Text11" :
+                    form.setField(name, "123456");break;
+                case "Text12" :
+                    form.setField(name, now.get(Calendar.YEAR)+"");break;
+                case "Text13" :
+                    form.setField(name, now.get(Calendar.MONTH)+1+"");break;
+                case "Text14" :
                     form.setField(name, now.get(Calendar.DAY_OF_MONTH)+"");break;
                 case "Text15" :
-                    if(hyDriverInfo.getCardAddressUrl() == null || hyDriverInfo.getCardAddressUrl().isEmpty()){
+                    if(orderInfo.getDriverAutograph() == null || orderInfo.getDriverAutograph().isEmpty()){
                         break;
                     }
-                    Image image51 = Image.getInstance(new URL(hyDriverInfo.getCardAddressUrl()));
-                    image51.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image51.setAbsolutePosition(x, y);
-                    under.addImage(image51); break;
+                    Image image3 = Image.getInstance(new URL(orderInfo.getDriverAutograph()));
+                    image3.scaleToFit(signRect.getWidth(), signRect.getHeight());
+                    image3.setAbsolutePosition(x, y);
+                    under.addImage(image3);
+                    break;
                 case "Text16" :
-                    if(hyDriverInfo.getCardBackAddressUrl() == null || hyDriverInfo.getCardBackAddressUrl().isEmpty()){
-                        break;
-                    }
-                    Image image61 = Image.getInstance(new URL(hyDriverInfo.getCardBackAddressUrl()));
-                    image61.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image61.setAbsolutePosition(x, y);
-                    under.addImage(image61); break;
+                    form.setField(name, hyDriverInfo.getPostalAddress());break;
                 case "Text17" :
-                    if(hyDriverPayeeInfo.getBankCard() == null || hyDriverPayeeInfo.getBankCard().isEmpty()){
-                        break;
-                    }
-                    Image image5 = Image.getInstance(new URL(hyDriverPayeeInfo.getBankCard()));
-                    image5.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image5.setAbsolutePosition(x, y);
-                    under.addImage(image5); break;
+                    form.setField(name, orderInfo1.getDriverPhone());break;
                 case "Text18" :
-//                    if(tranContractDTO.getCarDO().getBankImg1() == null || tranContractDTO.getCarDO().getBankImg1().isEmpty()){
-//                        break;
-//                    }
-//                    Image image6 = Image.getInstance(new URL(tranContractDTO.getCarDO().getBankImg1()));
-//                    image6.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image6.setAbsolutePosition(x, y);
-//                    under.addImage(image6);
-                    break;
+                    form.setField(name, now.get(Calendar.YEAR)+"");break;
                 case "Text19" :
-                    if(hyDriverInfo.getDriverLicenseHomePage() == null || hyDriverInfo.getDriverLicenseHomePage().isEmpty()){
-                        break;
-                    }
-                    Image image7 = Image.getInstance(new URL(hyDriverInfo.getDriverLicenseHomePage()));
-                    image7.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image7.setAbsolutePosition(x, y);
-                    under.addImage(image7); break;
+                    form.setField(name, now.get(Calendar.MONTH)+1+"");break;
                 case "Text20" :
-                    if(hyDriverInfo.getDriverLicenseBackPage() == null || hyDriverInfo.getDriverLicenseBackPage().isEmpty()){
-                        break;
-                    }
-                    Image image8 = Image.getInstance(new URL(hyDriverInfo.getDriverLicenseBackPage()));
-                    image8.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image8.setAbsolutePosition(x, y);
-                    under.addImage(image8); break;
-                case "Text21" :
-                    if(hyDriverInfo.getDrivingLicenseHomePage() == null || hyDriverInfo.getDrivingLicenseHomePage().isEmpty()){
-                        break;
-                    }
-                    Image image9 = Image.getInstance(new URL(hyDriverInfo.getDrivingLicenseHomePage()));
-                    image9.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image9.setAbsolutePosition(x, y);
-                    under.addImage(image9); break;
-                case "Text22" :
-                    if(hyDriverInfo.getDrivingLicenseBackPage() == null || hyDriverInfo.getDrivingLicenseBackPage().isEmpty()){
-                        break;
-                    }
-                    Image image10 = Image.getInstance(new URL(hyDriverInfo.getDrivingLicenseBackPage()));
-                    image10.scaleToFit(signRect.getWidth(), signRect.getHeight());
-                    image10.setAbsolutePosition(x, y);
-                    under.addImage(image10); break;
-                case "Text23" :
-//                    if(tranContractDTO.getCarDO().getPersonNoImg() == null || tranContractDTO.getCarDO().getPersonNoImg().isEmpty()){
-//                        break;
-//                    }
-//                    Image image11 = Image.getInstance(new URL(tranContractDTO.getCarDO().getPersonNoImg()));
-//                    image11.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image11.setAbsolutePosition(x, y);
-//                    under.addImage(image11);
-                    break;
-                case "Text24" :
-//                    if(tranContractDTO.getCarDO().getPersonNoImg1() == null || tranContractDTO.getCarDO().getPersonNoImg1().isEmpty()){
-//                        break;
-//                    }
-//                    Image image12 = Image.getInstance(new URL(tranContractDTO.getCarDO().getPersonNoImg1()));
-//                    image12.scaleToFit(signRect.getWidth(), signRect.getHeight());
-//                    image12.setAbsolutePosition(x, y);
-//                    under.addImage(image12);
-                    break;
+                    form.setField(name, now.get(Calendar.DAY_OF_MONTH)+"");break;
+                case "fill_1_3" :
+                    form.setField(name, "1");break;
+                case "fill_2_3" :
+                    form.setField(name, orderInfo1.getDriverName());break;
+                case "fill_3_3" :
+                    form.setField(name, hyDriverInfo.getDriverSex());break;
+                case "fill_4_3" :
+                    form.setField(name, hyDriverInfo.getNumberCard());break;
+                case "fill_5_3" :
+                    form.setField(name, hyDriverCarInfo.getCarType());break;
+                case "fill_6_3" :
+                    form.setField(name, hyDriverCarInfo.getCarNumber());break;
 
             }
             //
@@ -607,11 +528,17 @@ public class PdfUtil  implements InitializingBean{
                 new PdfReader(bos.toByteArray()), 4);
         PdfImportedPage importPage4 = copy.getImportedPage(
                 new PdfReader(bos.toByteArray()), 5);
+        PdfImportedPage importPage5 = copy.getImportedPage(
+                new PdfReader(bos.toByteArray()), 6);
+        PdfImportedPage importPage6 = copy.getImportedPage(
+                new PdfReader(bos.toByteArray()), 7);
         copy.addPage(importPage);
         copy.addPage(importPage1);
         copy.addPage(importPage2);
         copy.addPage(importPage3);
         copy.addPage(importPage4);
+        copy.addPage(importPage5);
+        copy.addPage(importPage6);
         doc.close();
         reader.close();
 

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

@@ -21,7 +21,7 @@
         w.warehouse_city as warehouseCity,
         w.warehouse_area as warehouseArea,
         w.detailed_address as detailedAddress
-        FROM acquisition_info a
+        FROM hy_acquisition_info a
         LEFT JOIN focus_acquisition_information f on f.info_id=a.id and f.delete_flag = '0' and f.phone=#{phone}
         LEFT JOIN warehouse_base_info w on w.comp_id=a.comp_id and w.warehouse_name=a.warehouse_name and w.delete_flag = '0'
         WHERE

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

@@ -5,7 +5,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM agent_cargo_owner_info
+        FROM hy_agent_cargo_owner_info
         WHERE delete_flag = '0'
         AND common_id = #{commonId}
     </select>
@@ -23,7 +23,7 @@
         a.create_date as createDate,
         a.update_date as updateDate,
         cu.avatar_url as avatarUrl
-        FROM agent_cargo_owner_info a
+        FROM hy_agent_cargo_owner_info a
         LEFT JOIN common_user cu on cu.id = a.agent_common_id and cu.delete_flag = 0
         WHERE a.delete_flag = '0'
         AND a.common_id = #{commonId}

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

@@ -6,7 +6,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM cargo_owner_address_info
+        FROM hy_cargo_owner_address_info
         WHERE delete_flag = '0'
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -37,7 +37,7 @@
         topping_flag as toppingFlag,
         create_date as createDate,
         update_date as updateDate
-        FROM cargo_owner_address_info
+        FROM hy_cargo_owner_address_info
         WHERE delete_flag = '0'
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">

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

@@ -6,8 +6,8 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(c.id)
-        FROM cargo_owner_comp_info c
-        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        FROM hy_cargo_owner_comp_info c
+        LEFT JOIN hy_cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
         WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
@@ -45,8 +45,8 @@
         c.create_date as createDate,
         c.update_date as updateDate,
         cu.avatar_url as avatarUrl
-        FROM cargo_owner_comp_info c
-        LEFT JOIN cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
+        FROM hy_cargo_owner_comp_info c
+        LEFT JOIN hy_cargo_owner_info co on co.id = c.cargo_owner_id and co.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = co.common_id and cu.delete_flag = 0
         WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -6,7 +6,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM cargo_owner_info
+        FROM hy_cargo_owner_info
         WHERE
         delete_flag = '0'
         <if test="searchType != null and searchType != ''">
@@ -51,7 +51,7 @@
         c.authentication_status as authenticationStatus,
         c.update_date as updateDate,
         cu.avatar_url as avatarUrl
-        FROM cargo_owner_info c
+        FROM hy_cargo_owner_info c
         LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
         WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -6,7 +6,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM common_route
+        FROM hy_common_route
         WHERE
         delete_flag = '0'
         <if test="commonId != null and commonId != ''">
@@ -27,8 +27,9 @@
         send_area as sendArea,
         unload_province as unloadProvince,
         unload_city as unloadCity,
-        unload_area as unloadArea
-        FROM common_route
+        unload_area as unloadArea,
+        display_flag as displayFlag
+        FROM hy_common_route
         WHERE
         delete_flag = '0'
         <if test="commonId != null and commonId != ''">
@@ -46,9 +47,10 @@
     <select id="getCountByDriverCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(distinct common_id)
-        FROM common_route
+        FROM hy_common_route
         WHERE
         delete_flag = '0'
+        AND display_flag = '1'
         <if test="sendProvince != null and sendProvince != ''">
             AND (lower(send_province) like lower(CONCAT('%',#{sendProvince},'%')))
         </if>
@@ -79,9 +81,10 @@
         driver_portrait as driverPortrait,
         GROUP_CONCAT(send_province,send_city,send_area) as startAdress,
         GROUP_CONCAT(unload_province,unload_city,unload_area) as endAdress
-        FROM common_route
+        FROM hy_common_route
         WHERE
         delete_flag = '0'
+        AND display_flag = '1'
         <if test="sendProvince != null and sendProvince != ''">
             AND (lower(send_province) like lower(CONCAT('%',#{sendProvince},'%')))
         </if>

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

@@ -6,7 +6,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM company_info
+        FROM hy_company_info
         WHERE delete_flag = '0'
         AND status_key = '5'
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -23,7 +23,7 @@
         company_name as companyName,
         legal_person_name as legalPersonName,
         advance_freight_service as advanceFreightService
-        FROM company_info
+        FROM hy_company_info
         WHERE delete_flag = '0'
         AND status_key = '5'
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -37,7 +37,7 @@
     <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(c.id)
-        FROM company_info c
+        FROM hy_company_info c
         LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
         WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
@@ -80,7 +80,7 @@
         c.update_date as updateDate,
         cu.phone as accountNumber,
         cu.avatar_url as avatarUrl
-        FROM company_info c
+        FROM hy_company_info c
         LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
         WHERE c.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -5,8 +5,8 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(c.id)
-        FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        FROM hy_driver_info d
+        left join hy_driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
         WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
@@ -37,11 +37,17 @@
         c.address_url as addressUrl,
         d.card_address_url as cardAddressUrl,
         d.card_back_address_url as cardBackAddressUrl,
+        c.operation_certificate as operationCertificate,
+        c.trailer_operation_certificate as trailerOperationCertificate,
+        c.driving_license_home_page as drivingLicenseHomePage,
+        c.driving_license_back_page as drivingLicenseBackPage,
+        c.trailer_license_home_page as trailerLicenseHomePage,
+        c.trailer_license_back_page as trailerLicenseBackPage,
         c.status,
         c.update_date as updateDate,
         cu.avatar_url as avatarUrl
-        FROM driver_info d
-        left join driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
+        FROM hy_driver_info d
+        left join hy_driver_car_info c on d.id=c.driver_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = d.common_id and cu.delete_flag = 0
         WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -7,7 +7,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
     select
     count(id)
-    FROM driver_info
+    FROM hy_driver_info
     WHERE
     delete_flag = '0'
     <if test="searchType != null and searchType != ''">
@@ -50,13 +50,7 @@
         d.card_back_address_url as cardBackAddressUrl,
         d.driver_license_home_page as driverLicenseHomePage,
         d.driver_license_back_page as driverLicenseBackPage,
-        d.driving_license_home_page as drivingLicenseHomePage,
-        d.driving_license_back_page as drivingLicenseBackPage,
-        d.trailer_license_home_page as trailerLicenseHomePage,
-        d.trailer_license_back_page as trailerLicenseBackPage,
         d.qualification_certificate as qualificationCertificate,
-        d.operation_certificate as operationCertificate,
-        d.trailer_operation_certificate as trailerOperationCertificate,
         d.authentication_status_key as authenticationStatusKey,
         d.authentication_status as authenticationStatus,
         d.create_date as createDate,
@@ -69,7 +63,7 @@
         d.operation_overdue_flag as operationOverdueFlag,
         d.trailer_operation_overdue_flag as trailerOperationOverdueFlag,
         c.avatar_url as avatarUrl
-        FROM driver_info d
+        FROM hy_driver_info d
         LEFT JOIN common_user c on c.id = d.common_id and c.delete_flag = 0
         WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">

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

@@ -5,7 +5,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM evaluate_info
+        FROM hy_evaluate_info
         WHERE
         delete_flag = '0'
         <if test="haoType == 1">
@@ -69,7 +69,7 @@
         owner_anonymous as ownerAnonymous,
         create_date as createDate,
         owner_portrait as ownerPortrait
-        FROM evaluate_info
+        FROM hy_evaluate_info
         WHERE
         delete_flag = '0'
         <if test="haoType == 1">

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

@@ -6,7 +6,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM fleet_info
+        FROM hy_fleet_info
         WHERE
         delete_flag = '0'
         AND status_key = '5'
@@ -38,8 +38,8 @@
         fm.status as fleetMemberStatus,
         (SELECT group_concat(driver_portrait) from fleet_member_info m where m.fleet_id = f.id
         and m.delete_flag = 0 and m.status_key = 5 LIMIT 3) as fleetMemberUrl
-        FROM fleet_info f
-        LEFT JOIN fleet_member_info fm on fm.fleet_id = f.id and fm.delete_flag = 0 and fm.common_id = #{commonId}
+        FROM hy_fleet_info f
+        LEFT JOIN hy_fleet_member_info fm on fm.fleet_id = f.id and fm.delete_flag = 0 and fm.common_id = #{commonId}
         WHERE
         f.delete_flag = '0'
         AND f.status_key = '5'

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

@@ -6,8 +6,8 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(f.id)
-        FROM fleet_member_info m
-        LEFT JOIN fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
+        FROM hy_fleet_member_info m
+        LEFT JOIN hy_fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
         WHERE
         m.delete_flag = '0'
         AND m.status_key = '5'
@@ -32,8 +32,8 @@
         f.area as area,
         f.cover_url as coverUrl,
         (CASE WHEN m.captain_flag = 1 THEN f.status ELSE null END) as fleetStatus
-        FROM fleet_member_info m
-        LEFT JOIN fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
+        FROM hy_fleet_member_info m
+        LEFT JOIN hy_fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
         WHERE
         m.delete_flag = '0'
         AND m.status_key = '5'
@@ -52,8 +52,8 @@
     <select id="getTeamApplicationCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(m.id)
-        FROM fleet_member_info m
-        LEFT JOIN fleet_info f on m.fleet_id = f.id and f.delete_flag = 0 and f.common_id = #{commonId}
+        FROM hy_fleet_member_info m
+        LEFT JOIN hy_fleet_info f on m.fleet_id = f.id and f.delete_flag = 0 and f.common_id = #{commonId}
         WHERE
         m.delete_flag = '0'
         and f.common_id = #{commonId}
@@ -71,8 +71,8 @@
         m.status,
         m.status_key as statusKey,
         f.fleet_name as fleetName
-        FROM fleet_member_info m
-        LEFT JOIN fleet_info f on m.fleet_id = f.id and f.delete_flag = 0 and f.common_id = #{commonId}
+        FROM hy_fleet_member_info m
+        LEFT JOIN hy_fleet_info f on m.fleet_id = f.id and f.delete_flag = 0 and f.common_id = #{commonId}
         WHERE
         m.delete_flag = '0'
         and f.common_id = #{commonId}
@@ -88,7 +88,7 @@
     <select id="getTeamInvitationCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM fleet_member_info
+        FROM hy_fleet_member_info
         WHERE
         delete_flag = '0'
         AND common_id = #{commonId}
@@ -105,8 +105,8 @@
         m.status_key as statusKey,
         f.fleet_name as fleetName,
         f.cover_url as coverUrl
-        FROM fleet_member_info m
-        LEFT JOIN fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
+        FROM hy_fleet_member_info m
+        LEFT JOIN hy_hy_fleet_info f on m.fleet_id = f.id and f.delete_flag = 0
         WHERE
         m.delete_flag = '0'
         AND m.common_id = #{commonId}
@@ -122,7 +122,7 @@
     <select id="getCountByMemberCondition" parameterType="Map" resultType="java.lang.Integer">
         select
         count(id)
-        FROM fleet_member_info
+        FROM hy_fleet_member_info
         WHERE
         delete_flag = '0'
         AND status_key = '5'
@@ -143,7 +143,7 @@
         captain_flag as captainFlag,
         status,
         status_key as statusKey
-        FROM fleet_member_info
+        FROM hy_fleet_member_info
         WHERE
         delete_flag = '0'
         AND status_key = '5'

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

@@ -5,7 +5,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM news_info
+        FROM hy_news_info
         WHERE delete_flag = '0'
         AND re_common_id = #{commonId}
     </select>
@@ -26,7 +26,7 @@
         news_flag as newsFlag,
         create_date as createDate,
         update_date as updateDate
-        FROM news_info
+        FROM hy_news_info
         WHERE delete_flag = '0'
         AND re_common_id = #{commonId}
         ORDER BY news_flag asc ,create_date DESC
@@ -39,7 +39,7 @@
     <select id="getUnCountByCondition" parameterType="Map" resultType="java.lang.Long">
         SELECT
         COUNT(id)
-        FROM news_info
+        FROM hy_news_info
         WHERE delete_flag = '0'
         AND re_common_id = #{reCommonId}
         AND news_flag = '0'

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

@@ -5,7 +5,7 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM order_info
+        FROM hy_order_info
         WHERE delete_flag = '0'
         AND common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -73,9 +73,9 @@
         o.update_date as updateDate,
         c.id as carrierId,
         f.total_repayable as totalRepayable
-        FROM order_info o
-        LEFT JOIN carrier_info c on c.order_id = o.id and c.delete_flag = 0
-        LEFT JOIN freight_info f on f.order_id = o.id and f.delete_flag = 0
+        FROM hy_order_info o
+        LEFT JOIN hy_carrier_info c on c.order_id = o.id and c.delete_flag = 0
+        LEFT JOIN hy_freight_info f on f.order_id = o.id and f.delete_flag = 0
         WHERE o.delete_flag = '0'
         AND o.common_id = #{commonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -125,7 +125,7 @@
     <select id="getCountsByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM order_info
+        FROM hy_order_info
         WHERE delete_flag = '0'
         AND cargo_common_id = #{cargoCommonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -207,8 +207,8 @@
         o.update_date as updateDate,
         d.driver_call as driverCall,
         d.id as driverId
-        FROM order_info o
-        LEFT JOIN driver_info d on d.common_id = o.common_id and d.delete_flag = 0
+        FROM hy_order_info o
+        LEFT JOIN hy_driver_info d on d.common_id = o.common_id and d.delete_flag = 0
         WHERE o.delete_flag = '0'
         AND o.cargo_common_id = #{cargoCommonId}
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -267,7 +267,7 @@
     <!-- 获得订单列表 -->
     <select id="getListByConditions" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo">
-        select * from order_info where delete_flag = '0'
+        select * from hy_order_info where delete_flag = '0'
         <if test="date != null and date != ''">
             AND (lower(order_no) like lower(CONCAT('%',#{date},'%')))
         </if>
@@ -279,8 +279,8 @@
     <select id="getCounthByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(o.id)
-        FROM order_info o
-        LEFT JOIN freight_info f on f.order_id = o.id and f.delete_flag = 0
+        FROM hy_order_info o
+        LEFT JOIN hy_freight_info f on f.order_id = o.id and f.delete_flag = 0
         WHERE o.delete_flag = '0'
         <if test="startDate != null and startDate != ''">
             AND (DATE_FORMAT(o.update_date,"%Y%m%d") &gt;=
@@ -339,9 +339,9 @@
         o.cargo_owner_status_key as cargoOwnerStatusKey,
         o.create_date as createDate,
         o.update_date as updateDate
-        FROM order_info o
-        LEFT JOIN freight_info f on f.order_id = o.id and f.delete_flag = 0
-        LEFT JOIN repayment_info r on r.order_id = o.id and r.delete_flag = 0
+        FROM hy_order_info o
+        LEFT JOIN hy_freight_info f on f.order_id = o.id and f.delete_flag = 0
+        LEFT JOIN hy_repayment_info r on r.order_id = o.id and r.delete_flag = 0
         WHERE o.delete_flag = '0'
         <if test="startDate != null and startDate != ''">
             AND (DATE_FORMAT(o.update_date,"%Y%m%d") &gt;=

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

@@ -6,7 +6,7 @@
     <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(id)
-        FROM patform_anagement_egulations
+        FROM hy_patform_anagement_egulations
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
@@ -40,7 +40,7 @@
         status,
         create_date as createDate,
         update_date as updateDate
-        FROM patform_anagement_egulations
+        FROM hy_patform_anagement_egulations
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">

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

@@ -5,8 +5,8 @@
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(p.id)
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         WHERE p.delete_flag = '0'
         <if test="commonId != null and commonId != ''">
             AND p.common_id = #{commonId}
@@ -80,8 +80,8 @@
         c.name as cargoOwnerName,
         c.phone as cargoOwnerPhone,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         <if test="commonId != null and commonId != ''">
@@ -120,8 +120,8 @@
     <select id="getCounstByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(p.id)
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
         AND p.show_hide = '1'
@@ -198,8 +198,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -270,8 +270,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -354,8 +354,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -437,8 +437,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -509,8 +509,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -589,8 +589,8 @@
         c.phone AS cargoOwnerPhone,
         c.name AS cargoOwnerName,
         cu.avatar_url as cargoOwnerPortrait
-        FROM publish_task_info p
-        LEFT JOIN cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
+        FROM hy_publish_task_info p
+        LEFT JOIN hy_cargo_owner_info c on c.common_id = p.common_id and c.delete_flag = 0
         LEFT JOIN common_user cu on cu.id = p.common_id and cu.delete_flag = 0
         WHERE p.delete_flag = '0'
         AND p.status_key = '5'
@@ -612,7 +612,7 @@
     <!-- 根据日期查询任务列表 -->
     <select id="getListsByDateCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo">
-        select task_no from publish_task_info where delete_flag = '0'
+        select task_no from hy_publish_task_info where delete_flag = '0'
         <if test="date != null and date != ''">
             AND (lower(task_no) like lower(CONCAT('%',#{date},'%')))
         </if>