From b63101272c43c01e6bf828b59d7d9c7e9d163983 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 9c4430f..fa9edd8 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -117,7 +117,7 @@
private IUserService userService;
@Autowired
- private ITCompanyService companyService;
+ private ITBranchOfficeService branchOfficeService;
/**
* 跳转到首页
@@ -552,21 +552,19 @@
tDriver.setApprovalStatus(approvalStatus);
tDriver.setApprovalNotes(approvalNotes);
// 审核用户id
- Subject subject = ShiroKit.getSubject();
- ShiroUser shiroUser = (ShiroUser)subject.getPrincipal();
- tDriver.setApprovalUserId(shiroUser.getId());
+ tDriver.setApprovalUserId(user1.getId());
tDriver.setApprovalTime(new Date());
if (approvalStatus==2){
//审核通过，在中台添加司机账号
Integer objectId = tDriver.getBranchOfficeId();
- TCompany tCompany = companyService.selectById(objectId);
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
+ TBranchOffice tBranchOffice = branchOfficeService.selectById(objectId);
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tBranchOffice.getEnterCode());
Long empId = null;
Integer empnew = null;
if(null == userInfoByPhone || userInfoByPhone.size() == 0){
SaveStaffNodeRequest request = new SaveStaffNodeRequest();
request.setMobile(user2.getPhone());
- request.setEntercode(tCompany.getEnterCode());
+ request.setEntercode(tBranchOffice.getEnterCode());
request.setEmpName(tDriver.getName());
request.setEmpNickname(tDriver.getName());
request.setLoginNo(tDriver.getPhone());
@@ -589,8 +587,8 @@
empnew = 0;
}
tDriver.setEmpId(empId);
- tDriver.setEntercode(tCompany.getEnterCode());
- tDriver.setEnterId(Long.valueOf(tCompany.getEnterCode()));
+ tDriver.setEntercode(tBranchOffice.getEnterCode());
+ tDriver.setEnterId(Long.valueOf(tBranchOffice.getEnterCode()));
tDriver.setEmpnew(empnew);
}
tDriverService.updateById(tDriver);
@@ -668,14 +666,14 @@
ShiroUser user = shiroExtUtil.getUser();
User user2 = userService.selectById(user.getId());
Integer objectId = user.getObjectId();
- TCompany tCompany = companyService.selectById(objectId);
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tCompany.getEnterCode());
+ TBranchOffice tBranchOffice = branchOfficeService.selectById(objectId);
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(tDriver.getPhone(), tBranchOffice.getEnterCode());
Long empId = null;
Integer empnew = null;
if(null == userInfoByPhone || userInfoByPhone.size() == 0){
SaveStaffNodeRequest request = new SaveStaffNodeRequest();
request.setMobile(user2.getPhone());
- request.setEntercode(tCompany.getEnterCode());
+ request.setEntercode(tBranchOffice.getEnterCode());
request.setEmpName(tDriver.getName());
request.setEmpNickname(tDriver.getName());
request.setLoginNo(tDriver.getPhone());
@@ -698,10 +696,10 @@
empnew = 0;
}
- TCompany tCompany1 = companyService.selectById(tDriver.getBranchOfficeId());
+ TBranchOffice tBranchOffice1 = branchOfficeService.selectById(tDriver.getBranchOfficeId());
tDriver.setEmpId(empId);
- tDriver.setEntercode(tCompany1.getEnterCode());
- tDriver.setEnterId(Long.valueOf(tCompany1.getEnterCode()));
+ tDriver.setEntercode(tBranchOffice1.getEnterCode());
+ tDriver.setEnterId(Long.valueOf(tBranchOffice1.getEnterCode()));
tDriver.setEmpnew(empnew);
}
@@ -719,15 +717,15 @@
TDriver driver = tDriverService.selectById(tDriverId);
ShiroUser user = shiroExtUtil.getUser();
- TCompany tCompany = companyService.selectById(user.getObjectId());
+ TBranchOffice tBranchOffice = branchOfficeService.selectById(user.getObjectId());
if (null != driver.getEmpId() && 1 == driver.getEmpnew()) {
//中台先删除司机
- List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tCompany.getEnterCode());
+ List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(driver.getPhone(), tBranchOffice.getEnterCode());
if (null != userInfoByPhone && 0 < userInfoByPhone.size() && 1 == driver.getEmpnew()) {
DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
deleteStafNodeRequest.setEmpId(driver.getEmpId());
- deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
- deleteStafNodeRequest.setMobile(tCompany.getPrincipalPhone());
+ deleteStafNodeRequest.setEntercode(tBranchOffice.getEnterCode());
+ deleteStafNodeRequest.setMobile(tBranchOffice.getPrincipalPhone());
ResultUtil resultUtil = EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
if(200 != resultUtil.getStatus()){
return new ErrorTip(resultUtil.getStatus(), resultUtil.getMsg());
@@ -784,10 +782,10 @@
// 添加充值记录
TRechargeRecord tRechargeRecord = new TRechargeRecord();
- Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if(roleType == 2){
tRechargeRecord.setType(UserTypeEnum.BRANCH_OFFICE.getCode());
- Integer id1 = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ Integer id1 = Objects.requireNonNull(shiroExtUtil.getUser()).getObjectId();
tRechargeRecord.setBranchOfficeId(id1);
}
if(roleType == 3){
--
Gitblit v1.7.1