一些bug，非空判断、日志路径

fuliqi

2024-12-09 40ab33e2f20233d1d30571247c33465ad9afc534

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -149,7 +149,6 @@
        p.yw_person_name
        ORDER BY wo.work_order_no DESC
    </select>

    <select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
        SELECT
        wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,
@@ -157,7 +156,6 @@
        u.unit_name,
        p.yw_person_name,
        yp.serial_number,
        yp.province_tag,
        yp.important_tag,
        yp.important_command_image_tag,
        odr.create_time as distributeTime,
@@ -205,19 +203,28 @@
        wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
        u.unit_name,
        p.yw_person_name,
        yp.province_tag,
        yp.important_tag,
        yp.important_command_image_tag,
        odr.create_time,
        su.nick_name
        ORDER BY wo.create_time DESC
    </select>

    <select id="getOfflineWorkOrder" resultType="java.lang.String">
        select tm.ip
        FROM
            t_work_order wo
        INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
        where (EXISTS (
                SELECT 1
                FROM t_work_order_error_type twoet
                WHERE twoet.work_order_no = wo.work_order_no
                  AND twoet.error_name = 'DEVICEOFFLINE'
            ))
    </select>
    <select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
        SELECT
             wo.id,
             wod.create_time,
             yp.province_tag,
             yp.important_tag,
             yp.important_command_image_tag
        FROM
@@ -294,7 +301,7 @@
        FROM t_work_order w
        LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
        WHERE w.deleted = 0
        <if test="dataScope == 1"> AND p.province_tag = 1 </if>
        <if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
        <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
        <if test="deptId != null"> AND p.dept_id = #{deptId} </if>
    </select>
@@ -309,7 +316,7 @@
        LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0
        LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
        WHERE d.del_flag = 0 AND d.area IS NOT NULL
        <if test="dataScope == 1"> AND p.province_tag = 1 </if>
        <if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
        <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
        <!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
        GROUP BY d.area, d.dept_id
@@ -433,22 +440,15 @@
        p.yw_person_name
    </select>

    <select id="batchGetByError" resultType="com.ycl.platform.domain.entity.WorkOrder">
    <select id="selectByNos" resultType="com.ycl.platform.domain.entity.WorkOrder">
        select wo.id,wo.unit_id,wo.work_order_no,wo.serial_number
        from t_work_order wo
        <where>
            wo.deleted = 0 and wo.status = 'YW_HANDLE'
            <if test="form.errorTypes != null and form.errorTypes.size() > 0">
                AND (EXISTS (
                SELECT 1
                FROM t_work_order_error_type twoet
                WHERE twoet.work_order_no = wo.work_order_no
                AND twoet.error_name in
                <foreach collection="form.errorTypes" open="(" separator="," close=")" item="errorType">
                    #{errorType}
                </foreach>
                ))
            </if>
            and wo.work_order_no in
            <foreach collection="workOrderNos" open="(" separator="," close=")" item="workOrderNo">
                #{workOrderNo}
            </foreach>
        </where>
    </select>
</mapper>