修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PublishTaskInfoController.java

@@ -2,12 +2,15 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.itextpdf.text.DocumentException;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IPublishTaskInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.List;
 
 /**
@@ -167,5 +170,17 @@ public class PublishTaskInfoController {
     public String examine(@RequestBody PublishTaskInfo publishTaskInfo){
         return publishTaskInfoService.examine(publishTaskInfo);
     }
+
+    /**
+     * 货主签合同
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    @Log(title = "货主签合同")
+    @GetMapping("/signContract")
+    public String signContract(PublishTaskInfo publishTaskInfo) throws DocumentException, IOException, URISyntaxException {
+        return publishTaskInfoService.signContract(publishTaskInfo);
+    }
 }
 

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

@@ -240,6 +240,18 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
      * 驳回原因描述
      */
     private String rejectReasonDescription;
+    /**
+     * 委托合同编号
+     */
+    private String wtContractNo;
+    /**
+     * 货主签名地址
+     */
+    private String cargoOwnerAutograph;
+    /**
+     * 货主合同地址
+     */
+    private String contractUrl;
 
     /**
      * 周边货运信息（1是）

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

@@ -1,11 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.itextpdf.text.DocumentException;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
-import org.springframework.web.bind.annotation.RequestBody;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.List;
 
 /**
@@ -109,4 +110,12 @@ public interface IPublishTaskInfoService extends IService<PublishTaskInfo> {
      */
     String examine(PublishTaskInfo publishTaskInfo);
 
+    /**
+     * 货主签合同
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    String signContract(PublishTaskInfo publishTaskInfo) throws DocumentException, IOException, URISyntaxException;
+
 }

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

@@ -1547,21 +1547,21 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
         //货主签合同
         if (orderInfo.getTypeFlag().equals("1")) {
-            //查询用户信息
-            CommonUser commonUser = commonUserService.selectById(orderInfo1.getCargoCommonId());
-            String pdfUrl = pdfUtil.transactionContract(orderInfo);
-            //提交
-            if ("2".equals(orderInfo.getSubmitFlag())) {
-                orderInfo1.setCargoOwnerContract("1");
-                orderInfo1.setCargoOwnerAutograph(orderInfo.getCargoOwnerAutograph());
-                orderInfo1.setWtContractNo(orderInfo1.getOrderNo().replace("CY", "WTHT"));
-                orderInfo1.setOwnerContractUrl(pdfUrl);
-                //更新签名图片
-                commonUser.setSignImg(orderInfo.getCargoOwnerAutograph());
-            }
-            this.updateById(orderInfo1);
-            commonUserService.updateById(commonUser);
-            return pdfUrl;
+//            //查询用户信息
+//            CommonUser commonUser = commonUserService.selectById(orderInfo1.getCargoCommonId());
+//            String pdfUrl = pdfUtil.transactionContract(orderInfo);
+//            //提交
+//            if ("2".equals(orderInfo.getSubmitFlag())) {
+//                orderInfo1.setCargoOwnerContract("1");
+//                orderInfo1.setCargoOwnerAutograph(orderInfo.getCargoOwnerAutograph());
+//                orderInfo1.setWtContractNo(orderInfo1.getOrderNo().replace("CY", "WTHT"));
+//                orderInfo1.setOwnerContractUrl(pdfUrl);
+//                //更新签名图片
+//                commonUser.setSignImg(orderInfo.getCargoOwnerAutograph());
+//            }
+//            this.updateById(orderInfo1);
+//            commonUserService.updateById(commonUser);
+            return "NG";
         }
         //司机签合同
         else {

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

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.itextpdf.text.DocumentException;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
@@ -14,6 +15,7 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.PublishTaskInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntCoordUtil;
+import com.yh.saas.plugin.yiliangyiyun.util.PdfUtil;
 import com.yh.saas.plugin.yiliangyiyun.util.RandomUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -22,6 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -36,6 +40,8 @@ import java.util.*;
 @Service
 public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMapper, PublishTaskInfo> implements IPublishTaskInfoService {
 
+    @Autowired
+    private PdfUtil pdfUtil;
     @Autowired
     private IOrderInfoService orderInfoService;
     @Autowired
@@ -128,10 +134,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             hyCargoOwnerInfos.forEach(cargoOwnerInfo -> {
                 cargoOwnerInfo.setRefreshTimes(0L);
                 //查询被禁用的货主
-                if ("7".equals(cargoOwnerInfo.getAuthenticationStatusKey())){
+                if ("7".equals(cargoOwnerInfo.getAuthenticationStatusKey())) {
                     //解禁日期与日期比较
                     int result1 = cargoOwnerInfo.getLiftingDate().compareTo(date);
-                    if (result1 == 0){
+                    if (result1 == 0) {
                         cargoOwnerInfo.setAuthenticationStatusKey(cargoOwnerInfo.getDisablingStatusKey());
                         cargoOwnerInfo.setAuthenticationStatus(cargoOwnerInfo.getDisablingStatus());
                         cargoOwnerInfo.setBackStageStatus(cargoOwnerInfo.getDisablingBackStatus());
@@ -143,7 +149,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         cargoOwnerInfo.setLiftingDate("");
                         //查询用户信息，将用户状态改为正常
                         CommonUser commonUser = commonUserService.selectById(cargoOwnerInfo.getCommonId());
-                        if (commonUser != null){
+                        if (commonUser != null) {
                             commonUser.setStatus(1);
                             commonUserService.updateById(commonUser);
                         }
@@ -279,10 +285,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         if (!CollectionUtils.isEmpty(hyDriverInfos)) {
             hyDriverInfos.forEach(driverInfo -> {
                 //查询被禁用的司机
-                if ("7".equals(driverInfo.getAuthenticationStatusKey())){
+                if ("7".equals(driverInfo.getAuthenticationStatusKey())) {
                     //解禁日期与日期比较
                     int result1 = driverInfo.getLiftingDate().compareTo(date);
-                    if (result1 == 0){
+                    if (result1 == 0) {
                         driverInfo.setAuthenticationStatusKey(driverInfo.getDisablingStatusKey());
                         driverInfo.setAuthenticationStatus(driverInfo.getDisablingStatus());
                         driverInfo.setBackStageStatus(driverInfo.getDisablingBackStatus());
@@ -294,7 +300,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
                         driverInfo.setLiftingDate("");
                         //查询用户信息，将用户状态改为正常
                         CommonUser commonUser = commonUserService.selectById(driverInfo.getCommonId());
-                        if (commonUser != null){
+                        if (commonUser != null) {
                             commonUser.setStatus(1);
                             commonUserService.updateById(commonUser);
                         }
@@ -672,17 +678,17 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     public PublishTaskInfo selectNum(PublishTaskInfo publishTaskInfo) {
         PublishTaskInfo publishTaskInfo1 = new PublishTaskInfo();
         //审核中数量
-        Integer count = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id",publishTaskInfo.getCommonId())
-                .eq("status_key","1").eq("delete_flag","0"));
+        Integer count = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id", publishTaskInfo.getCommonId())
+                .eq("status_key", "1").eq("delete_flag", "0"));
         //未通过数量
-        Integer count1 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id",publishTaskInfo.getCommonId())
-                .eq("status_key","3").eq("delete_flag","0"));
+        Integer count1 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id", publishTaskInfo.getCommonId())
+                .eq("status_key", "3").eq("delete_flag", "0"));
         //已通过数量
-        Integer count2 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id",publishTaskInfo.getCommonId())
-                .eq("status_key","5").eq("delete_flag","0"));
+        Integer count2 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id", publishTaskInfo.getCommonId())
+                .eq("status_key", "5").eq("delete_flag", "0"));
         //已过期数量
-        Integer count3 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id",publishTaskInfo.getCommonId())
-                .eq("status_key","7").eq("delete_flag","0"));
+        Integer count3 = this.selectCount(new EntityWrapper<PublishTaskInfo>().eq("common_id", publishTaskInfo.getCommonId())
+                .eq("status_key", "7").eq("delete_flag", "0"));
         publishTaskInfo1.setExamieNum(count);
         publishTaskInfo1.setNoNum(count1);
         publishTaskInfo1.setPassNum(count2);
@@ -1409,7 +1415,7 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
         //判断是否已抢过单
         List<OrderInfo> orderInfoList1 = orderInfoService.selectList(new EntityWrapper<OrderInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
-                .eq("task_id",publishTaskInfo.getId()).eq("cargo_common_id", publishTaskInfo.getCommonId()).eq("delete_flag", "0").orderBy("create_date", false));
+                .eq("task_id", publishTaskInfo.getId()).eq("cargo_common_id", publishTaskInfo.getCommonId()).eq("delete_flag", "0").orderBy("create_date", false));
         if (!CollectionUtils.isEmpty(orderInfoList1)) {
             boolean order = "1".equals(orderInfoList1.get(0).getCargoOwnerStatusKey());
             if (order) {
@@ -1496,16 +1502,16 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         orderInfo.setFreightAdvance(publishTaskInfo.getFreightAdvance());
         //查询该司机是否绑定车队长
         HyBindCarCaptainInfo hyBindCarCaptainInfo = hyBindCarCaptainInfoService.selectOne(new EntityWrapper<HyBindCarCaptainInfo>()
-        .eq("common_id",orderInfo.getCommonId())
-                .eq("status_key","5")
-                .eq("delete_flag","0"));
-        if (hyBindCarCaptainInfo != null){
+                .eq("common_id", orderInfo.getCommonId())
+                .eq("status_key", "5")
+                .eq("delete_flag", "0"));
+        if (hyBindCarCaptainInfo != null) {
             //查询车队长信息
             HyCarCaptainInfo hyCarCaptainInfo = hyCarCaptainInfoService.selectOne(new EntityWrapper<HyCarCaptainInfo>()
-                    .eq("common_id",hyBindCarCaptainInfo.getCarCaptainCommonId())
-                    .eq("status_key","5")
-                    .eq("delete_flag","0"));
-            if (hyCarCaptainInfo != null){
+                    .eq("common_id", hyBindCarCaptainInfo.getCarCaptainCommonId())
+                    .eq("status_key", "5")
+                    .eq("delete_flag", "0"));
+            if (hyCarCaptainInfo != null) {
                 orderInfo.setCarCaptainCommonId(hyCarCaptainInfo.getCommonId());
                 orderInfo.setCarCaptainAccountNumber(hyCarCaptainInfo.getAccountNumber());
                 orderInfo.setPayeeName(hyCarCaptainInfo.getName());
@@ -1588,4 +1594,29 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
         return "NG";
     }
+
+    /**
+     * 签合同
+     *
+     * @param publishTaskInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String signContract(PublishTaskInfo publishTaskInfo) throws DocumentException, IOException, URISyntaxException {
+        //查询任务信息
+        PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
+        //查询用户信息
+        CommonUser commonUser = commonUserService.selectById(publishTaskInfo1.getCommonId());
+        String pdfUrl = pdfUtil.transactionContract(publishTaskInfo);
+        publishTaskInfo1.setCargoOwnerAutograph(publishTaskInfo.getCargoOwnerAutograph());
+        publishTaskInfo1.setWtContractNo(publishTaskInfo1.getTaskNo().replace("YS", "WTHT"));
+        publishTaskInfo1.setContractUrl(pdfUrl);
+        //更新签名图片
+        commonUser.setSignImg(publishTaskInfo.getCargoOwnerAutograph());
+        this.updateById(publishTaskInfo1);
+        commonUserService.updateById(commonUser);
+        return pdfUrl;
+    }
+
 }

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

@@ -75,7 +75,7 @@ public class PdfUtil implements InitializingBean {
             owner = hyDriverCarInfo.getOwner();
         }
         //任务信息
-        PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectOne(new EntityWrapper<PublishTaskInfo>().eq("id", orderInfo1.getTaskId())
+        PublishTaskInfo publishTaskInfo1 = publishTaskInfoService.selectOne(new EntityWrapper<PublishTaskInfo>().eq("id", orderInfo1.getTaskId())
                 .eq("delete_flag", "0"));
 
 
@@ -176,24 +176,24 @@ public class PdfUtil implements InitializingBean {
                     form.setField(name, end.get(Calendar.DAY_OF_MONTH) + "");
                     break;
                 case "fill_12":
-                    form.setField(name, publishTaskInfo.getSender());
+                    form.setField(name, publishTaskInfo1.getSender());
                     break;
                 case "fill_13":
-                    form.setField(name, publishTaskInfo.getSenderPhone());
+                    form.setField(name, publishTaskInfo1.getSenderPhone());
                     break;
                 case "fill_14":
-                    form.setField(name, publishTaskInfo.getReceiver());
+                    form.setField(name, publishTaskInfo1.getReceiver());
                     break;
                 case "fill_15":
-                    form.setField(name, publishTaskInfo.getReceiverPhone());
+                    form.setField(name, publishTaskInfo1.getReceiverPhone());
                     break;
                 case "fill_16":
-                    form.setField(name, publishTaskInfo.getSendPrivate() + publishTaskInfo.getSendCity() + publishTaskInfo.getSendArea()
-                            + publishTaskInfo.getSendDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getSendPrivate() + publishTaskInfo1.getSendCity() + publishTaskInfo1.getSendArea()
+                            + publishTaskInfo1.getSendDetailedAddress());
                     break;
                 case "fill_17":
-                    form.setField(name, publishTaskInfo.getUnloadPrivate() + publishTaskInfo.getUnloadCity() + publishTaskInfo.getUnloadArea()
-                            + publishTaskInfo.getUnloadDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getUnloadPrivate() + publishTaskInfo1.getUnloadCity() + publishTaskInfo1.getUnloadArea()
+                            + publishTaskInfo1.getUnloadDetailedAddress());
                     break;
                 case "fill_1_2":
                     form.setField(name, orderInfo1.getDriverName());
@@ -211,15 +211,15 @@ public class PdfUtil implements InitializingBean {
                     form.setField(name, orderInfo.getContactPersonPhone() == null ? "" : orderInfo.getContactPersonPhone());
                     break;
                 case "fill_7_2":
-                    form.setField(name, publishTaskInfo.getSendPrivate() + publishTaskInfo.getSendCity() + publishTaskInfo.getSendArea()
-                            + publishTaskInfo.getSendDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getSendPrivate() + publishTaskInfo1.getSendCity() + publishTaskInfo1.getSendArea()
+                            + publishTaskInfo1.getSendDetailedAddress());
                     break;
                 case "fill_8_2":
-                    form.setField(name, publishTaskInfo.getUnloadPrivate() + publishTaskInfo.getUnloadCity() + publishTaskInfo.getUnloadArea()
-                            + publishTaskInfo.getUnloadDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getUnloadPrivate() + publishTaskInfo1.getUnloadCity() + publishTaskInfo1.getUnloadArea()
+                            + publishTaskInfo1.getUnloadDetailedAddress());
                     break;
                 case "fill_9_2":
-                    form.setField(name, publishTaskInfo.getGoodsName());
+                    form.setField(name, publishTaskInfo1.getGoodsName());
                     break;
                 case "Text1":
                     form.setField(name, orderInfo.getFreightCars() == null ? "" : orderInfo.getFreightCars());
@@ -347,97 +347,104 @@ public class PdfUtil implements InitializingBean {
 
     /***
      * 货主签合同
-     * @param orderInfo
+     * @param publishTaskInfo
      * @return
      * @throws IOException
      * @throws DocumentException
      * @throws URISyntaxException
      */
-    public String transactionContract(OrderInfo orderInfo) throws IOException, DocumentException, URISyntaxException {//利用模板生成pdf
-        //订单信息
-        OrderInfo orderInfo1 = orderInfoService.selectById(orderInfo.getId());
+    public String transactionContract(PublishTaskInfo publishTaskInfo) throws IOException, DocumentException, URISyntaxException {//利用模板生成pdf
+        //查询任务信息
+        PublishTaskInfo publishTaskInfo1 = publishTaskInfoService.selectById(publishTaskInfo.getId());
         //托运人
         String shipper = "";
-        if ("个人货主".equals(orderInfo1.getCompName())){
-            shipper=orderInfo1.getCargoOwner();
+        if ("个人货主".equals(publishTaskInfo1.getCargoOwner())){
+            shipper=publishTaskInfo1.getSender();
         }else {
-            shipper=orderInfo1.getCompName();
+            shipper=publishTaskInfo1.getCargoOwner();
         }
         //企业联系人
         String contacts = "";
-        if (!"个人货主".equals(orderInfo1.getCompName())){
-            contacts=orderInfo1.getCargoOwner();
+        if (!"个人货主".equals(publishTaskInfo1.getCargoOwner())){
+            contacts=publishTaskInfo1.getSender();
         }
         //公司地址
         String conmanyAddress = "";
         //查询公司信息
-        if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()){
-            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
+        if (publishTaskInfo1.getCompId() != null && !publishTaskInfo1.getCompId().isEmpty()){
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(publishTaskInfo1.getCompId());
             conmanyAddress = hyCompanyInfo.getMailingAddress();
         }
-        //查询承运信息
-        HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq("order_id", orderInfo1.getId())
-                .eq("delete_flag", "0"));
-        //任务信息
-        PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectOne(new EntityWrapper<PublishTaskInfo>().eq("id", orderInfo1.getTaskId())
-                .eq("delete_flag", "0"));
         //车长车型要求
         String requirement = "";
-        if ((publishTaskInfo.getCarLengthSmall() == null || publishTaskInfo.getCarLengthSmall().isEmpty()) && (publishTaskInfo.getCarLength() == null || publishTaskInfo.getCarLength().isEmpty())){
+        if ((publishTaskInfo1.getCarLengthSmall() == null || publishTaskInfo1.getCarLengthSmall().isEmpty()) && (publishTaskInfo1.getCarLength() == null || publishTaskInfo1.getCarLength().isEmpty())){
             //车长不限
-            if ("1".equals(publishTaskInfo.getCarModel())){
+            if ("1".equals(publishTaskInfo1.getCarModel())){
                 //车型不限
                 requirement = "车长不限，车型不限";
             }else {
-                if ("2".contains(publishTaskInfo.getCarModel())){
+                if ("2".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求高栏";
-                }else if ("3".contains(publishTaskInfo.getCarModel())){
+                }else if ("3".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求集装箱";
                 }
-                else if ("4".contains(publishTaskInfo.getCarModel())){
+                else if ("4".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求自卸车";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "3".contains(publishTaskInfo.getCarModel())){
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "3".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求高栏、集装箱";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求高栏、自卸车";
                 }
-                else if ("3".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
+                else if ("3".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求集装箱、自卸车";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "3".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "3".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
                     requirement = "车长不限，车型要求高栏、集装箱、自卸车";
                 }
             }
         }else {
-            if ("1".equals(publishTaskInfo.getCarModel())){
+            if ("1".equals(publishTaskInfo1.getCarModel())){
                 //车型不限
-                requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型不限";
+                requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型不限";
             }else {
-                if ("2".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求高栏";
-                }else if ("3".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求集装箱";
+                if ("2".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求高栏";
+                }else if ("3".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求集装箱";
                 }
-                else if ("4".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求自卸车";
+                else if ("4".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求自卸车";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "3".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求高栏、集装箱";
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "3".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求高栏、集装箱";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求高栏、自卸车";
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求高栏、自卸车";
                 }
-                else if ("3".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求集装箱、自卸车";
+                else if ("3".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求集装箱、自卸车";
                 }
-                else if ("2".contains(publishTaskInfo.getCarModel()) && "3".contains(publishTaskInfo.getCarModel()) && "4".contains(publishTaskInfo.getCarModel())){
-                    requirement = "车长要求" + publishTaskInfo.getCarLengthSmall() + "-" + publishTaskInfo.getCarLength() + "米" + "，车型要求高栏、集装箱、自卸车";
+                else if ("2".contains(publishTaskInfo1.getCarModel()) && "3".contains(publishTaskInfo1.getCarModel()) && "4".contains(publishTaskInfo1.getCarModel())){
+                    requirement = "车长要求" + publishTaskInfo1.getCarLengthSmall() + "-" + publishTaskInfo1.getCarLength() + "米" + "，车型要求高栏、集装箱、自卸车";
                 }
             }
         }
-
+        //装货时间
+        String loadingDate = "";
+        if ("随时".equals(publishTaskInfo1.getLoadingDateStart()) && "随时".equals(publishTaskInfo1.getLoadingDateEnd())){
+            loadingDate = "随时";
+        }else{
+            loadingDate = publishTaskInfo1.getLoadingDateStart() + "-" + publishTaskInfo1.getLoadingDateEnd();
+        }
+        //运费
+        String freight = "";
+        if ("0".equals(publishTaskInfo1.getBillingMethod())){
+            freight = publishTaskInfo1.getFreightPrice() + "元/吨";
+        }else {
+            freight = publishTaskInfo1.getFreightPrice() + "元/车";
+        }
 
         //模板路径
         String pdfTmp = "templates" + File.separator + "hzContract.pdf";
@@ -469,15 +476,15 @@ public class PdfUtil implements InitializingBean {
         //获取当前年月日
         SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
         //装货时间
-        Calendar start = Calendar.getInstance();
-        start.setTime(hyCarrierInfo.getLoadingDate());
-        String sdate = f.format(start.getTime());
+//        Calendar start = Calendar.getInstance();
+//        start.setTime(hyCarrierInfo.getLoadingDate());
+//        String sdate = f.format(start.getTime());
         //卸货时间
-        int min = (int)(hyCarrierInfo.getTransportationDuration() * 60);
-        Calendar end = Calendar.getInstance();
-        end.setTime(hyCarrierInfo.getLoadingDate());
-        end.add(Calendar.MINUTE, min);
-        String edate = f.format(end.getTime());
+//        int min = (int)(hyCarrierInfo.getTransportationDuration() * 60);
+//        Calendar end = Calendar.getInstance();
+//        end.setTime(hyCarrierInfo.getLoadingDate());
+//        end.add(Calendar.MINUTE, min);
+//        String edate = f.format(end.getTime());
         //当前时间
         Calendar now = Calendar.getInstance();
         now.setTime(new Date());
@@ -503,7 +510,7 @@ public class PdfUtil implements InitializingBean {
             //填写内容部分
             switch (name) {
                 case "Text1":
-                    form.setField(name, orderInfo1.getOrderNo());
+                    form.setField(name, publishTaskInfo1.getTaskNo());
                     break;
                 case "Text2":
                     form.setField(name, shipper);
@@ -518,48 +525,48 @@ public class PdfUtil implements InitializingBean {
                     form.setField(name, "黑龙江畅运通物流供应链有限公司");
                     break;
                 case "Text7":
-                    form.setField(name, orderInfo1.getGoodsName());
+                    form.setField(name, publishTaskInfo1.getGoodsName());
                     break;
                 case "Text8":
-                    form.setField(name, String.valueOf(hyCarrierInfo.getLoadingWeight())+"吨");
+                    form.setField(name, publishTaskInfo1.getWeight()+"吨");
                     break;
                 case "Text9":
                     form.setField(name, requirement);
                     break;
                 case "Text10":
-                    form.setField(name, sdate);
+                    form.setField(name, loadingDate);
                     break;
                 case "Text11":
-                    form.setField(name, edate);
+                    form.setField(name, "");
                     break;
                 case "Text12":
-                    form.setField(name, orderInfo1.getSendPrivate() + orderInfo1.getSendCity() + orderInfo1.getSendArea()
-                            + orderInfo1.getSendDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getSendPrivate() + publishTaskInfo1.getSendCity() + publishTaskInfo1.getSendArea()
+                            + publishTaskInfo1.getSendDetailedAddress());
                     break;
                 case "Text13":
-                    form.setField(name, orderInfo1.getUnloadPrivate() + orderInfo1.getUnloadCity() + orderInfo1.getUnloadArea()
-                            + orderInfo1.getUnloadDetailedAddress());
+                    form.setField(name, publishTaskInfo1.getUnloadPrivate() + publishTaskInfo1.getUnloadCity() + publishTaskInfo1.getUnloadArea()
+                            + publishTaskInfo1.getUnloadDetailedAddress());
                     break;
                 case "Text14":
-                    form.setField(name, String.valueOf(orderInfo1.getAdvanceCharge()));
+                    form.setField(name, "0元");
                     break;
                 case "Text15":
-                    form.setField(name, String.valueOf(orderInfo1.getFreight()));
+                    form.setField(name, freight);
                     break;
                 case "Text16":
-                    form.setField(name, "0");
+                    form.setField(name, "0元");
                     break;
                 case "Text17":
-                    form.setField(name, "畅运通货主端平台");
+                    form.setField(name, "电汇");
                     break;
                 case "Text18":
-                    form.setField(name, "");
+                    form.setField(name, publishTaskInfo1.getTaskDescription());
                     break;
                 case "Text19":
-                    if (orderInfo.getCargoOwnerAutograph() == null || orderInfo.getCargoOwnerAutograph().isEmpty()) {
+                    if (publishTaskInfo.getCargoOwnerAutograph() == null || publishTaskInfo.getCargoOwnerAutograph().isEmpty()) {
                         break;
                     }
-                    Image image3 = Image.getInstance(new URL(orderInfo.getCargoOwnerAutograph()));
+                    Image image3 = Image.getInstance(new URL(publishTaskInfo.getCargoOwnerAutograph()));
                     image3.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image3.setAbsolutePosition(x, y);
                     under.addImage(image3);