From 4759cadeca91e4ddcf374fb29fc9f8b91bedec11 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Mar 2024 16:14:52 +0800
Subject: [PATCH] 住户删除修改，二手交易删除修改
---
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 22 ++++++++++++++++++++++
src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java | 1 +
src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java | 2 +-
src/main/java/org/springblade/modules/task/entity/TaskEntity.java | 1 +
src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java | 7 +++++++
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 2 +-
6 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 2385ceb..d73bf0d 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -454,7 +454,7 @@
for (Long id : idList) {
HouseholdEntity householdEntity = getById(id);
// 如果是业主
- if (householdEntity.getRelationship() == 1) {
+ if (null!= householdEntity.getRelationship() && householdEntity.getRelationship() == 1) {
// 查询对应的用户
User user = userService.getById(householdEntity.getAssociatedUserId());
// 判断是否还绑定其他的房屋，如果有，则不操作用户
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
index 2ee2f57..e75b3bd 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
@@ -126,7 +126,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(taskLabelReportingEventService.removeByIds(Func.toLongList(ids)));
+ return R.status(taskLabelReportingEventService.removeTaskByIds(Func.toLongList(ids)));
}
/**
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
index 95ab5f0..946fa8c 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
@@ -132,6 +132,7 @@
* 是否已删除 0:否 1：是
*/
@ApiModelProperty("是否已删除")
+ @TableLogic
private Integer isDeleted;
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
index 20358b3..d2c5385 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskLabelReportingEventEntity.java
@@ -186,6 +186,7 @@
/** 0否 1是 */
@ApiModelProperty(value = "0否 1是", example = "")
@TableField("is_deleted")
+ @TableLogic
private Integer isDeleted;
/** 身份证号 */
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java b/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
index 382a6ec..f8dd112 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskLabelReportingEventService.java
@@ -69,4 +69,11 @@
* @param taskLabelReportingEvent
*/
List<TaskLabelReportingEventExcel> exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent);
+
+ /**
+ * 二手交易 删除
+ * @param toLongList
+ * @return
+ */
+ boolean removeTaskByIds(List<Long> toLongList);
}
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 31156ba..7c76119 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
@@ -32,6 +32,7 @@
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
+import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.excel.TaskLabelReportingEventExcel;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
@@ -150,4 +151,25 @@
commonParamSet.getGridCodeList());
}
+ /**
+ * 二手交易 删除
+ * @param toLongList
+ * @return
+ */
+ @Override
+ public boolean removeTaskByIds(List<Long> toLongList) {
+ boolean flag = false;
+ for (Long id : toLongList) {
+ // 先查询对应的任务id
+ TaskLabelReportingEventEntity labelReportingEventEntity = getById(id);
+ // 删除二手交易
+ flag = removeById(id);
+ if (flag){
+ // 删除对应的任务
+ flag = taskService.removeById(labelReportingEventEntity.getTaskId());
+ }
+ }
+ // 返回
+ return flag;
+ }
}
--
Gitblit v1.9.3