From 94b5684557d4987add639a94d1ad41c32b5d00c0 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 10:32:29 +0800
Subject: [PATCH] 审批人修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index a354dbd..76a9f8b 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -64,9 +64,11 @@
if (bo.getCheckStatus()== -1){
company.setCheckStatus(-1);
companyBo.setCompanyStatus(1);
+ smsService.sendCompanyCheckMsg(company.getCompanyPhone(), -1);
} else {
company.setCheckStatus(2);
companyBo.setCompanyStatus(0);
+ smsService.sendCompanyCheckMsg(company.getCompanyPhone(), 2);
}
addCheckLog(company, bo);
company.setCheckReason(bo.getCheckReason());
@@ -96,7 +98,6 @@
int checkLevel = Integer.parseInt(phones.get(0));
order.setCheckLevel(checkLevel);
phones.remove(0);
- phones.remove(0);
order.setCheckStatus(1);
//缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇�
smsService.sendApplyMsg(phones, order.getApplyUser());
@@ -110,7 +111,17 @@
order.setOrderStatus(2);
//瀹℃壒閫氳繃锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇�
smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus());
- if (order.getIsNoticeCompany()==1){
+
+ if (StringUtils.isEmpty(order.getCompanyCode())){
+ order.setOrderStatus(3);
+ order.setInTime(DateUtils.getNowDate());
+ order.setExecuteDeptId(order.getApplyDeptId());
+ order.setExecuteDeptName(order.getApplyDeptName());
+ order.setExecuteUser(order.getApplyUser());
+ order.setExecutePhone(order.getApplyPhone());
+ order.setExecuteId(order.getApplyId());
+ }
+ if (order.getIsNoticeCompany()==1 && StringUtils.isNotEmpty(order.getCompanyPhone())){
smsService.sendCompanyMsg(order.getCompanyPhone(), order.getApplyDeptName(), order.getPlanTime());
}
@@ -139,7 +150,7 @@
checkLog.setCheckType(bo.getCheckType());
SysUser loginUser = userService.selectUserById(SecurityUtils.getUserId());
checkLog.setCheckId(loginUser.getUserId());
- checkLog.setCheckUser(loginUser.getUserName());
+ checkLog.setCheckUser(loginUser.getNickName());
checkLog.setCheckPhone(loginUser.getPhonenumber());
checkLog.setCheckStatus(bo.getCheckStatus()>0?1:-1);
checkLog.setCheckTime(DateUtils.getNowDate());
--
Gitblit v1.9.1