UPDATE

Lius

2025-03-06 36deabe1df249a56a553fb606447dd326a2c81a7

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

@@ -29,7 +29,16 @@
            AND t2.equipment_type = #{ vo.equipmentType }
        </if>
        <if test="vo.driveType != null and vo.driveType != '' ">
            AND t2.drive_type = #{driveType}
            AND t2.drive_type = #{ vo.driveType }
        </if>
        <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
            AND t2.device_level = #{vo.deviceLevel}
        </if>
        <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
            AND t2.device_category = #{vo.deviceCategory}
        </if>
        <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
            AND t2.device_importance_level = #{vo.deviceImportanceLevel}
        </if>
        <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
            AND t2.equipment_id IN
@@ -37,6 +46,7 @@
                #{ id }
            </foreach>
        </if>
        AND t2.device_abnormal_status = 1
        ORDER BY t1.the_date
    </select>

@@ -70,7 +80,16 @@
            AND t2.equipment_type = #{ vo.equipmentType }
        </if>
        <if test="vo.driveType != null and vo.driveType != '' ">
            AND t2.drive_type = #{driveType}
            AND t2.drive_type = #{ vo.driveType }
        </if>
        <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
            AND t2.device_level = #{vo.deviceLevel}
        </if>
        <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
            AND t2.device_category = #{vo.deviceCategory}
        </if>
        <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
            AND t2.device_importance_level = #{vo.deviceImportanceLevel}
        </if>
        <if test="vo.equipmentIdList != null and vo.equipmentIdList.size() > 0 ">
            AND t2.equipment_id IN
@@ -78,6 +97,7 @@
                #{ id }
            </foreach>
        </if>
        AND t2.device_abnormal_status = 1
        ORDER BY t1.the_date
    </select>

@@ -117,8 +137,18 @@
                AND t2.equipment_type = #{ vo.equipmentType }
            </if>
            <if test="vo.driveType != null and vo.driveType != '' ">
                AND t2.drive_type = #{driveType}
                AND t2.drive_type = #{ vo.driveType }
            </if>
            <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
                AND t2.device_level = #{vo.deviceLevel}
            </if>
            <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
                AND t2.device_category = #{vo.deviceCategory}
            </if>
            <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
                AND t2.device_importance_level = #{vo.deviceImportanceLevel}
            </if>
            AND t2.device_abnormal_status = 1
        </where>
        GROUP BY
            t2.equipment_id,
@@ -149,8 +179,32 @@
                    #{ id }
                </foreach>
            </if>
            <if test="vo.driveType != null and vo.driveType != null">
                AND me.drive_type = #{ vo.driveType }
            <if test="vo.driveTypeList != null and vo.driveTypeList .size() > 0 ">
                AND me.drive_type IN
                <foreach collection="vo.driveTypeList" item="driveType" index="index" open="(" close=")" separator=",">
                    #{ driveType }
                </foreach>
            </if>
            <if test="vo.equipmentTypeList != null and vo.equipmentTypeList.size() > 0 ">
                AND me.equipment_type IN
                <foreach collection="vo.equipmentTypeList" item="equipmentType" index="index" open="(" close=")" separator=",">
                    #{ equipmentType }
                </foreach>
            </if>
            <if test="vo.deviceLevelList != null and vo.deviceLevelList.size() > 0 ">
                AND me.device_level IN
                <foreach collection="vo.deviceLevelList" item="deviceLevel" index="index" open="(" close=")" separator=",">
                    #{ deviceLevel }
                </foreach>
            </if>
            <if test="vo.deviceCategoryList != null and vo.deviceCategoryList.size() > 0 ">
                AND me.device_category IN
                <foreach collection="vo.deviceCategoryList" item="deviceCategory" index="index" open="(" close=")" separator=",">
                    #{ deviceCategory }
                </foreach>
            </if>
            <if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
                AND me.device_importance_level = #{vo.deviceImportanceLevel}
            </if>
            AND mesi.the_date BETWEEN #{ vo.startTime } AND #{ vo.endTime }
        </where>