调整sql

Lius

2024-07-25 9b015b51b72ba050b4c38a6ba79eb45b7065e67d

调整sql

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java

@@ -1,6 +1,5 @@
package org.jeecg.modules.mdc.job;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
@@ -85,7 +84,7 @@
        log.info("设备状态长期无变化报警任务 RunningEquipmentStatusJob start!  时间:" + DateUtils.getNow());
        long startTime = System.currentTimeMillis();
        try {
            List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<>());
            List<MdcEquipment> equipmentList = mdcEquipmentService.list();
//            List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "3140045"));
            // 获取利用率判定天数
            List<DictModel> dictModelList1 = sysDictService.queryEnableDictItemsByCode(CommonConstant.DICT_EQUIPMENT_RATE_JUDGE);

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningOvertimeDurationJob.java

@@ -90,7 +90,7 @@
            } else {
                date = DateUtils.format(DateUtils.getNow(), DateUtils.STR_DATE);
            }
            List<MdcEquipment> equipmentList = mdcEquipmentService.list(new LambdaQueryWrapper<>());
            List<MdcEquipment> equipmentList = mdcEquipmentService.list();
            MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
            if (mdcSystemParameters == null) {
                throw new JobExecutionException("mdc_system_parameters 表中数据缺失");

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcProcessQuantityMapper.xml

@@ -6,7 +6,7 @@
    <select id="pageList" resultType="org.jeecg.modules.mdc.dto.MdcProcessQuantityDto">
        SELECT
            t1.id id,
            t1.equipment_id equipmentId,
            t3.equipment_id equipmentId,
            t3.equipment_name equipmentName,
            t2.parts_code partsCode,
            t2.batch_code batchCode,
@@ -23,10 +23,10 @@
        FROM
            mdc_process_quantity t1
            LEFT JOIN mdc_standard_process_duration t2 ON t1.standard_id = t2.id
            LEFT JOIN mdc_equipment t3 ON t1.equipment_id = t3.equipment_id
            LEFT JOIN mdc_equipment t3 ON t2.equipment_id = t3.equipment_id
        <where>
            <if test="mdcProcessQuantity.equipmentId != null and mdcProcessQuantity.equipmentId != ''">
                AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentId }),'%')
                AND t3.equipment_id LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentId }),'%')
            </if>
            <if test="mdcProcessQuantity.equipmentName != null and mdcProcessQuantity.equipmentName != ''">
                AND t3.equipment_name LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentName }),'%')
@@ -47,7 +47,7 @@
                AND t1.process_quantity = #{ mdcProcessQuantity.processQuantity }
            </if>
            <if test="mdcProcessQuantity.mdcSectionIds != null and mdcProcessQuantity.mdcSectionIds.size() > 0 ">
                AND t1.equipment_id IN
                AND t3.equipment_id IN
                <foreach collection="mdcProcessQuantity.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
@@ -60,7 +60,7 @@
    <select id="list" resultType="org.jeecg.modules.mdc.dto.MdcProcessQuantityDto">
        SELECT
        t1.id id,
        t1.equipment_id equipmentId,
        t3.equipment_id equipmentId,
        t3.equipment_name equipmentName,
        t2.parts_code partsCode,
        t2.batch_code batchCode,
@@ -77,10 +77,10 @@
        FROM
        mdc_process_quantity t1
        LEFT JOIN mdc_standard_process_duration t2 ON t1.standard_id = t2.id
        LEFT JOIN mdc_equipment t3 ON t1.equipment_id = t3.equipment_id
        LEFT JOIN mdc_equipment t3 ON t2.equipment_id = t3.equipment_id
        <where>
            <if test="mdcProcessQuantity.equipmentId != null and mdcProcessQuantity.equipmentId != ''">
                AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentId }),'%')
                AND t3.equipment_id LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentId }),'%')
            </if>
            <if test="mdcProcessQuantity.equipmentName != null and mdcProcessQuantity.equipmentName != ''">
                AND t3.equipment_name LIKE CONCAT(CONCAT('%',#{ mdcProcessQuantity.equipmentName }),'%')
@@ -101,7 +101,7 @@
                AND t1.process_quantity = #{ mdcProcessQuantity.processQuantity }
            </if>
            <if test="mdcProcessQuantity.mdcSectionIds != null and mdcProcessQuantity.mdcSectionIds.size() > 0 ">
                AND t1.equipment_id IN
                AND t3.equipment_id IN
                <foreach collection="mdcProcessQuantity.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
                    #{ id }
                </foreach>
@@ -114,7 +114,7 @@
    <select id="findById" resultType="org.jeecg.modules.mdc.dto.MdcProcessQuantityDto">
        SELECT
            t1.id id,
            t1.equipment_id equipmentId,
            t3.equipment_id equipmentId,
            t3.equipment_name equipmentName,
            t2.parts_code partsCode,
            t2.batch_code batchCode,
@@ -130,7 +130,7 @@
            t1.update_time updateTime
        FROM mdc_process_quantity t1
            LEFT JOIN mdc_standard_process_duration t2 ON t1.standard_id = t2.id
            LEFT JOIN mdc_equipment t3 ON t1.equipment_id = t3.equipment_id
            LEFT JOIN mdc_equipment t3 ON t2.equipment_id = t3.equipment_id
        WHERE t1.id = #{ id }
    </select>
</mapper>

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcStandardProcessDurationMapper.xml

@@ -5,7 +5,7 @@
    <select id="findByEquipmentId" resultType="org.jeecg.modules.mdc.dto.MdcProcessQuantityDto">
        SELECT
            t1.id id,
            t1.equipment_id equipmentId,
            t3.equipment_id equipmentId,
            t3.equipment_name equipmentName,
            t2.parts_code partsCode,
            t2.batch_code batchCode,
@@ -21,7 +21,7 @@
            t1.update_time updateTime
        FROM mdc_process_quantity t1
                 LEFT JOIN mdc_standard_process_duration t2 ON t1.standard_id = t2.id
                 LEFT JOIN mdc_equipment t3 ON t1.equipment_id = t3.equipment_id
        WHERE t1.equipment_id = #{ equipmentId } AND t1.efficient_date LIKE CONCAT(CONCAT('%',#{ validDate }),'%')
                 LEFT JOIN mdc_equipment t3 ON t2.equipment_id = t3.equipment_id
        WHERE t3.equipment_id = #{ equipmentId } AND t1.efficient_date LIKE CONCAT(CONCAT('%',#{ validDate }),'%')
    </select>
</mapper>