bug修复

liuhaonan

2022-06-23 78c7b03e279cad29a6123e83da738edc1f00280c

 dao/src/main/resources/mapper/LightTaskMapper.xml

@@ -9,6 +9,7 @@
        <result property="clientId" column="client_id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
        <result property="lightAdress" column="light_adress" jdbcType="VARCHAR"/>
        <result property="pause" column="pause" jdbcType="TINYINT"/>
        <result property="week" column="week" jdbcType="TINYINT"/>
        <result property="openOrder" column="open_order" jdbcType="VARCHAR"/>
@@ -38,4 +39,65 @@
            AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
        </if>
    </select>
    <select id="listLightTaskByTaskId" resultType="com.sandu.ximon.dao.bo.PoleTaskLightPowerBo"
            parameterType="java.lang.Long">
        SELECT
        t1.id ,
        t2.task_id,
        t4.power1,
        t4.power2
        FROM
        pole t1
        LEFT JOIN light_task_pole_relation t2 ON t1.id = t2.pole_id
        LEFT JOIN pole_binding t3 ON t3.device_code = t1.device_code
        LEFT JOIN light t4 ON t4.device_code = t1.device_code
        WHERE
        t3.device_type=0
        <if test=" taskId != null">
            AND
            t2.task_id = #{taskId}
        </if>
    </select>
    <select id="successCount" resultType="java.lang.Integer" parameterType="java.lang.Long">
        SELECT
           count(*)
        FROM
            light_task t1
                LEFT JOIN light_task_pole_relation t2 ON t1.task_id = t2.task_id
        WHERE
            t1.task_id = #{taskId}
          AND t2.issue_status = 0
    </select>
    <select id="toTalCount" resultType="java.lang.Integer">
        SELECT
            count(*)
        FROM
            light_task t1
                LEFT JOIN light_task_pole_relation t2 ON t1.task_id = t2.task_id
        WHERE
            t1.task_id = #{taskId}
    </select>
    <select id="listTask" resultType="com.sandu.ximon.dao.domain.LightTask">
        SELECT
            t1.*
        FROM
            light_task t1
                LEFT JOIN light_task_pole_relation t2 ON t1.task_id = t2.task_id
                LEFT JOIN pole t3 ON t3.id = t2.pole_id
                LEFT JOIN pole_binding t4 ON t3.id = t4.pole_id
                LEFT JOIN light t5 ON t5.device_code = t4.device_code
        WHERE
            1=1
        <if test="userId != null">
           AND ( t1.task_name LIKE #{keyword} OR t5.device_code LIKE #{keyword} )
        </if>

         <if test="userId != null">
             AND ( t1.client_id =#{userId} OR t1.user_id =#{userId} )
         </if>
        GROUP BY
            task_id
        ORDER BY
            t1.${orderBy}
    </select>
</mapper>