From 193c22bae0b78d331a13d57aa046ebe44ee0c832 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 25 六月 2024 13:51:31 +0800
Subject: [PATCH] 评价校验,企业执法单记录修改

---
 project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 317241c..69e37b3 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,7 +43,7 @@
     @Transactional
     public Boolean checkOrder(CheckBo bo)
     {
-        if (StringUtils.isNotEmpty(bo.getIds())){
+        if (StringUtils.isEmpty(bo.getIds())){
             throw new BaseException("璇烽�夋嫨瑕佸鎵圭殑鍗曟嵁锛�");
         }
         switch (bo.getCheckType())
@@ -56,6 +56,9 @@
                     }
                     SysCompanyBo companyBo = new SysCompanyBo();
                     companyBo.setCompanyId(company.getCompanyId());
+                    if (company.getCheckStatus()!=0){
+                        throw new BaseException("璇ヤ紒涓氬凡瀹℃壒锛�");
+                    }
                     if (bo.getCheckStatus()== -1){
                         company.setCheckStatus(-1);
                         companyBo.setCompanyStatus(1);
@@ -75,14 +78,20 @@
                     if (order==null) {
                         throw new BaseException("娌℃湁鎵惧埌瀵瑰簲鏁版嵁锛岃妫�鏌ュ鏍哥被鍨嬶紒");
                     }
+                    if (order.getOrderStatus()!=1){
+                        throw new BaseException("璇ユ墽娉曞崟宸插鎵�");
+                    }
                     addCheckLog(order, bo);
                     if (bo.getCheckStatus()==-1){
+                        order.setOrderStatus(-1);
                         order.setCheckStatus(-1);
                         //瀹℃壒鎷掔粷锛岀粰鐢宠浜哄彂閫佺煭淇★紝濡傛灉閫氱煡浼佷笟涔熺粰浼佷笟鍙戦�佺煭淇�
                         smsService.sendCheckMsg(order.getApplyPhone(), order.getCheckStatus());
+                        orderService.updateById(order);
                     } else {
                         List<String> phones = orderService.getCheckPhones(order.getCheckLevel()+1, order.getApplyDeptId());
                         if (StringUtils.isNotEmpty(phones)){
+                            phones.remove(0);
                             order.setCheckStatus(1);
                             //缁欎笅涓�绾у鎵逛汉鍙戦�佺煭淇�
                             smsService.sendApplyMsg(phones, order.getApplyUser());

--
Gitblit v1.9.1