巡查修改

guoshilong

2024-03-23 f04487fef5ac47380dfa9670156743c9d273966b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -27,10 +27,10 @@
            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
        </if>
        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
            AND spt.start_time &gt;= #{patrolTask.startTime}
            AND spt.create_time &gt;= #{patrolTask.startTime}
        </if>
        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
            AND spt.end_time &lt;= #{patrolTask.endTime}
            AND spt.create_time &lt;= #{patrolTask.endTime}
        </if>
        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
            AND spt.project_id = #{patrolTask.projectId}
@@ -61,12 +61,6 @@
                        <if test="patrolTask.title !=null and patrolTask.title!=''">
                            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
                        </if>
<!--                        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">-->
<!--                            AND spt.start_time &gt;= #{patrolTask.startTime}-->
<!--                        </if>-->
<!--                        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">-->
<!--                            AND spt.end_time &lt;= #{patrolTask.endTime}-->
<!--                        </if>-->
                        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
                            AND spt.create_time &gt;= #{patrolTask.startTime}
                        </if>
@@ -119,10 +113,10 @@
            AND spt.title LIKE CONCAT('%',#{patrolTask.title},'%')
        </if>
        <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
            AND spt.start_time &gt;= #{patrolTask.startTime}
            AND spt.create_time &gt;= #{patrolTask.startTime}
        </if>
        <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
            AND spt.end_time &lt;= #{patrolTask.endTime}
            AND spt.create_time &lt;= #{patrolTask.endTime}
        </if>
        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
            AND spt.project_id = #{patrolTask.projectId}
@@ -740,10 +734,10 @@
                and concat(aab."ad_code",aa."ad_code",ab."ad_code",ac."ad_code") like CONCAT('%',#{vo.adCode},'%')
            </if>
            <if test="vo.startTime !=null and vo.startTime !=''">
                AND T.start_time &gt;= #{vo.startTime}
                AND T.create_time &gt;= #{vo.startTime}
            </if>
            <if test="vo.endTime !=null and vo.endTime !=''">
                AND T.end_time &lt;= #{vo.endTime}
                AND T.create_time &lt;= #{vo.endTime}
            </if>
            <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
                AND T.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
@@ -772,15 +766,72 @@
            and concat(aab."ad_code",aa."ad_code",ab."ad_code",ac."ad_code") like CONCAT('%',#{vo.adCode},'%')
        </if>
        <if test="vo.startTime !=null and vo.startTime !=''">
            AND T.start_time &gt;= #{vo.startTime}
            AND T.create_time &gt;= #{vo.startTime}
        </if>
        <if test="vo.endTime !=null and vo.endTime !=''">
            AND T.end_time &lt;= #{vo.endTime}
            AND T.create_time &lt;= #{vo.endTime}
        </if>
        <if test="vo.reservoirName !=null and vo.reservoirName !='' ">
            AND T.reservoir_name LIKE CONCAT('%',#{vo.reservoirName},'%')
        </if>
    </select>

    <resultMap id="item" type="cn.gistack.sm.patrol.entity.PatrolGroupItem">
        <result property="id" column="itemId"/>
        <result property="itemsName" column="itemsName"/>
        <result property="groupId" column="groupId"/>
        <result property="description" column="description"/>
    </resultMap>

    <resultMap id="groupDTO" type="cn.gistack.sm.patrol.dto.PatrolGroupDTOS">
        <id property="id" column="groupId"/>
        <result property="name" column="groupName"/>
        <collection property="itemList" resultMap="item"/>
    </resultMap>

    <resultMap id="taskDTO" type="cn.gistack.sm.patrol.dto.PatrolTaskDTO">
        <id property="id" column="taskId"/>
        <result property="projectId" column="projectId"/>
        <result property="state" column="state"/>
        <result property="title" column="title"/>
        <result property="content" column="content"/>
        <collection property="groupList"  resultMap="groupDTO"/>
    </resultMap>

    <select id="getTaskDTO" resultMap="taskDTO">
        SELECT
            task.id as taskId,
            task.project_id as projectId,
            task.state as state,
            task.title as title,
            task.content as content,

            spg.id as groupId,
            spg.name as groupName,

            spgi.id as itemId,
            spgi.items_name as itemsName,
            spgi.description as description
        FROM YWXT.SM_PATROL_TASK TASK
                 LEFT JOIN SM_PATROL_GROUP_ITEM SPGI ON task.patrol_group_item_id like CONCAT('%',spgi.id,'%')
                 LEFT JOIN SM_PATROL_GROUP SPG ON SPG.ID = SPGI.GROUP_ID
        WHERE task.is_deleted = 0 and  TASK.ID = #{taskId}
    </select>

    <select id="getMyTask" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
        SELECT
            id,title,project_id,content,state,to_user_id,real_end_time

        from sm_patrol_task spt
        where spt.is_deleted = 0
        <if test="patrolTask.toUserId != null and patrolTask.toUserId != ''">
            AND spt.to_user_id LIKE CONCAT('%',#{patrolTask.toUserId},'%')
        </if>
        <if test="patrolTask.state != null and patrolTask.state != ''">
            AND spt.state = #{patrolTask.state}
        </if>
        order by spt.create_time desc
    </select>


</mapper>