From 8ff8b4652c49fafbc31025cfe16e3c81bab37f9d Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 23:24:54 +0800
Subject: [PATCH] 计划执法时间添加
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 15 +++++++++------
1 files changed, 9 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 f5cf852..29fa7fe 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
@@ -1,7 +1,6 @@
package com.project.enforce.service.impl;
import cn.hutool.core.convert.Convert;
-import com.project.common.core.domain.entity.SysRole;
import com.project.common.core.domain.entity.SysUser;
import com.project.common.exception.base.BaseException;
import com.project.common.utils.SecurityUtils;
@@ -13,6 +12,7 @@
import com.project.enforce.service.IEnforceOrderService;
import com.project.system.domain.SysCompany;
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;
@@ -20,7 +20,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 鍔熻兘鎻忚堪锛�
@@ -51,15 +50,19 @@
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.updateById(company);
- break;
+ companyService.updStatus(companyBo);
+ return companyService.updateById(company);
case 2:
EnforceOrder order = orderService.getById(bo.getId());
if (order==null) {
@@ -75,13 +78,13 @@
order.setCheckStatus(1);
} else {
order.setCheckStatus(2);
+ order.setOrderStatus(2);
}
//瀹℃壒鐧昏鍔�1
order.setCheckLevel(order.getCheckLevel()+1);
}
order.setCheckReason(bo.getCheckReason());
- orderService.updateById(order);
- break;
+ return orderService.updateById(order);
}
return false;
}
--
Gitblit v1.9.1