From 59e1a8ff7dfd9af5244ae5448d8af745a9720d13 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 Nov 2023 18:04:34 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 78abd3c..ba1e0fa 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
@@ -16,21 +16,24 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
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;
-import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
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;
/**
* 报事报修任务表 服务实现类
@@ -44,6 +47,9 @@
@Autowired
private ITaskService taskService;
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义分页
*
@@ -53,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));
}
/**
@@ -75,14 +88,18 @@
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){
taskReportForRepairs.setTaskId(taskEntity.getId());
+ taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
}
return flag;
@@ -127,4 +144,9 @@
// 返回
return flag;
}
+
+ @Override
+ public Integer getStatistics(Long userId) {
+ return baseMapper.getStatistics(userId);
+ }
}
--
Gitblit v1.9.3