bug 修复

zhongrj

2023-12-28 daef9edffb73d542ff1eba4beb215ffc7b306254

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

@@ -16,15 +16,20 @@
 */
package org.springblade.modules.task.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskRepairStepDTO;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.mapper.TaskRepairStepMapper;
import org.springblade.modules.task.service.ITaskRepairStepService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

@@ -61,8 +66,21 @@
    * @return 报事报修事件步骤表集合
    */
   @Override
   public List<TaskRepairStepDTO> selectTaskRepairStepList(TaskRepairStepDTO taskRepairStepDTO)
   {
   public List<TaskRepairStepDTO> selectTaskRepairStepList(TaskRepairStepDTO taskRepairStepDTO) {
      return this.baseMapper.selectTaskRepairStepList(taskRepairStepDTO);
   }

   @Override
   public Boolean saveTaskRepairStep(TaskRepairStepVO task) {
      task.setUserId(AuthUtil.getUserId());
      TaskReportForRepairsEntity taskReportForRepairsEntity = new TaskReportForRepairsEntity();
      taskReportForRepairsEntity.setId(task.getRepairId());
      taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
      taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
      if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag())|| CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
         task.setName(AuthUtil.getNickName());
      }
      SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
      return save(task);
   }
}