提交新增合同文件校验

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/ContractLogisticsOrderResDto.java

@@ -65,6 +65,14 @@ public class ContractLogisticsOrderResDto implements Serializable {
      * 托运企业电话
      */
     private String consignEntPhone;
+    /**
+     * 托运联系id
+     */
+    private Long consignEntContactId;
+    /**
+     * 托运企业联系人
+     */
+    private String consignEntContact;
 
     /**
      * 承运企业id
@@ -74,6 +82,14 @@ public class ContractLogisticsOrderResDto implements Serializable {
      * 承运企业电话
      */
     private String acceptCarriageEntPhone;
+    /**
+     * 承运联系人id
+     */
+     private Long acceptCarriageEntContactId;
+    /**
+     * 承运企业联系人
+     */
+    private String acceptCarriageEntContact;
 
     /**
      * 承运企业名称

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractLogisticsUnit.java

@@ -90,5 +90,9 @@ public class KwcContractLogisticsUnit implements Serializable {
      */
     private Integer delFlag;
 
-
+    /**
+     * 联系人id
+     */
+    @TableField("contacts_id")
+    private Long contactsId;
 }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1327,6 +1327,7 @@ public class KwcContractLogisticsService {
             kwcContractTradeUnit.setFirmName(entCacheResDto.getFirmName());
             kwcContractTradeUnit.setContacts(entCacheResDto.getContacts());
             kwcContractTradeUnit.setPhone(entCacheResDto.getPhone());
+            kwcContractTradeUnit.setContactsId(entCacheResDto.getContactsId());
         }
 
         kwcContractTradeUnit.setSignPhone(phone);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1741,9 +1741,13 @@ public class KwcContractTradeService {
         contractLogisticsOrderResDto.setConsignEntId(consignEnt.getEntId());
         contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
         contractLogisticsOrderResDto.setConsignEntPhone(consignEnt.getPhone());
+        contractLogisticsOrderResDto.setConsignEntContactId(consignEnt.getContactsId());
+        contractLogisticsOrderResDto.setConsignEntContact(consignEnt.getContacts());
         contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getEntId());
         contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
         contractLogisticsOrderResDto.setAcceptCarriageEntPhone(acceptCarriageEnt.getPhone());
+        contractLogisticsOrderResDto.setAcceptCarriageEntContactId(acceptCarriageEnt.getContactsId());
+        contractLogisticsOrderResDto.setAcceptCarriageEntContact(acceptCarriageEnt.getContacts());
         KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
                 new KwcContractLogisticsGoods());
         contractLogisticsOrderResDto.setPrice(StringUtils.isNotBlank(goods.getPrice()) ? goods.getPrice() : log.getCommonPrice());
@@ -1806,7 +1810,7 @@ public class KwcContractTradeService {
         KwcContractTradeUnit unit = conTractTradeUnitMap.getOrDefault(c.getId() + "_" + entType,
                 new KwcContractTradeUnit());
         contractTradeOrderInfo.setEntId(unit.getEntId());
-        contractTradeOrderInfo.setContractNo(unit.getFirmName());
+        contractTradeOrderInfo.setContractNo(c.getContractNo());
         contractTradeOrderInfo.setName(c.getName());
         contractTradeOrderInfo.setSigningWay(c.getSigningWay());
         contractTradeOrderInfo.setTrading(c.getTrading());