Merge remote-tracking branch 'origin/master'

This commit is contained in:
haozq 2025-02-24 14:42:46 +08:00
commit ba2a8c025b
1 changed files with 179 additions and 177 deletions

View File

@ -51,8 +51,11 @@ public class BusinessServiceImpl implements BusinessService {
@Override
public AjaxResult submitApproval(AuditTask auditTask) {
String taskId = null;
if (StringUtils.isBlank(auditTask.getTaskId())) {
//任务id
String taskId = auditTask.getTaskId();
taskId = auditTask.getTaskId();
}
//任务类型
String taskType = auditTask.getTaskType();
if (StringUtils.isEmpty(taskType)) {
@ -915,6 +918,7 @@ public class BusinessServiceImpl implements BusinessService {
/**
* 根据当前日期整改时间和延期时间计算检查状态
*
* @param date 当前日期
* @param correctionTime 整改时间
* @param delayTime 延期时间
@ -1212,7 +1216,6 @@ public class BusinessServiceImpl implements BusinessService {
}
public void sedPhoneMsg(MsgBean bean) {
try {
remoteUserService.setPhoneMsg(bean);
@ -1223,5 +1226,4 @@ public class BusinessServiceImpl implements BusinessService {
}
}