吉安感知网项目-后端
linwei
2026-04-07 49d4780faeb94b26a339c7e3471c169d9ba14f5c
opt: 人大金仓数据库改造
4 files modified
8 ■■■■ changed files
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml 2 ●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml 2 ●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml 2 ●●● patch | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml 2 ●●● patch | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
@@ -273,7 +273,7 @@
        and job.job_info_id is not null
        <if test="attach.startTime!=null and attach.startTime!='' and attach.endTime!=null and attach.endTime!=''">
            and (DATE_FORMAT(FROM_UNIXTIME(job.execute_time/1000,'%Y-%m-%d %H:%i:%s'),'%Y-%m-%d %H:%i:%s') between
            #{attach.startTime} and #{attach.endTime} or rela.create_time between #{attach.startTime} and #{attach.endTime} )
            #{attach.startTime} and #{attach.endTime} or rela.create_time between #{attach.startTime}::timestamp and #{attach.endTime}::timestamp )
        </if>
        <if test="attach.name!=null and attach.name!=''">
            and COALESCE(attach.nick_name, SUBSTRING_INDEX(SUBSTRING_INDEX(attach.NAME, '/', -1), '.', 1))
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -69,7 +69,7 @@
                and dfr.area_code = #{param2.areaCode}
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and dfr.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and dfr.alarm_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and dfr.device_type = #{param2.deviceType}
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -77,7 +77,7 @@
                </foreach>
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != '' ">
                and pt.execute_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and pt.execute_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
            </if>
        </where>
    </select>
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -122,7 +122,7 @@
                and wo.create_user::VARCHAR = #{param2.createUser}::VARCHAR
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and wo.create_time BETWEEN #{param2.startTime} AND #{param2.endTime}
                and wo.create_time BETWEEN #{param2.startTime}::timestamp AND #{param2.endTime}::timestamp
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                /* 修改点3:IN 查询内部元素类型转换 */