住户删除修改，二手交易删除修改

zhongrj

2024-03-20 4759cadeca91e4ddcf374fb29fc9f8b91bedec11

住户删除修改，二手交易删除修改

 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());
                // 判断是否还绑定其他的房屋，如果有，则不操作用户

 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)));
    }

    /**

 src/main/java/org/springblade/modules/task/entity/TaskEntity.java

@@ -132,6 +132,7 @@
     * 是否已删除 0:否  1：是
     */
    @ApiModelProperty("是否已删除")
    @TableLogic
    private Integer isDeleted;



 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;

    /** 身份证号 */

 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);
}

 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;
    }
}