From 5944c9ea054165cc4adfa79254f9b724abc371db Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 13:52:00 +0800
Subject: [PATCH] 执法记录条件

---
 project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 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 cd265fe..1f0fa9c 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
@@ -63,15 +63,19 @@
                     }
                     if (bo.getCheckStatus()== -1){
                         company.setCheckStatus(-1);
+                        company.setCompanyStatus(1);
                         companyBo.setCompanyStatus(1);
+                        smsService.sendCompanyCheckMsg(company.getCompanyPhone(), -1);
                     } else {
                         company.setCheckStatus(2);
+                        company.setCompanyStatus(0);
                         companyBo.setCompanyStatus(0);
+                        smsService.sendCompanyCheckMsg(company.getCompanyPhone(), 2);
                     }
                     addCheckLog(company, bo);
                     company.setCheckReason(bo.getCheckReason());
-                    companyService.updStatus(companyBo);
                     companyService.updateById(company);
+                    companyService.updStatus(companyBo);
                 }
                 return true;
             case 2:
@@ -109,7 +113,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());
                             }
 
@@ -138,7 +152,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