From d13296506f0924eda2eb58e7f2711f3ab6169a9f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 02 Feb 2024 20:35:49 +0800
Subject: [PATCH] 任务状态设置
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 4 +++-
src/main/java/org/springblade/modules/task/service/ITaskService.java | 2 +-
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java | 2 +-
7 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 345191f..3f13af6 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -99,7 +99,7 @@
// 保存任务表
ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
- "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT);
+ "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT,4);
if (aLong > 0) {
// 保存任务详情表
ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
@@ -107,6 +107,7 @@
copy.setTaskId(aLong);
copy.setPlaceCheckId(placeCheck.getId());
copy.setId(null);
+ copy.setStatus(4);
bean1.save(copy);
}
}
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskService.java b/src/main/java/org/springblade/modules/task/service/ITaskService.java
index d3e1ca4..f5482f4 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -49,7 +49,7 @@
* @param createUser
* @return
*/
- Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode,Integer reportType);
+ Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,String houseCode,Integer reportType,Integer status);
/**
* @param type
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 d057131..3fde6c2 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
@@ -57,7 +57,7 @@
1, bailReporting.getApplyName(),
AuthUtil.getUserId(),
bailReporting.getHouseCode(),
- bailReporting.getReportType());
+ bailReporting.getReportType(),0);
if (aLong > 0) {
bailReporting.setTaskId(aLong);
bailReporting.setCheckUserId(AuthUtil.getUserId());
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
index bb79c73..c62937e 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -66,7 +66,8 @@
*/
@Override
public Boolean saveCampusReporting(TaskCampusReportingEventDTO reporting) {
- Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "", AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType());
+ Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "",
+ AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType(),0);
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
index 4099189..92feea7 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -68,7 +68,8 @@
taskHotelReporting.setReportType(7);
name = DictConstant.FIRE_CHECK;
}
- Long aLong = taskService.saveTask(2, name, 1, "", AuthUtil.getUserId(), taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType());
+ Long aLong = taskService.saveTask(2, name, 1, "", AuthUtil.getUserId(),
+ taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType(),0);
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
index 6afc2aa..ffa0a05 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -75,7 +75,8 @@
default:
name = "";
}
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType());
+ Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),
+ taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType(),0);
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 3cab74b..7c891aa 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -145,7 +145,8 @@
* @return
*/
@Override
- public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser, String houseCode, Integer reportType) {
+ public Long saveTask(Integer type, String name, Integer frequency, String remark, Long createUser,
+ String houseCode, Integer reportType,Integer status) {
TaskEntity taskEntity = new TaskEntity();
taskEntity.setType(type);
taskEntity.setName(name);
@@ -155,6 +156,7 @@
taskEntity.setCreateUser(createUser);
taskEntity.setHouseCode(houseCode);
taskEntity.setReportType(reportType);
+ taskEntity.setStatus(status);
return baseMapper.insert(taskEntity) > 0 ? taskEntity.getId() : 0;
}
--
Gitblit v1.9.3