From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 7a6d25c..6c0d3bf 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,19 +16,19 @@
*/
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;
@@ -88,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;
@@ -140,4 +144,9 @@
// 返回
return flag;
}
+
+ @Override
+ public Integer getStatistics(Long userId) {
+ return baseMapper.getStatistics(userId);
+ }
}
--
Gitblit v1.9.3