报事调整

linwei

2023-12-29 eabe983216f566e99784d66e3def9a1fcf5061e2

报事调整

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -495,7 +495,7 @@

    @Override
    public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
        if (type.equals("1")) {
        if (type.equals("0")) {
            IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
            return bean.getGridManByCode(houseCode);
        } else {

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

@@ -20,7 +20,6 @@
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;
@@ -31,6 +30,7 @@
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

/**
@@ -77,10 +77,13 @@
        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())) {
        if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag()) || CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
            task.setName(AuthUtil.getUserName());
        }
        SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
        if (CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
            taskReportForRepairsEntity.setConfirmTime(new Date());
        }
        boolean b = SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
        return save(task);
    }
}