From ad0bc4e763fa988a2ec4dd8dfab7381ea7726021 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 17:46:48 +0800
Subject: [PATCH] 区划树查询修改
---
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 5c39928..ba0ca24 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,19 +16,21 @@
*/
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;
+import java.util.Date;
/**
* 取保候审任务 服务实现类
@@ -41,6 +43,7 @@
@Resource
private ITaskService taskService;
+
@Override
public IPage<TaskBailReportingEventVO> selectTaskBailReportingEventPage(IPage<TaskBailReportingEventVO> page, TaskBailReportingEventVO taskBailReportingEvent) {
return page.setRecords(baseMapper.selectTaskBailReportingEventPage(page, taskBailReportingEvent));
@@ -48,21 +51,28 @@
@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;
}
return false;
}
@Override
- public Boolean updateBailReporting(TaskBailReportingEventEntity taskBailReportingEvent) {
- Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskBailReportingEvent.getTaskId(), taskBailReportingEvent.getStatus());
+ public Boolean updateBailReporting(TaskBailReportingEventEntity taskBailReportingEvent) throws Exception {
+ 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;
+ taskBailReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskBailReportingEvent.setConfirmTime(new Date());
+ Boolean b = baseMapper.updateById(taskBailReportingEvent) > 0;
+ if (b) {
+ return b;
+ }
+ throw new Exception("更新失败！");
}
return false;
}
--
Gitblit v1.9.3