Merge remote-tracking branch 'origin/jtdev' into jtdev

zhongrj

2023-04-28 b59efa774fbf19c39da44b6cb4f5c65f1f7e0d25

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

@@ -23,6 +23,12 @@
        <if test="patrolTask.projectId !=null and patrolTask.projectId !='' ">
            AND spt.project_id = #{patrolTask.projectId}
        </if>
        <if test="patrolTask.toUserId != null and patrolTask.toUserId !=''">
            AND spt.to_user_id = #{patrolTask.toUserId}
        </if>
        <if test="patrolTask.state != null and patrolTask.state !=''">
            AND spt.state = #{patrolTask.state}
        </if>
    </select>

    <!--查询巡查人员统计数据信息-->