Merge remote-tracking branch 'origin/master'

linwe

2023-11-09 f9a3f18dc49f4d1317b8cb4f04d53d268bd90bbf

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -16,14 +16,20 @@
 */
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 java.util.Date;

/**
 * 报事报修任务表 服务实现类
@@ -34,15 +40,87 @@
@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();
      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
   public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
      boolean flag = false;
      // 设置更新时间
      taskReportForRepairs.setConfirmTime(new Date());
      // 更新数据
      boolean b = updateById(taskReportForRepairs);
      if (b) {
         // 更新任务表状态
         TaskEntity taskEntity = new TaskEntity();
         taskEntity.setId(taskReportForRepairs.getTaskId());
         taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
         flag = taskService.updateById(taskEntity);
      }
      // 返回
      return flag;
   }
}