From 0b361ba2b70452b273ffd422e5cd2e32248712d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com> Date: Sat, 6 Dec 2025 20:31:05 +0800 Subject: [PATCH] =?UTF-8?q?12.6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TmsReceiptApplicationService.java | 2 + .../domain/tmsReceipt/entity/TmsReceipt.java | 8 ++ .../repository/po/TmsReceiptPO.java | 8 ++ .../repository/todo/TmsReceiptDO.java | 8 ++ .../finance/interfaces/dto/TmsReceiptDTO.java | 8 ++ .../facadeApp/tmsReceipt/TmsReceiptApi.java | 67 ++++++++++++++++ .../mapper/tmsReceipt/TmsReceiptMapper.xml | 10 ++- .../vehicle/VehicleApplicationService.java | 13 ++- .../mapper/vehicle/VehicleMapper.xml | 80 +++---------------- 9 files changed, 134 insertions(+), 70 deletions(-) diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java index 823802eca..acec63669 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/tmsReceipt/TmsReceiptApplicationService.java @@ -113,6 +113,8 @@ public class TmsReceiptApplicationService { tmsReceiptDO.setOrganizationId(organizationId); tmsReceiptDO.setOrganizationName(organizationName); tmsReceiptDO.setCreateBy(userId); + tmsReceiptDO.setAccountName(dto.getAccountName()); + tmsReceiptDO.setAccountInformation(dto.getAccountInformation()); tmsReceiptDO.setCreateByName(userName); tmsReceiptDO.setReceivePaymentNumber(OrderSequence.getOrderCode()); tmsReceiptDO.setCreateTime(now); diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java index a8f16d04b..2f7e7dcaf 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java @@ -92,6 +92,14 @@ public class TmsReceipt extends BaseVOEntity{ @Excel(name = "收款备注") private String remark; + @ApiModelProperty("账户名称") + @Excel(name = "账户名称") + private String accountName; + + @ApiModelProperty("账户信息") + @Excel(name = "账户信息") + private String accountInformation; + @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除") @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除") private Integer delFlag; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java index f3840de49..1046767cc 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/po/TmsReceiptPO.java @@ -88,6 +88,14 @@ public class TmsReceiptPO extends BaseVOEntity{ @Excel(name = "收款备注") private String remark; + @ApiModelProperty("账户名称") + @Excel(name = "账户名称") + private String accountName; + + @ApiModelProperty("账户信息") + @Excel(name = "账户信息") + private String accountInformation; + @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除") @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除") private Integer delFlag; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java index 9805bc918..ac58c2c05 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/todo/TmsReceiptDO.java @@ -99,6 +99,14 @@ public class TmsReceiptDO extends BaseVOEntity{ @Excel(name = "收款备注") private String remark; + @ApiModelProperty("账户名称") + @Excel(name = "账户名称") + private String accountName; + + @ApiModelProperty("账户信息") + @Excel(name = "账户信息") + private String accountInformation; + @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除") @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除") private Integer delFlag; diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/TmsReceiptDTO.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/TmsReceiptDTO.java index 7fc07cee3..1289619b9 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/TmsReceiptDTO.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/TmsReceiptDTO.java @@ -95,6 +95,14 @@ public class TmsReceiptDTO extends BaseVOEntity{ @Excel(name = "收款备注") private String remark; + @ApiModelProperty("账户名称") + @Excel(name = "账户名称") + private String accountName; + + @ApiModelProperty("账户信息") + @Excel(name = "账户信息") + private String accountInformation; + @ApiModelProperty("删除标记：0-无状态，1-正常，2-已删除") @Excel(name = "是否删除", readConverterExp = "删除标记：0-无状态，1-正常，2-已删除") private Integer delFlag; diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java index a6724e3aa..c18586cc9 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facadeApp/tmsReceipt/TmsReceiptApi.java @@ -1,11 +1,16 @@ package com.linke.finance.interfaces.facadeApp.tmsReceipt; +import java.util.ArrayList; import java.util.List; +import com.linke.finance.application.server.receivingAccount.ReceivingAccountApplicationService; import com.linke.finance.application.server.tmsReceipt.TmsReceiptApplicationService; import com.linke.finance.application.server.tmsReceipt.TmsReceiptAssembler; +import com.linke.finance.domain.receivingAccount.repository.po.ReceivingAccountPO; +import com.linke.finance.domain.receivingAccount.repository.todo.ReceivingAccountDO; import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO; import com.linke.finance.domain.tmsReceipt.repository.todo.TmsReceiptDO; +import com.linke.finance.interfaces.dto.ReceivingAccountDTO; import com.linke.finance.interfaces.dto.TmsReceiptDTO; import com.mhd.common.core.utils.IgnoreNullUtil; import com.mhd.common.core.utils.bean.BeanUtils; @@ -33,6 +38,8 @@ public class TmsReceiptApi extends BaseController{ @Autowired private TmsReceiptApplicationService tmsReceiptApplicationService; + @Autowired + private ReceivingAccountApplicationService receivingAccountApplicationService; @Resource private TmsReceiptAssembler tmsReceiptAssembler; @@ -53,6 +60,66 @@ public class TmsReceiptApi extends BaseController{ List list = tmsReceiptApplicationService.queryList(tmsReceiptDO); return getDataTable(list); } + /** + * 查询收款账户列表 + */ +// @ApiOperation("查询收款账户列表") + @Log(title = "查询收款账户列表", description = "查询收款账户列表", businessType = BusinessType.INQUIRE) + @GetMapping("/listAccount") + public TableDataInfo listAccount(ReceivingAccountDTO receivingAccountDTO) + { + //转换实体 + ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO(); + BeanUtils.copyProperties(receivingAccountDTO, receivingAccountDO); + startPage(); + List list = receivingAccountApplicationService.queryList(receivingAccountDO); + return getDataTable(list); + } + + /** + * 新增收款账户 + */ +// @ApiOperation("新增收款账户") + @Log(title = "新增收款账户", description = "新增收款账户", businessType = BusinessType.INSERT) + @PostMapping("/addAccount") + public AjaxResult addAccount(@RequestBody ReceivingAccountDTO receivingAccountDTO) + { + //转换实体 + ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO(); + BeanUtils.copyProperties(receivingAccountDTO, receivingAccountDO); + return toAjax(receivingAccountApplicationService.insert(receivingAccountDO)); + } + + /** + * 批量新增收款账户 + */ +// @ApiOperation("批量新增收款账户") + @Log(title = "批量新增收款账户", description = "批量新增收款账户", businessType = BusinessType.INSERT) + @PostMapping("/batchAddAccount") + public AjaxResult batchAddAccount(@RequestBody List receivingAccountDTOList) + { + //转换实体 + List receivingAccountDOList = new ArrayList<>(); + for (ReceivingAccountDTO dto : receivingAccountDTOList) { + ReceivingAccountDO receivingAccountDO = new ReceivingAccountDO(); + BeanUtils.copyProperties(dto, receivingAccountDO); + receivingAccountDOList.add(receivingAccountDO); + } + return toAjax(receivingAccountApplicationService.batchInsert(receivingAccountDOList)); + } + + + /** + * 删除收款账户 + */ +// @ApiOperation("删除收款账户") + @Log(title = "删除收款账户", description = "删除收款账户", businessType = BusinessType.DELETE) + @DeleteMapping("/deleteAccount/{id}") + public AjaxResult deleteAccount(@PathVariable("id") Long id) + { + return toAjax(receivingAccountApplicationService.deleteById(id)); + } + /** * 编辑&保存收款单 diff --git a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml index 734a06646..02e08049e 100644 --- a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml +++ b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml @@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -35,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, top_organization_id,organization_id,organization_name,department_name,settlement_party_name,receive_payment_number, receive_payment_amount, assignable_amount,assignment_status,credit_amount,credit_reason, receive_payment_time, serial_number,receive_voucher_url, - remark, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag from tms_receipt + remark, account_name, account_information, create_by,create_by_name, create_time, update_by,update_by_name, update_time, del_flag from tms_receipt @@ -89,6 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and remark = #{remark} + + + and account_name like concat('%', #{accountName}, '%') + + + and account_information like concat('%', #{accountInformation}, '%') order by create_time desc diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java index e2804fbfb..1cc12f451 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/vehicle/VehicleApplicationService.java @@ -2942,10 +2942,19 @@ public class VehicleApplicationService { if (!hasPilot1 && !hasPilot2) { throw new IllegalArgumentException("请选择副驾"); } - + UserDriverDTO userDriverDTO = new UserDriverDTO(); + //将pilot1或是pilot2的id传给userDriverDTO,判断一下谁有值传谁 + userDriverDTO.setUserId(Long.valueOf(hasPilot1 ? vehicleDto.getPilot1Id() : vehicleDto.getPilot2Id())); + userDriverDTO.setVehicleId(vehicleDto.getVehicleId()); // 更新 - return vehicleMapper.updatePilotDriver(vehicleDto); + vehicleMapper.updatePilotDriver(vehicleDto); + + + + userServiceFeign.bindVehicle(userDriverDTO); + + return 1; } } diff --git a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml index fb19f15c6..efba73931 100644 --- a/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml +++ b/mhd_transport/src/main/resources/mapper/vehicle/VehicleMapper.xml @@ -646,76 +646,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - START TRANSACTION; - UPDATE ngwl_test_transport.vehicle v SET - - - v.pilot1_id = #{pilot1Id}, - v.pilot1 = #{pilot1} - - - v.pilot2_id = #{pilot2Id}, - v.pilot2 = #{pilot2} - - + + v.pilot1_id = #{pilot1Id}, + + + v.pilot1 = #{pilot1}, + + + v.pilot2_id = #{pilot2Id}, + + + v.pilot2 = #{pilot2}, + + v.update_time = NOW() WHERE v.vehicle_id = #{vehicleId}; - - - INSERT INTO ngwl_test_user.driver_vehicle_bind - (user_id, vehicle_id, driver_bind_id, bind_driver_name, vehicle_license_plate_number, default_flag, del_flag, create_time, update_time) - SELECT - v.user_id, - v.vehicle_id, - - - #{pilot1Id}, - #{pilot1}, - - - #{pilot2Id}, - #{pilot2}, - - - v.vehicle_license_plate_number, - 2, - 1, - NOW(), - NOW() - FROM ngwl_test_transport.vehicle v - WHERE v.vehicle_id = #{vehicleId} - ON DUPLICATE KEY UPDATE - bind_driver_name = VALUES(bind_driver_name), - update_time = NOW(); - - - INSERT INTO ngwl_test_wlhy.tms_driver - (driver_id, driver_name, vehicle_type_id, create_time, update_time) - VALUES - ( - - - #{pilot1Id}, - #{pilot1}, - - - #{pilot2Id}, - #{pilot2}, - - - #{vehicleId}, - NOW(), - NOW() - ) - ON DUPLICATE KEY UPDATE - driver_name = VALUES(driver_name), - vehicle_type_id = VALUES(vehicle_type_id), - update_time = NOW(); - - - COMMIT;