From 9e754d4c91e41b02a1e39d7ca709ec9491558da2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 21:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 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 c21ab97..78abd3c 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,13 +16,21 @@
  */
 package org.springblade.modules.task.service.impl;
 
+import org.springblade.core.secure.utils.AuthUtil;
+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.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.Date;
 
 /**
  * 报事报修任务表 服务实现类
@@ -33,10 +41,90 @@
 @Service
 public class TaskReportForRepairsServiceImpl extends BaseServiceImpl<TaskReportForRepairsMapper, TaskReportForRepairsEntity> implements ITaskReportForRepairsService {
 
+	@Autowired
+	private ITaskService taskService;
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param taskReportForRepairs
+	 * @return
+	 */
 	@Override
 	public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
 		return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
 	}
 
+	/**
+	 * 查询报事报修统计
+	 * @return
+	 */
+	@Override
+	public TaskReportStatistics getStatisticsCount() {
+		return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+	}
 
+	/**
+	 * 报事报修任务表 新增
+	 * @param taskReportForRepairs
+	 * @return
+	 */
+	@Override
+	public boolean saveTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+		boolean flag = false;
+		// 任务新增
+		TaskEntity taskEntity = new TaskEntity();
+		taskEntity.setName("报事报修"+ System.currentTimeMillis());
+		taskEntity.setStatus(1);
+		taskEntity.setType(1);
+		taskEntity.setFrequency(3);
+		// 新增
+		boolean save = taskService.save(taskEntity);
+		if (save){
+			taskReportForRepairs.setTaskId(taskEntity.getId());
+			flag = save(taskReportForRepairs);
+		}
+		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