cnas-device/src/main/java/com/ruoyi/device/controller/DeviceImpowerController.java

@@ -101,8 +101,8 @@
     */
    @ApiOperation("导出使用授权")
    @GetMapping("/exportDeviceImpower")
    public Result exportDeviceImpower(@RequestParam("impowerId") Integer impowerId, HttpServletResponse response) {
        return deviceImpowerService.exportDeviceImpowerDto(impowerId, response);
    public void exportDeviceImpower(@RequestParam("impowerId") Integer impowerId, HttpServletResponse response) {
        deviceImpowerService.exportDeviceImpowerDto(impowerId, response);
    }

}

 cnas-device/src/main/java/com/ruoyi/device/service/DeviceImpowerService.java

@@ -67,5 +67,5 @@
    /**
     * 使用授权导出
     */
    Result exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response);
    void exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response);
}

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceImpowerServiceImpl.java

@@ -249,7 +249,7 @@
     * @param impowerId 设备使用id
     */
    @Override
    public Result exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response) {
    public void exportDeviceImpowerDto(Integer impowerId, HttpServletResponse response) {
        // 查询设备使用授权计划
        DeviceImpower deviceImpower = baseMapper.selectById(impowerId);
        DeviceImpowerDto deviceImpowerDto = new DeviceImpowerDto();
@@ -295,6 +295,5 @@
            e.printStackTrace();
            throw new RuntimeException("导出失败");
        }
        return Result.success();
    }
}

 cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml

@@ -6,7 +6,24 @@
    <!--设备核查计划详情列表-->
    <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
        select * from (
        select d.*,
        select
            d.plan_details_id,
            d.plan_id,
            d.device_id,
            d.device_number,
            d.device_name,
            d.check_time,
            d.check_index,
            d.check_method,
            d.how_results,
            d.check_charger_user_id,
            CASE WHEN d.check_charger_user='' or d.check_charger_user is null THEN u.name
                ELSE d.check_charger_user END AS check_charger_user,
            d.remark,
            d.create_user,
            d.create_time,
            d.update_user,
            d.update_time,
        CASE
        WHEN dc.review_status = 0 THEN 3
        WHEN dc.review_status = 1 THEN 2
@@ -18,6 +35,7 @@
        WHEN dd.record_contrast_id IS NOT NULL THEN 1
        ELSE 0 END record_contrast_status
        from device_examine_plan_details d
        left join user u on u.id = d.check_charger_user_id
        left join device_examine_record dc on d.plan_details_id = dc.plan_details_id
        left join device_examine_record_contrast dd on dd.plan_details_id = dc.plan_details_id
        order by check_time asc

 cnas-device/src/main/resources/static/word/device-impower.docx

Binary files differ

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java

@@ -77,7 +77,6 @@

    public Result getIfsStockReport(IfsStockQueryDTO ifsStockQueryDTO) {
        JSONObject jresult = new JSONObject();
        jresult.put("total", 0);
        jresult.put("count", 0);
        jresult.put("data", new JSONArray());
        JSONObject jsonObject = new JSONObject();
@@ -92,9 +91,6 @@
            }
            //获取总数量
            int count = data.getIntValue("TOTAL_RECORD");
            //获取页数
            int total = (int) Math.ceil((double) count / (double) ifsStockQueryDTO.getLimit());
            jresult.put("total", total);
            jresult.put("count", count);
            jresult.put("data", array);
        }