From b48de0e35c54bd4715f8de2b86bac5a539c27275 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 16:23:44 +0800
Subject: [PATCH] 更换手机，发送短信放开
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 104 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 47 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 c16ded5..317241c 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
@@ -43,58 +43,68 @@
@Transactional
public Boolean checkOrder(CheckBo bo)
{
+ if (StringUtils.isNotEmpty(bo.getIds())){
+ throw new BaseException("璇烽�夋嫨瑕佸鎵圭殑鍗曟嵁锛�");
+ }
switch (bo.getCheckType())
{
case 1:
- SysCompany company = companyService.getById(bo.getId());
- if (company==null) {
- throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
- }
- SysCompanyBo companyBo = new SysCompanyBo();
- companyBo.setCompanyId(company.getCompanyId());
- if (bo.getCheckStatus()== -1){
- company.setCheckStatus(-1);
- companyBo.setCompanyStatus(1);
- } else {
- company.setCheckStatus(2);
- companyBo.setCompanyStatus(0);
- }
- addCheckLog(company, bo);
- company.setCheckReason(bo.getCheckReason());
- companyService.updStatus(companyBo);
- return companyService.updateById(company);
- case 2:
- EnforceOrder order = orderService.getById(bo.getId());
- if (order==null) {
- throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
- }
- addCheckLog(order, bo);
- if (bo.getCheckStatus()==-1){
- order.setCheckStatus(-1);
- //瀹℃壒鎷掔粷锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇�
- smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus());
- } else {
- List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId());
- if (StringUtils.isNotEmpty(phones)){
- order.setCheckStatus(1);
- //缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇�
- smsService.sendApplyMsg(phones, order.getApplyUser());
- String checkPhones = StringUtils.join(phones, ",");
- orderService.update(orderService.lu().set(EnforceOrder::getCheckIds, checkPhones).eq(EnforceOrder::getOrderId, order.getOrderId()));
- } 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());
- }
+ for (Long id : bo.getIds()) {
+ SysCompany company = companyService.getById(id);
+ if (company==null) {
+ throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
}
- //瀹℃壒绛夌骇鍔�1
- order.setCheckLevel(order.getCheckLevel()+1);
+ SysCompanyBo companyBo = new SysCompanyBo();
+ companyBo.setCompanyId(company.getCompanyId());
+ if (bo.getCheckStatus()== -1){
+ company.setCheckStatus(-1);
+ companyBo.setCompanyStatus(1);
+ } else {
+ company.setCheckStatus(2);
+ companyBo.setCompanyStatus(0);
+ }
+ addCheckLog(company, bo);
+ company.setCheckReason(bo.getCheckReason());
+ companyService.updStatus(companyBo);
+ companyService.updateById(company);
}
- order.setCheckReason(bo.getCheckReason());
- return orderService.updateById(order);
+ return true;
+ case 2:
+ for (Long id : bo.getIds()) {
+ EnforceOrder order = orderService.getById(id);
+ if (order==null) {
+ throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
+ }
+ addCheckLog(order, bo);
+ if (bo.getCheckStatus()==-1){
+ order.setCheckStatus(-1);
+ //瀹℃壒鎷掔粷锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇�
+ smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus());
+ } else {
+ List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId());
+ if (StringUtils.isNotEmpty(phones)){
+ order.setCheckStatus(1);
+ //缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇�
+ smsService.sendApplyMsg(phones, order.getApplyUser());
+ String checkPhones = StringUtils.join(phones, ",");
+ orderService.update(orderService.lu().set(EnforceOrder::getCheckIds, checkPhones).eq(EnforceOrder::getOrderId, order.getOrderId()));
+ } 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
+ order.setCheckLevel(order.getCheckLevel()+1);
+ order.setCheckReason(bo.getCheckReason());
+ orderService.updateById(order);
+ }
+
+ }
+ return true;
}
return false;
}
--
Gitblit v1.9.1