weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_qinhongzhanWMS' into wms_dev

Browse Source 
# Conflicts:
#	mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
This commit is contained in:
秦鸿展
2026-02-07 10:25:42 +08:00
parent 93099ce1c0 fe1aadd8ac
commit 44d295f702
4 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
+16 -2
View File
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationName != null and organizationName != ''">
and organization_name like concat('%', #{organizationName}, '%')
</if>
<if test="warehouseId != null and warehouseId != ''">
<if test="warehouseId != null ">
and warehouse_id = #{warehouseId}
</if>
<if test="warehouseName != null and warehouseName != ''">
@@ -76,13 +76,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leaseType != null and leaseType != ''">
and lease_type = #{leaseType}
</if>
<if test="createTime != null ">
and create_time = #{createTime}
</if>
<if test="leaseArea != null ">
and lease_area = #{leaseArea}
</if>
<if test="remark != null and remark != ''">
and remark like concat('%', #{remark}, '%')
</if>
<!-- 创建和更新相关条件 -->
<if test="createByName != null and createByName != ''">
and create_by_name like concat('%', #{createByName}, '%')
@@ -90,6 +92,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateByName != null and updateByName != ''">
and update_by_name like concat('%', #{updateByName}, '%')
</if>
<if test="createTimeStart != null and createTimeStart != ''">
and date_format(create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
</if>
<if test="createTimeEnd != null and createTimeEnd != ''">
and date_format(create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
</if>
<if test="updateTimeStart != null and updateTimeStart != ''">
and date_format(update_time,'%Y-%m-%d') &gt;= #{updateTimeStart}
</if>
<if test="updateTimeEnd != null and updateTimeEnd != ''">
and date_format(update_time,'%Y-%m-%d') &lt;= #{updateTimeEnd}
</if>
<!-- 时间范围查询（如果需要） -->
<if test="startDate != null and endDate != null">
and start_date &gt;= #{startDate} and start_date &lt;= #{endDate}