From b2e1bfd923974c64516f1b0ef46c4a2070a817bf Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 18:03:59 +0800
Subject: [PATCH] 修改企业手机
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 76e9893..8fb7825 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -82,7 +82,7 @@
public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.ge("order_status",4);
+ qw.ge("order_status",2);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -124,7 +124,7 @@
@Override
public List<EnforceOrderVo> queryCheckList(EnforceOrderQueryBo bo)
{
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
bo.setCheckIds(loginUser.getPhonenumber());
// List<Long> deptIds = deptService.getApplyDeptIdsByLoginUserId(loginUser.getUserId());
// if (StringUtils.isNotEmpty(deptIds)){
@@ -204,6 +204,9 @@
validEntityBeforeSave(add);
List<String> phones = getCheckPhones(add.getCheckLevel(), add.getApplyDeptId());
if (StringUtils.isNotEmpty(phones)){
+ int checkLevel = Integer.parseInt(phones.get(0));
+ add.setCheckLevel(checkLevel);
+ phones.remove(0);
String checkPhones = StringUtils.join(phones, ",");
add.setCheckIds(checkPhones);
}
@@ -260,7 +263,7 @@
@Override
public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
{
- return getCheckPhones(checkLevel, applyDeptId, 0);
+ return getCheckPhonesSimple(checkLevel, applyDeptId);
}
@Override
@@ -272,22 +275,23 @@
.eq(EnforceCheckLog::getOrderId, orderId).orderByAsc(EnforceCheckLog::getCheckTime)
);
if (order.getApplyTime()!=null){
- vos.add(new OrderNodeVo("鎻愪氦鐢宠",order.getApplyUser(),order.getApplyTime(), null));
+ vos.add(new OrderNodeVo("鎻愪氦鐢宠",order.getApplyUser(),order.getApplyDeptName(),order.getApplyTime(), null));
}
if (StringUtils.isNotEmpty(checkLogs)){
for (EnforceCheckLog checkLog : checkLogs) {
+
if (checkLog.getCheckStatus()>0){
- vos.add(new OrderNodeVo("瀹℃壒閫氳繃",checkLog.getCheckUser(),checkLog.getCheckTime(), null));
+ vos.add(new OrderNodeVo("瀹℃壒閫氳繃",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), null));
} else {
- vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),checkLog.getCheckTime(), checkLog.getCheckReason()));
+ vos.add(new OrderNodeVo("瀹℃壒鎷掔粷",checkLog.getCheckUser(),userService.getDeptNameByUserId(checkLog.getCheckId()),checkLog.getCheckTime(), checkLog.getCheckReason()));
}
}
}
if (order.getInTime()!=null){
- vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getInTime(), null));
+ vos.add(new OrderNodeVo("鎵爜鍏ヤ紒",order.getExecuteUser(),order.getExecuteDeptName(),order.getInTime(), null));
}
if (order.getExecuteTime()!=null){
- vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteTime(), null));
+ vos.add(new OrderNodeVo("缁撴灉涓婃姤",order.getExecuteUser(),order.getExecuteDeptName(),order.getExecuteTime(), null));
}
return vos;
@@ -312,7 +316,7 @@
throw new BaseException("鎵ф硶鍗曞凡纭鎵ф硶锛�");
}
order.setOrderStatus(3);
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ SysUser user = userService.selectUserById(SecurityUtils.getUserId());
order.setExecuteId(user.getUserId());
order.setExecuteUser(user.getNickName());
order.setExecutePhone(user.getPhonenumber());
@@ -479,24 +483,19 @@
* @param checkLevel 瀹℃壒绾у埆锛氶粯璁�0
* @param deptId 鐢宠閮ㄩ棬id
*/
- private List<String> getCheckPhones(Integer checkLevel, Long deptId, int current)
+ private List<String> getCheckPhonesSimple(Integer checkLevel, Long deptId)
{
if (checkLevel==3){
- if (current==1){
- return null;
- }
- checkLevel = 0;
- deptId = deptService.selectDeptById(deptId).getParentId();
- current++;
- getCheckPhones(checkLevel, deptId, current);
+ return null;
}
- checkLevel++;
String checkKey = "check_enforce_";
List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId);
if (StringUtils.isNotEmpty(phones)){
+ phones.add(0,checkLevel.toString());
return phones;
}
- return getCheckPhones(checkLevel, deptId, current);
+ checkLevel ++;
+ return getCheckPhonesSimple(checkLevel, deptId);
}
--
Gitblit v1.9.1