From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
index 8fc08e6..b85ce8f 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -16,17 +16,18 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springblade.modules.task.mapper.TaskBailReportingEventMapper;
import org.springblade.modules.task.service.ITaskBailReportingEventService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskBailReportingEventVO;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import javax.annotation.Resource;
@@ -48,19 +49,20 @@
@Override
- public Boolean saveBailReporting(TaskBailReportingEventDTO taskBailReportingEvent) {
- Long aLong = taskService.saveTask(1, DictConstant.BAIL_PENDING_TRIAL, 3, "", AuthUtil.getUserId(),taskBailReportingEvent.getHouseCode());
+ public Boolean saveBailReporting(TaskBailReportingEventDTO bailReporting) {
+ Long aLong = taskService.saveTask(3, DictConstant.BAIL_PENDING_TRIAL, 1, "", AuthUtil.getUserId(),bailReporting.getHouseCode(),bailReporting.getReportType());
if (aLong > 0) {
- taskBailReportingEvent.setTaskId(aLong);
- taskBailReportingEvent.setCheckUserId(AuthUtil.getUserId());
- return baseMapper.insert(taskBailReportingEvent) > 0 ? true : false;
+ bailReporting.setTaskId(aLong);
+ bailReporting.setCheckUserId(AuthUtil.getUserId());
+ return baseMapper.insert(bailReporting) > 0 ? true : false;
}
return false;
}
@Override
public Boolean updateBailReporting(TaskBailReportingEventEntity taskBailReportingEvent) {
- Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), Integer.valueOf(taskBailReportingEvent.getConfirmFlag()));
+ Integer integer = StringUtils.isBlank(taskBailReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskBailReportingEvent.getConfirmFlag());
+ Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), integer);
if (aLong > 0) {
return baseMapper.updateById(taskBailReportingEvent) > 0 ? true : false;
}
--
Gitblit v1.9.3