1

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

@@ -149,6 +149,10 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
      * 累计支付运费（元）
      */
     private Double accumulatedFreight;
+    /**
+     * 审核通过一次（1是）
+     */
+    private String passOnce;
 
     @TableField(exist = false)
     private List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList;

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

@@ -144,6 +144,10 @@ public class HyCompanyInfo extends BaseModel<HyCompanyInfo> {
      * 驳回原因描述
      */
     private String rejectReasonDescription;
+    /**
+     * 审核通过一次（1是）
+     */
+    private String passOnce;
 
     /**
      * 审核标识

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

@@ -235,6 +235,12 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
      * 上报失败原因
      */
     private String escalationFailureReason;
+    /**
+     * 审核通过一次（1是）
+     */
+    private String passOnce;
+
+
     /**
      * 上报list
      */

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

@@ -212,6 +212,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
                 hyCargoOwnerInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
                 hyCargoOwnerInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
                 hyCargoOwnerInfo1.setFirstFlag("1");
+                hyCargoOwnerInfo1.setPassOnce("1");
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setReCommonId(hyCargoOwnerInfo1.getCommonId());

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

@@ -211,6 +211,7 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCom
                 hyCompanyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
                 hyCompanyInfo1.setBackStageStatus(StatusEnum.TASK_REJECT.getName());
                 hyCompanyInfo1.setBackStageStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyCompanyInfo1.setPassOnce("1");
             }
             //驳回
             else if("2".equals(hyCompanyInfo.getFlag())){

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

@@ -370,6 +370,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
                 hyDriverInfo1.setQualificationOverdueFlag("0");
                 hyDriverInfo1.setRejectReason(null);
                 hyDriverInfo1.setRejectReasonDescription(null);
+                hyDriverInfo1.setPassOnce("1");
 
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();

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

@@ -53,6 +53,8 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
     private ICommonSysParameterService commonSysParameterService;
     @Autowired
     private IHyFreezingMoneyInfoService hyFreezingMoneyInfoService;
+    @Autowired
+    private IHyDriverCapitalInfoService hyDriverCapitalInfoService;
 
     /**
      * 后台管理司机运费结算列表
@@ -156,11 +158,20 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         repaymentInfo.setStatusKey(StatusEnum.OUTSTANDING.getFlag());
                         repaymentInfo.setStatus(StatusEnum.OUTSTANDING.getName());
                         repaymentInfoService.insert(repaymentInfo);
+                        //生成司机账单
+                        HyDriverCapitalInfo hyDriverCapitalInfo = new HyDriverCapitalInfo();
+                        hyDriverCapitalInfo.setId(IdGenerator.generateUUID());
+                        hyDriverCapitalInfo.setCommonId(orderInfo1.getCommonId());
+                        hyDriverCapitalInfo.setTypes("预付款");
+                        hyDriverCapitalInfo.setAmountMoney(freightInfo.getPrepaidFreight());
+                        hyDriverCapitalInfo.setOrderId(orderInfo1.getId());
+                        hyDriverCapitalInfo.setOrderNo(orderInfo1.getOrderNo());
+                        hyDriverCapitalInfoService.insert(hyDriverCapitalInfo);
                     } else {
                         //查询是否支付预付款
                         HyFreightSettlementInfo hyFreightSettlementInfo2 = this.selectOne(new EntityWrapper<HyFreightSettlementInfo>()
                                 .eq("order_id",hyFreightSettlementInfo1.getOrderId()).eq("payment_type","预付款")
-                                .eq("status_key","5").eq("delete_flag","0"));
+                                .eq("status_key","7").eq("delete_flag","0"));
                         if (hyFreightSettlementInfo2 == null){
                             throw new YException(YExceptionEnum.PAY_ADVANCE_PAYMENT);
                         }
@@ -200,6 +211,15 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                             hyDriverInfo.setAccumulatedFreight(d4 + freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
                             driverInfoService.updateById(hyDriverInfo);
                         }
+                        //生成司机账单
+                        HyDriverCapitalInfo hyDriverCapitalInfo = new HyDriverCapitalInfo();
+                        hyDriverCapitalInfo.setId(IdGenerator.generateUUID());
+                        hyDriverCapitalInfo.setCommonId(orderInfo1.getCommonId());
+                        hyDriverCapitalInfo.setTypes("尾款");
+                        hyDriverCapitalInfo.setAmountMoney(freightInfo.getFreightBalance());
+                        hyDriverCapitalInfo.setOrderId(orderInfo1.getId());
+                        hyDriverCapitalInfo.setOrderNo(orderInfo1.getOrderNo());
+                        hyDriverCapitalInfoService.insert(hyDriverCapitalInfo);
                         //修改还款信息
                         RepaymentInfo repaymentInfo = repaymentInfoService.selectOne(new EntityWrapper<RepaymentInfo>()
                                 .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
@@ -257,11 +277,20 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                         freightInfo.setPrepaidFreightDate(new Date());
                         freightInfo.setPayabledFreight(hyFreightSettlementInfo1.getAmountMoney());
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPrepaidFreight());
+                        //生成司机账单
+                        HyDriverCapitalInfo hyDriverCapitalInfo = new HyDriverCapitalInfo();
+                        hyDriverCapitalInfo.setId(IdGenerator.generateUUID());
+                        hyDriverCapitalInfo.setCommonId(orderInfo1.getCommonId());
+                        hyDriverCapitalInfo.setTypes("预付款");
+                        hyDriverCapitalInfo.setAmountMoney(freightInfo.getPrepaidFreight());
+                        hyDriverCapitalInfo.setOrderId(orderInfo1.getId());
+                        hyDriverCapitalInfo.setOrderNo(orderInfo1.getOrderNo());
+                        hyDriverCapitalInfoService.insert(hyDriverCapitalInfo);
                     } else {
                         //查询是否支付预付款
                         HyFreightSettlementInfo hyFreightSettlementInfo2 = this.selectOne(new EntityWrapper<HyFreightSettlementInfo>()
                                 .eq("order_id",hyFreightSettlementInfo1.getOrderId()).eq("payment_type","预付款")
-                                .eq("status_key","5").eq("delete_flag","0"));
+                                .eq("status_key","7").eq("delete_flag","0"));
                         if (hyFreightSettlementInfo2 == null){
                             throw new YException(YExceptionEnum.PAY_ADVANCE_PAYMENT);
                         }
@@ -300,6 +329,15 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
                             hyDriverInfo.setAccumulatedFreight(d4 + freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
                             driverInfoService.updateById(hyDriverInfo);
                         }
+                        //生成司机账单
+                        HyDriverCapitalInfo hyDriverCapitalInfo = new HyDriverCapitalInfo();
+                        hyDriverCapitalInfo.setId(IdGenerator.generateUUID());
+                        hyDriverCapitalInfo.setCommonId(orderInfo1.getCommonId());
+                        hyDriverCapitalInfo.setTypes("尾款");
+                        hyDriverCapitalInfo.setAmountMoney(freightInfo.getFreightBalance());
+                        hyDriverCapitalInfo.setOrderId(orderInfo1.getId());
+                        hyDriverCapitalInfo.setOrderNo(orderInfo1.getOrderNo());
+                        hyDriverCapitalInfoService.insert(hyDriverCapitalInfo);
                     }
                 }
                 //查询上报所需信息

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

@@ -119,16 +119,16 @@ public class PdfUtil  implements InitializingBean{
             //填写内容部分
             switch (name){
                 case "fill_1" :
-                    form.setField(name, "黑龙江中天昊元贸易有限公司");break;
+                    form.setField(name, "黑龙江畅运通物流供应链有限公司");break;
                 case "fill_2" :
                     form.setField(name, orderInfo1.getDriverName());break;
                 case "fill_3" :
-                    form.setField(name, "91230230MA1BNL7Q93");break;
+                    form.setField(name, "91230229MABPEWQX94");break;
                 case "fill_4" :
                     form.setField(name, hyDriverInfo.getNumberCard());break;
-                case "fill_23" :
+                case "fill_18" :
                     form.setField(name, orderInfo.getCarNumber());break;
-                case "fill_24" :
+                case "fill_19" :
                     form.setField(name, orderInfo.getTrailerNumber());break;
                 case "fill_5" :
                     form.setField(name, hyDriverCarInfo.getOwner());break;
@@ -147,56 +147,50 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_12" :
                     form.setField(name, publishTaskInfo.getSender());break;
                 case "fill_13" :
-                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
-                            +publishTaskInfo.getSendDetailedAddress());break;
-                case "fill_14" :
                     form.setField(name, publishTaskInfo.getSenderPhone());break;
-                case "fill_15" :
+                case "fill_14" :
                     form.setField(name, publishTaskInfo.getReceiver());break;
+                case "fill_15" :
+                    form.setField(name, publishTaskInfo.getReceiverPhone());break;
                 case "fill_16" :
+                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
+                            +publishTaskInfo.getSendDetailedAddress());break;
+                case "fill_17" :
                     form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
                             +publishTaskInfo.getUnloadDetailedAddress());break;
-                case "fill_17" :
-                    form.setField(name, publishTaskInfo.getReceiverPhone());break;
-                case "fill_18" :
+                case "fill_1_2" :
                     form.setField(name, orderInfo1.getDriverName());break;
-                case "fill_19" :
+                case "fill_2_2" :
                     form.setField(name, hyDriverInfo.getQuasiDrivingVehicle());break;
-                case "fill_20" :
+                case "fill_3_2" :
                     form.setField(name, orderInfo1.getDriverPhone());break;
-                case "fill_21" :
+                case "fill_4_2" :
                     form.setField(name, orderInfo.getContactPersonName());break;
-                case "fill_22" :
+                case "fill_5_2" :
                     form.setField(name, orderInfo.getContactPersonPhone());break;
-                case "fill_2_2" :
+                case "fill_7_2" :
                     form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
                             +publishTaskInfo.getSendDetailedAddress());break;
-                case "fill_3_2" :
+                case "fill_8_2" :
                     form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
                             +publishTaskInfo.getUnloadDetailedAddress());break;
-                case "fill_4_2" :
+                case "fill_9_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, orderInfo.getFreightCars());break;
+                case "Text3" :
                     form.setField(name, String.valueOf(orderInfo.getAdvanceCharge() == null ? 0 : orderInfo.getAdvanceCharge()));break;
-                case "fill_1_2" :
+                case "fill_6_2" :
                     form.setField(name, hyDriverPayeeInfo.getBankCard());break;
                 case "fill_1_3" :
                     form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
-                case "Text3" :
-                    form.setField(name, "甲方");break;
                 case "Text4" :
                     form.setField(name, "甲方");break;
                 case "Text5" :
+                    form.setField(name, "甲方");break;
+                case "Text6" :
                     Image image1 = Image.getInstance(new URL("https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/gongzhang.png"));
                     image1.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image1.setAbsolutePosition(x, y);
@@ -205,13 +199,7 @@ public class PdfUtil  implements InitializingBean{
                 case "Text7" :
                     form.setField(name, "辽宁省营口市鲅鱼圈区青龙山大街8号");break;
                 case "Text8" :
-                    form.setField(name, "123456");break;
-                case "Text9" :
-                    form.setField(name, "123456@163.com");break;
-                case "Text10" :
-                    form.setField(name, "老王");break;
-                case "Text11" :
-                    form.setField(name, "123456");break;
+                    form.setField(name, "4006688647");break;
                 case "Text12" :
                     form.setField(name, now.get(Calendar.YEAR)+"");break;
                 case "Text13" :
@@ -297,8 +285,6 @@ public class PdfUtil  implements InitializingBean{
                 .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"));
@@ -365,12 +351,6 @@ public class PdfUtil  implements InitializingBean{
                     form.setField(name, "91230230MA1BNL7Q93");break;
                 case "fill_4" :
                     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, hyDriverCarInfo.getOwner());break;
                 case "fill_6" :
                     form.setField(name, start.get(Calendar.YEAR)+"");break;
                 case "fill_7" :
@@ -386,79 +366,59 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_12" :
                     form.setField(name, publishTaskInfo.getSender());break;
                 case "fill_13" :
-                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
-                            +publishTaskInfo.getSendDetailedAddress());break;
-                case "fill_14" :
                     form.setField(name, publishTaskInfo.getSenderPhone());break;
-                case "fill_15" :
+                case "fill_14" :
                     form.setField(name, publishTaskInfo.getReceiver());break;
+                case "fill_15" :
+                    form.setField(name, publishTaskInfo.getReceiverPhone());break;
                 case "fill_16" :
+                    form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
+                            +publishTaskInfo.getSendDetailedAddress());break;
+                case "fill_17" :
                     form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
                             +publishTaskInfo.getUnloadDetailedAddress());break;
-                case "fill_17" :
-                    form.setField(name, publishTaskInfo.getReceiverPhone());break;
-                case "fill_18" :
+                case "fill_1_2" :
                     form.setField(name, orderInfo1.getDriverName());break;
-//                case "fill_19" :
-//                    form.setField(name, hyDriverCarInfo.getCarType());break;
-                case "fill_20" :
-                    form.setField(name, orderInfo1.getDriverPhone());break;
-//                case "fill_21" :
-//                    form.setField(name, orderInfo.getContactPersonName());break;
-//                case "fill_22" :
-//                    form.setField(name, orderInfo.getContactPersonPhone());break;
+                case "fill_2_2" :
+                    form.setField(name, hyDriverInfo.getQuasiDrivingVehicle());break;
                 case "fill_3_2" :
+                    form.setField(name, orderInfo1.getDriverPhone());break;
+                case "fill_4_2" :
+                    form.setField(name, orderInfo.getContactPersonName());break;
+                case "fill_5_2" :
+                    form.setField(name, orderInfo.getContactPersonPhone());break;
+                case "fill_7_2" :
                     form.setField(name, publishTaskInfo.getSendPrivate()+publishTaskInfo.getSendCity()+publishTaskInfo.getSendArea()
                             +publishTaskInfo.getSendDetailedAddress());break;
-                case "fill_4_2" :
+                case "fill_8_2" :
                     form.setField(name, publishTaskInfo.getUnloadPrivate()+publishTaskInfo.getUnloadCity()+publishTaskInfo.getUnloadArea()
                             +publishTaskInfo.getUnloadDetailedAddress());break;
-                case "fill_5_2" :
+                case "fill_9_2" :
                     form.setField(name, publishTaskInfo.getGoodsName());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 "Text2" :
-//                    form.setField(name, String.valueOf(orderInfo.getAdvanceCharge()));break;
-                case "fill_1_2" :
+                case "Text1" :
+                    form.setField(name, orderInfo.getFreightCars());break;
+                case "Text2" :
+                    form.setField(name, orderInfo.getFreightCars());break;
+                case "Text3" :
+                    form.setField(name, String.valueOf(orderInfo.getAdvanceCharge() == null ? 0 : orderInfo.getAdvanceCharge()));break;
+                case "fill_6_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;
                 case "Text4" :
                     form.setField(name, "甲方");break;
                 case "Text5" :
-                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
-                        break;
-                    }
-                    Image image1 = Image.getInstance(new URL(orderInfo1.getDriverAutograph()));
+                    form.setField(name, "甲方");break;
+                case "Text6" :
+                    Image image1 = Image.getInstance(new URL("https://taohaoliang.oss-cn-beijing.aliyuncs.com/app/gongzhang.png"));
                     image1.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image1.setAbsolutePosition(x, y);
                     under.addImage(image1);
                     break;
-                case "Text6" :
-                    if(orderInfo1.getDriverAutograph() == null || orderInfo1.getDriverAutograph().isEmpty()){
-                        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;
+                    form.setField(name, "辽宁省营口市鲅鱼圈区青龙山大街8号");break;
                 case "Text8" :
-                    form.setField(name, "123456");break;
-                case "Text9" :
-                    form.setField(name, "123456@163.com");break;
-                case "Text10" :
-                    form.setField(name, "老王");break;
-                case "Text11" :
-                    form.setField(name, "123456");break;
+                    form.setField(name, "4006688647");break;
                 case "Text12" :
                     form.setField(name, now.get(Calendar.YEAR)+"");break;
                 case "Text13" :
@@ -466,10 +426,10 @@ public class PdfUtil  implements InitializingBean{
                 case "Text14" :
                     form.setField(name, now.get(Calendar.DAY_OF_MONTH)+"");break;
                 case "Text15" :
-                    if(orderInfo.getCargoOwnerAutograph() == null || orderInfo.getCargoOwnerAutograph().isEmpty()){
+                    if(orderInfo.getDriverAutograph() == null || orderInfo.getDriverAutograph().isEmpty()){
                         break;
                     }
-                    Image image3 = Image.getInstance(new URL(orderInfo.getCargoOwnerAutograph()));
+                    Image image3 = Image.getInstance(new URL(orderInfo.getDriverAutograph()));
                     image3.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image3.setAbsolutePosition(x, y);
                     under.addImage(image3);
@@ -484,7 +444,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;
@@ -492,10 +452,8 @@ public class PdfUtil  implements InitializingBean{
                     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;
+                case "fill_5_3" :
+                    form.setField(name, hyDriverInfo.getQuasiDrivingVehicle());break;
 
             }
             //

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

@@ -63,6 +63,7 @@
         case when o.authentication_status is null then '未认证' else o.authentication_status end as authenticationStatus,
         o.back_stage_status_key as backStageStatusKey,
         case when o.back_stage_status is null then '未认证' else o.back_stage_status end as backStageStatus,
+        o.pass_once as passOnce,
         o.create_date as createDate,
         o.update_date as updateDate
         FROM common_user c
@@ -98,7 +99,7 @@
             OR lower(o.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         GROUP BY c.phone
-        ORDER BY o.authentication_status_key ASC,o.update_date DESC
+        ORDER BY o.pass_once DESC,o.authentication_status_key ASC,o.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

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

@@ -92,6 +92,7 @@
         c.status,
         c.back_stage_status_key as backStageStatusKey,
         c.back_stage_status as backStageStatus,
+        c.pass_once as passOnce,
         c.create_date as createDate,
         c.update_date as updateDate,
         cu.phone as accountNumber

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

@@ -81,6 +81,7 @@
         case when d.authentication_status is null then '未认证' else d.authentication_status end as authenticationStatus,
         d.back_stage_status_key as backStageStatusKey,
         case when d.back_stage_status is null then '未认证' else d.back_stage_status end as backStageStatus,
+        d.pass_once as passOnce,
         d.create_date as createDate,
         d.update_date as updateDate
         FROM common_user c
@@ -122,7 +123,7 @@
             OR lower(c.user_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(c.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY d.authentication_status_key ASC,d.create_date DESC
+        ORDER BY d.pass_once DESC,d.authentication_status_key ASC,d.create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>