吉安感知网项目-后端
linwei
2 hours ago caf9d837bc7b2bb6de6b7ba0aac72c3ab7ae93a8
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
@@ -25,6 +25,7 @@
        <result column="distribute_dept_name" property="distributeDeptName"/>
        <result column="patrol_task_name" property="patrolTaskName"/>
        <result column="attachment_type" property="attachmentType"/>
        <result column="event_name" property="eventName"/>
    </resultMap>
    <resultMap id="gdTaskResultExcelResultMap" type="org.sxkj.gd.workorder.excel.GdTaskResultExcel">
@@ -75,6 +76,9 @@
        <if test="gdTaskResult.createUser != null">
            AND tr.create_user = #{gdTaskResult.createUser}
        </if>
        <if test="gdTaskResult.attachmentType != null">
            AND tr.attachment_type = #{gdTaskResult.attachmentType}
        </if>
        ORDER BY tr.create_time DESC
    </select>
@@ -82,7 +86,8 @@
        SELECT
            tr.*,
            COALESCE ( bu.real_name, bu.NAME ) AS distribute_user_name,
            bd.dept_name AS distribute_dept_name
            bd.dept_name AS distribute_dept_name,
            ce.event_name
        FROM
            ja_gd_task_result tr
            LEFT JOIN (
@@ -101,6 +106,12 @@
        WHERE
            tr.is_deleted = 0
          AND tr.patrol_task_id = #{patrolTaskId}
          <if test="attachmentTypes != null and attachmentTypes.size() > 0">
          AND tr.attachment_type IN
          <foreach collection="attachmentTypes" item="type" open="(" separator="," close=")">
              #{type}
          </foreach>
          </if>
    </select>