From 3467fa64f4be6efc9b742913419e7c3a501c541b Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期四, 20 六月 2024 16:52:21 +0800 Subject: [PATCH] 云片短信对接,审批流程优化 --- project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 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 29fa7fe..c6b20d5 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 @@ -14,7 +14,6 @@ import com.project.system.domain.bo.editBo.CheckBo; import com.project.system.domain.bo.editBo.SysCompanyBo; import com.project.system.service.ISysCompanyService; -import com.project.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +36,7 @@ private final ISysCompanyService companyService; private final IEnforceOrderService orderService; private final IEnforceCheckLogService checkLogService; - private final ISysUserService userService; + private final YPSmsService smsService; @Override @Transactional @@ -71,16 +70,24 @@ addCheckLog(order, bo); if (bo.getCheckStatus()==-1){ order.setCheckStatus(-1); + //瀹℃壒鎷掔粷锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇� + smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus()); } else { - String roleKey = "check_enforce_" + (order.getCheckLevel() + 1); - List<Long> ids = userService.getNumByRoleKey(roleKey, order.getCheckDeptId()); - if (StringUtils.isNotEmpty(ids)){ + List<String> phones = orderService.getCheckPhones(order.getCheckLevel(), order.getApplyDeptId()); + if (StringUtils.isNotEmpty(phones)){ order.setCheckStatus(1); + //缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇� + smsService.sendApplyMsg(phones, order.getApplyUser()); } else { order.setCheckStatus(2); order.setOrderStatus(2); + //瀹℃壒閫氳繃锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇� + smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus()); + if (order.getIsNoticeCompany()==1){ + smsService.sendCompanyMsg(order.getCompanyPhone(), order.getApplyDeptName(), order.getPlanTime()); + } } - //瀹℃壒鐧昏鍔�1 + //瀹℃壒绛夌骇鍔�1 order.setCheckLevel(order.getCheckLevel()+1); } order.setCheckReason(bo.getCheckReason()); -- Gitblit v1.9.1