From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 242b12a..7d33205 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
@@ -30,6 +30,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 取保候审任务 服务实现类
@@ -49,12 +50,12 @@
 
 
 	@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;
 	}
@@ -64,6 +65,8 @@
 		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) {
+			taskBailReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+			taskBailReportingEvent.setConfirmTime(new Date());
 			return baseMapper.updateById(taskBailReportingEvent) > 0 ? true : false;
 		}
 		return false;

--
Gitblit v1.9.3