From 97330de8ba736a24c5ca096f776b8059afcc2015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 13 Dec 2025 20:48:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/model/LoginUser.java | 4 +++ .../service/UserApplicationService.java | 1 + .../service/UserDriverApplicationService.java | 36 +++++++++++++++++++ .../userAggregate/factory/UserFactory.java | 2 ++ .../facade/UserDriverRepositoryInterface.java | 2 ++ .../repository/mapper/UserDriverMapper.java | 2 ++ .../persistence/UserDriverRepositoryImpl.java | 5 +++ .../service/UserDriverDomainService.java | 5 +++ .../user/interfaces/facade/UserDriverAPI.java | 11 ++++++ .../interfaces/vo/QueryAllShipperInfoVo.java | 3 ++ .../resources/mapper/UserDriverMapper.xml | 31 ++++++++++++++++ .../src/main/resources/mapper/UserMapper.xml | 2 +- .../material/persistence/MaterialDO.java | 5 +++ sql/finance20251213.sql | 11 ++++++ sql/transport20251213.sql | 12 +++++++ 15 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 sql/finance20251213.sql create mode 100644 sql/transport20251213.sql diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java index 76a537dc4..3afe4170e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/model/LoginUser.java @@ -38,6 +38,10 @@ public class LoginUser implements Serializable * 用户名 */ private String username; + /** + * 用户名 + */ + private String realname; /** * 登录时间 diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 2e0896d5d..0ccf7cd51 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -2042,6 +2042,7 @@ public class UserApplicationService { VehiclePo vehiclePo = new VehiclePo(); sysUser.setUserid(userPo.getUserId()); sysUser.setUsername(userPo.getUserAccount()); + sysUser.setRealname(userPo.getUserName()); UserDriverPo userDriverPo = userDriverDomainService.selectByUserId(userPo.getUserId()); if (ObjectUtil.isNull(userDriverPo)) { userDriverPo = new UserDriverPo(); diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java index 705d88ea8..7300c47c1 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java @@ -2052,6 +2052,42 @@ public class UserDriverApplicationService { return mapList; } + public List> userPersonalDriverAuthList() { + //获取当前登录人 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + throw new DigitalLogisticsException(UserError.TIMEOUT); + } + + UserDriverDO userDriverDO = new UserDriverDO(); + //20240227 修改为查询用户关联的司机数据，包括车队长、承运企业 + List userDriverPos = userDriverDomainService.userPersonalDriverAuthList(userDriverDO); + + List> mapList = new ArrayList<>(); + if (CollUtil.isNotEmpty(userDriverPos)) { + for (UserDriverPo u : userDriverPos) { + Map map = new HashMap<>(); + map.put("userId", u.getUserId().toString()); + + StringBuilder str = new StringBuilder(); + str.append(u.getUserName()); + + if (StrUtil.isNotEmpty(u.getUserPhone())) { + str.append(", ").append(u.getUserPhone()); + } + + if (StrUtil.isNotEmpty(u.getDriverEnterpriseName())) { + str.append("【").append(u.getDriverEnterpriseName()).append("】"); + } + + map.put("label", String.valueOf(str)); + mapList.add(map); + } + } + + return mapList; + } + /** * 车队认证-车队长查询 */ diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java index 3fe1fbe51..73fa75fe9 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java @@ -1,5 +1,6 @@ package com.mhd.user.domain.userAggregate.factory; +import cn.hutool.core.util.ObjectUtil; import com.mhd.user.domain.userAggregate.entity.UserEntity; import com.mhd.common.core.domain.po.UserPo; import com.mhd.user.domain.userAggregate.repository.todo.UserDO; @@ -20,6 +21,7 @@ public class UserFactory { public UserEntity getUserEntity(UserDO userDO) { UserEntity userEntity = new UserEntity(); BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO)); + userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?Integer.valueOf(userDO.getDepartmentId()):null); return userEntity; } public CheckDO getCheckDo(UserDO userDO) { diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java index 2768d150a..42bfcf13a 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java @@ -55,6 +55,8 @@ public interface UserDriverRepositoryInterface extends IService userDriverAuthList(UserDriverDO userDriverDO); + List userPersonalDriverAuthList(UserDriverDO userDriverDO); + List> motorcadeAuthCaptainList(Long organizationId); List getRegionDriverList(UserDriverDO userDriverDO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java index 6f29a301b..3dce2f973 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java @@ -54,6 +54,8 @@ public interface UserDriverMapper extends BaseMapper { List userDriverAuthList(UserDriverDO userDriverDO); + List userPersonalDriverAuthList(UserDriverDO userDriverDO); + List> motorcadeAuthCaptainList(Long organizationId); List getRegionDriverList(@Param("userDriverDO") UserDriverDO userDriverDO); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java index a3a0cd232..f9749b0f3 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java @@ -183,6 +183,11 @@ public class UserDriverRepositoryImpl extends ServiceImpl userPersonalDriverAuthList(UserDriverDO userDriverDO) { + return userDriverMapper.userPersonalDriverAuthList(userDriverDO); + } + @Override public List> motorcadeAuthCaptainList(Long organizationId) { return userDriverMapper.motorcadeAuthCaptainList(organizationId); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java index 1d1770b10..d7c2b70ee 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java @@ -187,6 +187,11 @@ public class UserDriverDomainService { return userDriverRepositoryInterface.userDriverAuthList(userDriverDO); } + @DataPermissions(cacheName = "master") + public List userPersonalDriverAuthList(UserDriverDO userDriverDO) { + return userDriverRepositoryInterface.userPersonalDriverAuthList(userDriverDO); + } + public List> motorcadeAuthCaptainList(Long organizationId) { return userDriverRepositoryInterface.motorcadeAuthCaptainList(organizationId); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java index 3a0fd9e9f..872d56fcd 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java @@ -246,6 +246,17 @@ public class UserDriverAPI extends BaseController { return AjaxResult.success(userDriverApplicationService.userDriverAuthList()); } + /** + * 车辆认证-承运人查询(个人司机) + * @return + */ + @Log(title = "承运人管理-查询", description ="车辆认证-承运人查询(个人司机)",businessType = BusinessType.INQUIRE) + @ApiOperation("车辆认证-承运人查询(个人司机)") + @GetMapping("/userPersonalDriverAuthList") + public AjaxResult userPersonalDriverAuthList() { + return AjaxResult.success(userDriverApplicationService.userPersonalDriverAuthList()); + } + /** * 车辆导入-承运人查询 * @return diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java index 35a03089f..bf5354eaa 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java @@ -58,4 +58,7 @@ public class QueryAllShipperInfoVo { @ApiModelProperty("是否有默认地址") private Boolean hasDefaultAddress; + + @ApiModelProperty("用户nc") + private String documentPreparerNcCode; } diff --git a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml index 59b9303ce..96a32d8aa 100644 --- a/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml @@ -975,6 +975,37 @@ + +