设备核查计划：核查负责人回显为空问题修复

zouyu

12 小时以前 68e3bb82d2246ea3427bbbd420556b893894b231

设备核查计划：核查负责人回显为空问题修复

 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

 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);
        }