From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 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 667d6fb..f2282e4 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,6 +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;
/**
* 报事报修任务表 服务实现类
@@ -41,6 +47,9 @@
@Autowired
private ITaskService taskService;
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义分页
*
@@ -50,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));
}
/**
@@ -72,10 +88,13 @@
boolean flag = false;
// 任务新增
TaskEntity taskEntity = new TaskEntity();
- taskEntity.setName("报事报修"+ System.currentTimeMillis());
+ taskEntity.setName(taskReportForRepairs.getRealName() + "报修");
taskEntity.setStatus(1);
taskEntity.setType(1);
taskEntity.setFrequency(3);
+ if (null!=taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")){
+ taskEntity.setHouseCode(taskReportForRepairs.getAddressCode());
+ }
// 新增
boolean save = taskService.save(taskEntity);
if (save){
@@ -84,4 +103,44 @@
}
return flag;
}
+
+ /**
+ * 报事报修任务表 自定义修改
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ public boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ // 设置参数
+ taskReportForRepairs.setUpdateTime(new Date());
+ taskReportForRepairs.setUpdateUser(AuthUtil.getUserId());
+ // 更新
+ return updateById(taskReportForRepairs);
+ }
+
+ /**
+ * 报事报修任务表 审核
+ * @param taskReportForRepairs
+ * @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(entity.getTaskId());
+ taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
+ flag = taskService.updateById(taskEntity);
+ }
+ // 返回
+ return flag;
+ }
}
--
Gitblit v1.9.3