From a1d8ea1a72cddf7651742b87f042602ab006c879 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 17:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 0703985..7a6d25c 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.task.service.impl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskService;
@@ -28,8 +29,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* 报事报修任务表 服务实现类
@@ -43,6 +47,9 @@
@Autowired
private ITaskService taskService;
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义分页
*
@@ -52,7 +59,14 @@
*/
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
+ List<String> list = new ArrayList<>();
+ if (null!=taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")){
+ if (taskReportForRepairs.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
}
/**
@@ -107,16 +121,19 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
boolean flag = false;
// 设置更新时间
taskReportForRepairs.setConfirmTime(new Date());
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
// 更新数据
boolean b = updateById(taskReportForRepairs);
if (b) {
+ TaskReportForRepairsEntity entity = getById(taskReportForRepairs.getId());
// 更新任务表状态
TaskEntity taskEntity = new TaskEntity();
- taskEntity.setId(taskReportForRepairs.getTaskId());
+ taskEntity.setId(entity.getTaskId());
taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
flag = taskService.updateById(taskEntity);
}
--
Gitblit v1.9.3