weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-02-25 16:16:31 +08:00
parent 7a65bd072c b928376a7f
commit d3f169bd51
15 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/BusinessDocumentDetaliDTO.java
+6
View File
@@ -150,4 +150,10 @@ public class BusinessDocumentDetaliDTO extends BaseVOEntity{
@ApiModelProperty("油卡号")
private String fuelCardNumber;
@ApiModelProperty("司机姓名--修改后实际是承运商姓名")
private String driverName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java
+3
View File
@@ -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<ReconciliationAccountDTO> reconciliationAccountDTOList;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/VerificationDto.java
+5
View File
@@ -172,4 +172,9 @@ public class VerificationDto extends BaseVOEntity implements Serializable
@ApiModelProperty("付款人")
private String payName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/entity/Verification.java
+6
View File
@@ -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;
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/VerificationPo.java
+6
View File
@@ -149,4 +149,10 @@ public class VerificationPo extends BaseVOEntity implements Serializable
@ApiModelProperty("油卡号")
private String fuelCardNumber;
@ApiModelProperty("司机姓名--修改后实际是承运商姓名")
private String driverName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java
+4
View File
@@ -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);
mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/entity/BusinessDocumentDetali.java
+6
View File
@@ -164,4 +164,10 @@ public class BusinessDocumentDetali extends BaseVOEntity{
@ApiModelProperty("油卡号")
private String fuelCardNumber;
@ApiModelProperty("司机姓名--修改后实际是承运商姓名")
private String driverName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/po/BusinessDocumentDetaliAuditPO.java
+6
View File
@@ -131,4 +131,10 @@ public class BusinessDocumentDetaliAuditPO{
@ApiModelProperty("油卡号")
private String fuelCardNumber;
@ApiModelProperty("司机姓名--修改后实际是承运商姓名")
private String driverName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocumentDetali/repository/todo/BusinessDocumentDetaliDO.java
+6
View File
@@ -152,4 +152,10 @@ public class BusinessDocumentDetaliDO extends BaseVOEntity{
@ApiModelProperty("油卡号")
private String fuelCardNumber;
@ApiModelProperty("司机姓名--修改后实际是承运商姓名")
private String driverName;
@ApiModelProperty("司机姓名")
private String driver;
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/entity/Reconciliation.java
+4
View File
@@ -242,4 +242,8 @@ public class Reconciliation extends BaseVOEntity{
@ApiModelProperty(value = "nc唯一标识")
private String skNcId;
@ApiModelProperty(value = "收款账户")
private String accountInformation;
}
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java
+3
View File
@@ -244,6 +244,9 @@ public class ReconciliationPO extends BaseVOEntity{
@ApiModelProperty("结算币种")
private String settlementCurrency;
@ApiModelProperty(value = "收款账户")
private String accountInformation;
@ApiModelProperty(value = "账单科目明细")
public List<ReconciliationAccount> reconciliationAccountDTOList;
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java
+3
View File
@@ -277,6 +277,9 @@ public class ReconciliationDO extends BaseVOEntity{
@ApiModelProperty(value = "nc唯一标识")
private String skNcId;
@ApiModelProperty(value = "收款账户")
private String accountInformation;
@ApiModelProperty(value = "账单科目明细")
public List<ReconciliationAccountDTO> reconciliationAccountDTOList;
mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml
+6
View File
@@ -115,6 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="waybillNumber != null and waybillNumber != ''">
and a.waybill_number like concat('%', #{waybillNumber}, '%')
</if>
<if test="driver != null and driver != ''">
and a.driver like concat('%', #{driver}, '%')
</if>
<if test="driverName != null and driverName != ''">
and a.driver_name like concat('%', #{driverName}, '%')
</if>
<if test="approvalNumber != null and approvalNumber != ''">
and b.approval_number like concat('%', #{approvalNumber}, '%')
mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+7 -3
View File
@@ -72,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shipperName != null and shipperName != ''">
and a.shipper_name like concat('%', #{shipperName}, '%')
</if>
<if test="accountInformation != null and accountInformation != ''">
and a.account_information like concat('%', #{accountInformation}, '%')
</if>
<if test="innerNumber != null and innerNumber != ''">
and a.inner_number like concat('%', #{innerNumber}, '%')
</if>
@@ -208,7 +211,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update reconciliation_order_detail set del_flag = 2 where reconciliation_id = #{reconciliationId}
</update>
<!-- 自定义插入语句，确保传入的createTime被使用 -->
<insert id="insertWithCreateTime" parameterType="com.linke.finance.domain.reconciliation.entity.Reconciliation" useGeneratedKeys="true" keyProperty="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}
)
</insert>
</mapper>
mhd_finance/src/main/resources/mapper/verification/VerificationMapper.xml
+19 -1
View File
@@ -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
</sql>
@@ -399,6 +401,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="cancelAfterVerificationTimeStart != null and cancelAfterVerificationTimeStart != ''">
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') >= #{cancelAfterVerificationTimeStart}
</if>
<!-- <if test="driverName != null and driverName != ''">-->
<!-- AND v.driver_name like concat('%', #{driverName}, '%')-->
<!-- </if>-->
<!-- <if test="driver != null and driver != ''">-->
<!-- AND v.driver like concat('%', #{driver}, '%')-->
<!-- </if>-->
<if test="cancelAfterVerificationTimeEnd != null and cancelAfterVerificationTimeEnd != ''">
AND date_format(v.cancel_after_verification_time,'%Y-%m-%d') <![CDATA[<=]]> #{cancelAfterVerificationTimeEnd}
</if>
@@ -759,6 +767,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
update_by_name,
del_flag,
driver_name,
driver
</trim>
values
<foreach collection="list" item="item" separator=",">
@@ -807,6 +817,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item.updateBy},
#{item.updateByName},
#{item.delFlag},
#{item.driverName},
#{item.driver}
</trim>
</foreach>
</insert>
@@ -1068,6 +1080,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterAccountTimeEnd != null">
AND date_format(v.create_time,'%Y-%m-%d') <![CDATA[<=]]> #{enterAccountTimeEnd}
</if>
<if test="driverName != null and driverName != ''">
AND v.driver_name like concat('%', #{driverName}, '%')
</if>
<if test="driver != null and driver != ''">
AND v.driver like concat('%', #{driver}, '%')
</if>
<if test="paymentMethod != null ">
and v.payment_method = #{paymentMethod}