orderList

Fancy

2025-01-14 ce988f65d5b0c74ad5c104d05f1155ed05b1db72

 pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportSv.java

@@ -2,9 +2,7 @@

import com.alibaba.excel.util.StringUtils;
import com.dy.pmsGlobal.daoSta.*;
import com.dy.pmsGlobal.pojoSta.StaDeviceLast;
import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
import com.dy.pmsGlobal.pojoSta.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -58,22 +56,17 @@
        Map<String, Object> deviceInfo =new HashMap<>();
        deviceInfo.put("deviceInfo", deviceLast);
        //查询设备日志
        List<StaDeviceProductionLog> log = deviceProductionLogDao.selectByEquipNo(deviceNo);
        List<StaDeviceProductionLog> log = deviceProductionLogDao.selectByDeviceNo(deviceNo);
        deviceInfo.put("deviceLog", log);
        // 查询设备生命周期
        List<StaDeviceLife> deviceLife = deviceLifeDao.selectByEquipNo(deviceNo);
        deviceInfo.put("deviceLife", log);
        List<StaDeviceLife> deviceLife = deviceLifeDao.selectByDeviceNo(deviceNo);
        deviceInfo.put("deviceLife", deviceLife);
        // 查询设备维修信息
        /*StaRepairInfo repairInfo = repairInfoDao.selectByDeviceNo(deviceNo);

        if (preRecord.getStatus() == 1) {
            if (repairInfo == null) {
                return null;
            }
            // 查询设备维修信息
            StaWipSnEx wipSnEx = wipSnExDao.selectByDeviceNo();
        }
        return DeviceReportDao.getDeviceInfo(deviceNo);*/
        List<StaRepairInfo> repairInfo = repairInfoDao.selectByDeviceNo(deviceNo);
        deviceInfo.put("deviceRepair", repairInfo);
        // 查询设备附件信息
        List<StaWipSnEx> wipSnEx = wipSnExDao.selectByDeviceNo(deviceNo);
        deviceInfo.put("deviceAttach", wipSnEx);
        return deviceInfo;
    }
}