From 4a75dfd313f16c890104e83533cc349e30950258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Wed, 25 Feb 2026 16:14:52 +0800 Subject: [PATCH] =?UTF-8?q?0225=E8=B4=A2=E5=8A=A1=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=BA=94=E4=BB=98=E8=B4=A6=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/BusinessDocumentDetaliDTO.java | 6 ++++++ .../core/domain/dto/ReconciliationDTO.java | 3 +++ .../core/domain/dto/VerificationDto.java | 5 +++++ .../core/domain/entity/Verification.java | 6 ++++++ .../common/core/domain/po/VerificationPo.java | 6 ++++++ .../BusinessDocumentApplicationService.java | 4 ++++ .../entity/BusinessDocumentDetali.java | 6 ++++++ .../po/BusinessDocumentDetaliAuditPO.java | 6 ++++++ .../todo/BusinessDocumentDetaliDO.java | 6 ++++++ .../reconciliation/entity/Reconciliation.java | 4 ++++ .../repository/po/ReconciliationPO.java | 3 +++ .../repository/todo/ReconciliationDO.java | 3 +++ .../BusinessDocumentDetaliMapper.xml | 6 ++++++ .../reconciliation/ReconciliationMapper.xml | 12 +++++++---- .../verification/VerificationMapper.xml | 20 ++++++++++++++++++- 15 files changed, 91 insertions(+), 5 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDetaliDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDetaliDTO.java index 25c9676ba..420a75899 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDetaliDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDetaliDTO.java @@ -150,4 +150,10 @@ public class BusinessDocumentDetaliDTO extends BaseVOEntity{ @ApiModelProperty("油卡号") private String fuelCardNumber; + + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; } diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java index c2253292d..fbfe1b000 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java @@ -238,6 +238,9 @@ public class ReconciliationDTO extends BaseVOEntity{ @ApiModelProperty("nc同步状态 0-未同步 1-已同步") private Integer skSynchronousStatus; + @ApiModelProperty(value = "收款账户") + private String accountInformation; + @ApiModelProperty(value = "账单科目明细") public List reconciliationAccountDTOList; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/VerificationDto.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/VerificationDto.java index a1e8fd910..a4178a2a7 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/VerificationDto.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/VerificationDto.java @@ -172,4 +172,9 @@ public class VerificationDto extends BaseVOEntity implements Serializable @ApiModelProperty("付款人") private String payName; + + + + @ApiModelProperty("司机姓名") + private String driver; } diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Verification.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Verification.java index d09b27d2a..82acae14c 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Verification.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Verification.java @@ -128,6 +128,12 @@ public class Verification extends BaseVOEntity implements Serializable,Cloneable @ApiModelProperty("油卡号") private String fuelCardNumber; + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; + // @ApiModelProperty(name = "核销类型（1.收入核销2.支出核销）") // private Integer verificationType; diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/VerificationPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/VerificationPo.java index c43940daa..f94a1798c 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/VerificationPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/VerificationPo.java @@ -149,4 +149,10 @@ public class VerificationPo extends BaseVOEntity implements Serializable @ApiModelProperty("油卡号") private String fuelCardNumber; + + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; } diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java index 1bbc05a16..20c174d3c 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java @@ -1377,6 +1377,8 @@ public class BusinessDocumentApplicationService { int randomFour = (int) (Math.random() * 9000 + 1000); String format = sd.format(now); String innerNumber = "YF" + format + randomFour;//应付单据号 + verification.setDriver(businessDocumentDetaliDO.getDriver()); + verification.setDriverName(businessDocumentDetaliDO.getDriverName()); verification.setSecondSubject(secondSubjectPO.getSecondSubject()); verification.setSecondSubjectName(secondSubjectPO.getSecondSubjectName()); verification.setVerificationMoney(secondSubjectPO.getAmount()); @@ -1424,6 +1426,8 @@ public class BusinessDocumentApplicationService { verification.setUpdateTime(now); verification.setUpdateBy(loginUser.getUserid()); verification.setUpdateByName(loginUser.getUsername()); + verification.setDriver(businessDocumentDetaliDO.getDriver()); + verification.setDriverName(businessDocumentDetaliDO.getDriverName()); // 确保 delFlag 被设置（1=正常，2=已删除） if (verification.getDelFlag() == null) { verification.setDelFlag(1); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java index e3c134f86..88875a82a 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java @@ -164,4 +164,10 @@ public class BusinessDocumentDetali extends BaseVOEntity{ @ApiModelProperty("油卡号") private String fuelCardNumber; + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; + } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliAuditPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliAuditPO.java index 7dcd6d9bd..64e3e4ec1 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliAuditPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliAuditPO.java @@ -131,4 +131,10 @@ public class BusinessDocumentDetaliAuditPO{ @ApiModelProperty("油卡号") private String fuelCardNumber; + + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/todo/BusinessDocumentDetaliDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/todo/BusinessDocumentDetaliDO.java index cbab8da03..d6e0ae77d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/todo/BusinessDocumentDetaliDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/todo/BusinessDocumentDetaliDO.java @@ -152,4 +152,10 @@ public class BusinessDocumentDetaliDO extends BaseVOEntity{ @ApiModelProperty("油卡号") private String fuelCardNumber; + + @ApiModelProperty("司机姓名--修改后实际是承运商姓名") + private String driverName; + + @ApiModelProperty("司机姓名") + private String driver; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java index b22224d46..052e6ff6a 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java @@ -242,4 +242,8 @@ public class Reconciliation extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + + @ApiModelProperty(value = "收款账户") + private String accountInformation; + } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java index da2970f99..0505c113b 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java @@ -244,6 +244,9 @@ public class ReconciliationPO extends BaseVOEntity{ @ApiModelProperty("结算币种") private String settlementCurrency; + @ApiModelProperty(value = "收款账户") + private String accountInformation; + @ApiModelProperty(value = "账单科目明细") public List reconciliationAccountDTOList; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java index 9de8910b8..c1c9002f2 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java @@ -277,6 +277,9 @@ public class ReconciliationDO extends BaseVOEntity{ @ApiModelProperty(value = "nc唯一标识") private String skNcId; + @ApiModelProperty(value = "收款账户") + private String accountInformation; + @ApiModelProperty(value = "账单科目明细") public List reconciliationAccountDTOList; diff --git a/mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml b/mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml index 412a6f9ea..f2418447e 100644 --- a/mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml +++ b/mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml @@ -115,6 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.waybill_number like concat('%', #{waybillNumber}, '%') + + + and a.driver like concat('%', #{driver}, '%') + + + and a.driver_name like concat('%', #{driverName}, '%') and b.approval_number like concat('%', #{approvalNumber}, '%') diff --git a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml index c413c3b89..09e07e987 100644 --- a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml @@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.shipper_name like concat('%', #{shipperName}, '%') + + and a.account_information like concat('%', #{accountInformation}, '%') + and a.inner_number like concat('%', #{innerNumber}, '%') @@ -207,8 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update reconciliation_order_detail set del_flag = 2 where reconciliation_id = #{reconciliationId} - - + INSERT INTO reconciliation ( verification_money, @@ -273,7 +275,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" nc_id, sk_synchronous_status, sk_synchronous_time, - sk_nc_id + sk_nc_id, + account_information ) VALUES ( #{verificationMoney}, #{settlementCount}, @@ -337,7 +340,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{ncId}, #{skSynchronousStatus}, #{skSynchronousTime}, - #{skNcId} + #{skNcId}, + #{accountInformation} ) diff --git a/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml b/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml index a1d132bb0..135c1c88e 100644 --- a/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml @@ -100,7 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" v.bill_remarks, v.payment_method, v.fuel_card_number, - v.organization_name + v.organization_name, + v.driver_name, + v.driver FROM verification v @@ -399,6 +401,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart} + + + + + + AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') #{cancelAfterVerificationTimeEnd} @@ -759,6 +767,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_by_name, del_flag, + driver_name, + driver values @@ -807,6 +817,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.updateBy}, #{item.updateByName}, #{item.delFlag}, + #{item.driverName}, + #{item.driver} @@ -1068,6 +1080,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(v.create_time,'%Y-%m-%d') #{enterAccountTimeEnd} + + AND v.driver_name like concat('%', #{driverName}, '%') + + + AND v.driver like concat('%', #{driver}, '%') + and v.payment_method = #{paymentMethod}