diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml index 7732bf5c..ef9201e0 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml @@ -250,6 +250,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_center LIKE CONCAT('%', #{departName}, '%') + + and bp.pro_name LIKE CONCAT('%', #{proName}, '%') + and bt.unit_name LIKE CONCAT('%', #{teamName}, '%') @@ -643,6 +646,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_center LIKE CONCAT('%', #{departName}, '%') + + and bp.pro_name LIKE CONCAT('%', #{proName}, '%') + and bt.unit_name LIKE CONCAT('%', #{teamName}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index 8d066f74..aab88ff9 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -410,6 +410,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_center LIKE CONCAT('%', #{departName}, '%') + + and bp.pro_name LIKE CONCAT('%', #{proName}, '%') + and bt.unit_name LIKE CONCAT('%', #{teamName}, '%') @@ -860,7 +863,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" su.nick_name as outPerson, lai.`code` as code, bp.imp_unit as impUnit, - bt.bzz_idcard as idCard + bt.bzz_idcard as idCard, + lai.sub_unit_name as subUnitName FROM clz_lease_out_details lod LEFT JOIN ma_type mt ON lod.type_id = mt.type_id @@ -882,6 +886,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_center LIKE CONCAT('%', #{departName}, '%') + + and bp.pro_name LIKE CONCAT('%', #{proName}, '%') + and bt.unit_name LIKE CONCAT('%', #{teamName}, '%') diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index b7f98c5c..d443b10c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -784,8 +784,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bp.pro_name LIKE CONCAT('%', #{proName}, '%') - - and mt3.type_name LIKE CONCAT('%', #{materialName}, '%') + + and mt2.type_name LIKE CONCAT('%', #{typeName}, '%') and bu.unit_name LIKE CONCAT('%', #{teamName}, '%')