Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

10 天以前 a7dd93b840bdce4bd0011bc948157f440514a207

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java

@@ -11,8 +11,8 @@
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
@@ -24,19 +24,13 @@
 */
@Service
@Slf4j
@RequiredArgsConstructor
public class MaintenanceTaskServiceImpl extends ServiceImpl<MaintenanceTaskMapper, MaintenanceTask> implements MaintenanceTaskService {

    @Autowired
    private MaintenanceTaskMapper maintenanceTaskMapper;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private TimingTaskServiceImpl timingTaskService;

    @Autowired
    private MaintenanceTaskScheduler maintenanceTaskScheduler;
    private final MaintenanceTaskMapper maintenanceTaskMapper;
    private final SysUserMapper sysUserMapper;
    private final TimingTaskServiceImpl timingTaskService;
    private final MaintenanceTaskScheduler maintenanceTaskScheduler;

    @Override
    public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {