From a3698ecb84be4192754d7b2092491e727dbccec7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 六月 2025 16:51:02 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index f1d80eb..a29282d 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -22,8 +22,7 @@
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNode;
-import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNodeRequest;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -79,8 +78,8 @@
@Resource
private DriverPunishMapper driverPunishMapper;
- @Autowired
- private RedisTemplate redisTemplate;
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
@@ -681,7 +680,7 @@
request.setLoginNo(tDriver.getPhone());
request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
request.setMphone(tDriver.getPhone());
- request.setEmail("qyt@qyt.com");
+ request.setEmail(tDriver.getPhone() + "@qyt.com");
request.setDeptId(0);
request.setPositionId(1);
request.setSuperLevel(0);
@@ -781,7 +780,7 @@
request.setLoginNo(tDriver.getPhone());
request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
request.setMphone(tDriver.getPhone());
- request.setEmail("qyt@qyt.com");
+ request.setEmail(tDriver.getPhone() + "@qyt.com");
request.setDeptId(0);
request.setPositionId(1);
request.setSuperLevel(0);
@@ -841,6 +840,22 @@
public Object delete(@RequestParam Integer tDriverId) {
TDriver driver = tDriverService.selectById(tDriverId);
driver.setFlag("3");
+ ShiroUser user = ShiroExtUtil.getUser();
+ User user1 = userService.selectById(user.getId());
+ TCompany tCompany = itCompanyService.selectById(user.getObjectId());
+ //中台先删除司机
+ GetStaffNodeRequest request = new GetStaffNodeRequest();
+ request.setEmpId(driver.getEmpId());
+ request.setMobile(user1.getPhone());
+ request.setEntercode(tCompany.getEnterCode());
+ StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
+ if (null != staffNode && "1".equals(staffNode.getIsValid())) {
+ DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
+ deleteStafNodeRequest.setEmpId(driver.getEmpId());
+ deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
+ deleteStafNodeRequest.setMobile(user1.getPhone());
+ EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
+ }
tDriverService.updateById(driver);
String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
redisTemplate.delete(value);
@@ -899,7 +914,7 @@
request.setLoginNo(tDriver.getPhone());
request.setEmpSex(tDriver.getSex() == 1 ? "男" : "女");
request.setMphone(tDriver.getPhone());
- request.setEmail("qyt@qyt.com");
+ request.setEmail(tDriver.getPhone() + "@qyt.com");
request.setDeptId(0);
request.setPositionId(1);
request.setSuperLevel(0);
@@ -1391,7 +1406,7 @@
saveStaffNodeRequest.setLoginNo(driver.getPhone());
saveStaffNodeRequest.setEmpSex(driver.getSex() == 1 ? "男" : "女");
saveStaffNodeRequest.setMphone(driver.getPhone());
- saveStaffNodeRequest.setEmail("qyt@qyt.com");
+ saveStaffNodeRequest.setEmail(driver.getPhone() + "@qyt.com");
saveStaffNodeRequest.setDeptId(0);
saveStaffNodeRequest.setPositionId(1);
saveStaffNodeRequest.setSuperLevel(0);
--
Gitblit v1.7.1