台账导入修改

qushaowei

2025-06-04 fff5ef18854efe6a4eb03049a1ddcc16edb0087e

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -108,7 +108,7 @@
            t1.fault_time as faultTime,
            t2.item_text as maintenanceMethodName,
            t3.name as teamName,
            t4.realname as recipientuserName,
            t1.recipient_user_id as recipientuserName,
            t1.actual_hour as actualHour,
            t1.actual_start_time AS actualStartTime,
            t1.actual_end_time as  actualEndTime
@@ -116,8 +116,7 @@
            mom_eam_repair_order t1
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t2 ON t2.item_value = t1.maintenance_method
        left join mom_base_team t3 on t1.team_id = t3.id
        left join sys_user t4 on t1.recipient_user_id = t4.id
        WHERE t1.del_flag = '0' and t4.del_flag= '0'  and t3.del_flag= '0' and t1.equipment_id = #{params.equipmentId}
        WHERE t1.del_flag = '0' and t1.equipment_id = #{params.equipmentId}
    </select>

    <select id="getResumeCalibrationRecordList"  parameterType="Map" resultType="Map">
@@ -326,6 +325,12 @@
        <if test="lineId != null and lineId != ''">
            and t1.line_id = #{lineId}
        </if>
        <if test="userWorkCenterIds != null and userWorkCenterIds.size > 0">
            and t1.work_center_id in
            <foreach collection="userWorkCenterIds" open="(" separator="," close=")" item="workCenterId">
                #{workCenterId}
            </foreach>
        </if>
        order by t1.create_time desc
    </select>

@@ -345,8 +350,8 @@
        t1.constructor_id constructorId,
        t1.supplier_id supplierId,
        t1.factory_number factoryNumber,
        t1.leave_factory_date leaveFactoryDate,
        t1.acceptance_check_date acceptanceCheckDate,
        CONVERT(VARCHAR(10), t1.leave_factory_date, 120) leaveFactoryDate,
        CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) acceptanceCheckDate,
        t1.affiliation_id affiliationId,
        t1.manage_id manageId,
        t1.manager manager,