java/NTTravel.git

java / NTTravel

南通出行

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml

@@ -85,7 +85,7 @@
        LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
        ) as o
        <where>
            o.isDelete = 1 and o.type = 7
            o.isDelete = 1 and o.type = 1
            <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
                AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
            </if>

			@@ -85,7 +85,7 @@
			LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
			) as o
			<where>
			o.isDelete = 1 and o.type = 7
			o.isDelete = 1 and o.type = 1
			<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
			AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
			</if>