本地最新代码:同步所有修改及新增模块

This commit is contained in:
local
2026-08-11 13:34:15 +08:00
parent 2b86d14f56
commit 916ac6bda3
172 changed files with 13896 additions and 1774 deletions

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
<include refid="selectBasRoadwayVo"/>
<where>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="roadwayName != null and roadwayName != ''"> and roadway_name like concat('%', #{roadwayName}, '%')</if>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="inLocked != null and inLocked != ''"> and in_locked = #{inLocked}</if>
<if test="outLocked != null and outLocked != ''"> and out_locked = #{outLocked}</if>
<if test="inLocked2 != null and inLocked2 != ''"> and in_locked2 = #{inLocked2}</if>
<if test="outLocked2 != null and outLocked2 != ''"> and out_locked2 = #{outLocked2}</if>
<if test="deviceId != null and deviceId != ''"> and device_id like concat('%', #{deviceId}, '%')</if>
<if test="inLocked != null and inLocked != ''"> and in_locked like concat('%', #{inLocked}, '%')</if>
<if test="outLocked != null and outLocked != ''"> and out_locked like concat('%', #{outLocked}, '%')</if>
<if test="inLocked2 != null and inLocked2 != ''"> and in_locked2 like concat('%', #{inLocked2}, '%')</if>
<if test="outLocked2 != null and outLocked2 != ''"> and out_locked2 like concat('%', #{outLocked2}, '%')</if>
</where>
</select>
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
</mapper>
</mapper>