diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java index ca9eeb4d..e369e4d7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcUserMaterialServiceImpl.java @@ -30,7 +30,6 @@ public class QcUserMaterialServiceImpl implements IQcUserMaterialService { private QcUserMaterialMapper qcUserMaterialMapper; @Override - @DS("#header.poolName") public List selectUserList(QcUserMaterial qcUserMaterial) { return qcUserMaterialMapper.selectUserList( qcUserMaterial); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 848abac1..179bcca7 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -56,16 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ctp.del_flag = '0' and ctp.project_id = #{projectId} and ctp.type_id = #{typeId} - and ctp.standard_value = #{standardValue} + and ctp.standard_value = #{standardValue} and ctp.upper_diff = #{upperDiff} and ctp.down_diff = #{downDiff} and ctp.sample = #{sample} - and status = #{status} - and attr1 = #{attr1} - and factory_code = #{factoryCode} - and group_id = #{groupId} - and material_code = #{materialCode} - and sample_num = #{sampleNum} + and ctp.status = #{status} + and ctp.group_id = #{groupId} + and ctp.material_code = #{materialCode} + and ctp.sample_num = #{sampleNum} + and cp.rule_name like concat('%', #{ruleName}, '%') diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml index 1fe10d2f..8c02c064 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml @@ -41,8 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM sys_user t LEFT JOIN lanju_op_xiaolan_ds.dbo.qc_user_material um ON um.user_code = t.user_name - LEFT JOIN base_product bp ON bp.product_code = um.material_code - GROUP BY t.user_id,t.user_name,t.nick_name,t.phonenumber,t.email,t.status,t.create_time + LEFT JOIN lanju_op_xiaolan_ds.dbo.base_product bp ON bp.product_code = um.material_code + WHERE t.del_flag = '0' + and t.nick_name like concat('%', #{userName}, '%') + and t.phonenumber like concat('%', #{phonenumber}, '%') + GROUP BY t.user_id,t.user_name,t.nick_name,t.phonenumber,t.email,t.status,t.create_time