diff --git a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml index 5f9b39128..6c2a77dc8 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.manager, r.supplier_code, r.start_date, r.end_date, r.remark, r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site, l.line_name,l.trans_manager, l.from_country, l.country, - (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) - FROM emis_supplier s - WHERE FIND_IN_SET(s.code, r.supplier_code) + (SELECT GROUP_CONCAT(s.name ORDER BY FIND_IN_SET(s.code, r.supplier_code)) + FROM emis_supplier s + WHERE FIND_IN_SET(s.code, r.supplier_code) AND s.del_flag = '0') as supplier_name, - (SELECT GROUP_CONCAT(p.prod_name ORDER BY FIND_IN_SET(p.prod_code, r.product_type)) - FROM emis_trans_product p - WHERE FIND_IN_SET(p.prod_code, r.product_type) + (SELECT GROUP_CONCAT(p.prod_name ORDER BY FIND_IN_SET(p.prod_code, r.product_type)) + FROM emis_trans_product p + WHERE FIND_IN_SET(p.prod_code, r.product_type) AND p.del_flag = '0') as product_type_name from emis_trans_plan_rule r left join emis_site s1 on r.start_site_code = s1.site_code and s1.del_flag='0' @@ -58,7 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND l.trans_manager like concat('%', #{transManager}, '%') and ( FIND_IN_SET(#{productType},r.product_type) ) - and ( FIND_IN_SET(#{supplierCode},r.supplier_code) ) + + and CONCAT(',', r.supplier_code, ',') + REGEXP CONCAT(',(', REPLACE(#{supplierCode}, ',', '|'), '),') + order by id desc @@ -181,14 +184,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc - + - + @@ -261,9 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + - update emis_trans_plan_rule set del_flag = '1' where id in + update emis_trans_plan_rule set del_flag = '1' where id in #{id} @@ -383,4 +386,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file +