diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java index 20ea7d902..ee1ab9eb8 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDataPushDTO.java @@ -74,4 +74,11 @@ public class BusinessDataPushDTO{ @ApiModelProperty("数据来源(1-系统生成,2-手工录入)") private Integer dataSources; + + @ApiModelProperty("结算币种") + private String settlementCurrency; + @ApiModelProperty("业务员ID") + private String salesmanId; + @ApiModelProperty("业务员名称") + private String salesmanName; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index 33a32b5db..124b5af35 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -493,6 +493,9 @@ public class LeaseApplicationService { jsonObject.put("jiecun_cbm",0);//结存体积 businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString()); businessDataPushDTO.setDocumentTypeCode("TY_ZL"); + businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId()); + businessDataPushDTO.setSalesmanName(leasePO.getSalesmanName()); + businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency()); businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); @@ -539,6 +542,9 @@ public class LeaseApplicationService { jsonObject.put("jiecun_cbm",totalVolume);//结存体积 businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString()); businessDataPushDTO.setDocumentTypeCode("TY_ZL"); + businessDataPushDTO.setSalesmanId(leasePO.getSalesmanId()); + businessDataPushDTO.setSalesmanName(leasePO.getSalesmanName()); + businessDataPushDTO.setSettlementCurrency(leasePO.getSettlementCurrency()); businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java index 49b2ca714..2ebd21a80 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java @@ -93,4 +93,7 @@ public class Lease extends BaseVOEntity{ @ApiModelProperty("推送时间") private String pushTime; + + @ApiModelProperty("业务员ID") + private String salesmanId; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java index e823d48af..3bf1cef18 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java @@ -94,4 +94,7 @@ public class LeasePO extends BaseVOEntity{ @ApiModelProperty("推送时间") private String pushTime; + + @ApiModelProperty("业务员ID") + private String salesmanId; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java index ee2d24c23..6e6da37e8 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java @@ -110,4 +110,7 @@ public class LeaseDO extends BaseVOEntity{ @ApiModelProperty("推送时间") private String pushTime; + + @ApiModelProperty("业务员ID") + private String salesmanId; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java index 18dfc3844..4d045da4b 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java @@ -107,4 +107,7 @@ public class LeaseDTO extends BaseVOEntity{ @ApiModelProperty("推送时间") private String pushTime; + + @ApiModelProperty("业务员ID") + private String salesmanId; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml index 765b2306e..fc99a9216 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -67,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.bill_days, a.bill_time, a.salesman_name, - a.settlement_currency + a.settlement_currency, + a.salesman_id from lease a LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1