device report finish

Fancy

2024-07-09 5d813bb3a09810648e607a46d44f350686e3dc28

device report finish

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java

@@ -3,6 +3,8 @@
import com.dy.pmsGlobal.pojoSta.StaRepairInfo;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
* @author User
* @description 针对表【sta_repair_info】的数据库操作Mapper
@@ -24,4 +26,5 @@

    int updateByPrimaryKey(StaRepairInfo record);

    List<StaRepairInfo> selectByEquipNo(String equipNo);
}

 pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml

@@ -26,7 +26,12 @@
        from sta_repair_info
        where  id = #{id,jdbcType=BIGINT} 
    </select>

    <select id="selectByEquipNo" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from sta_repair_info
        where  equip_no = #{equipNo,jdbcType=VARCHAR}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
        delete from sta_repair_info
        where  id = #{id,jdbcType=BIGINT} 

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

@@ -25,7 +25,7 @@

    @GetMapping(path = "getDeviceInfo")
    public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
        log.info("DeviceReportCtl.getDeviceInfo()");
        log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
        Map<String, Object> result = sv.getDeviceInfo(deviceNo);
        return BaseResponseUtils.buildSuccess(result);
    }

 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;
@@ -62,18 +60,13 @@
        deviceInfo.put("deviceLog", log);
        // 查询设备生命周期
        List<StaDeviceLife> deviceLife = deviceLifeDao.selectByEquipNo(deviceNo);
        deviceInfo.put("deviceLife", log);
        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.selectByEquipNo(deviceNo);
        deviceInfo.put("deviceRepair", repairInfo);
        // 查询设备附件信息
        List<StaWipSnEx> wipSnEx = wipSnExDao.selectByDeviceNo(deviceNo);
        deviceInfo.put("deviceAttach", wipSnEx);
        return deviceInfo;
    }
}