人员物料绑定修复

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<QcUserMaterial> selectUserList(QcUserMaterial qcUserMaterial) {
 		return qcUserMaterialMapper.selectUserList(	qcUserMaterial);
 	}

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'
 			<if test="projectId != null  and projectId != ''"> and ctp.project_id = #{projectId}</if>
 			<if test="typeId != null  and typeId != ''"> and ctp.type_id = #{typeId}</if>
-			<if test="standardValue != null "> and ctp.standard_value = #{standardValue}</if>
+			<if test="standardValue != null and standardValue != ''"> and ctp.standard_value = #{standardValue}</if>
 			<if test="upperDiff != null "> and ctp.upper_diff = #{upperDiff}</if>
 			<if test="downDiff != null "> and ctp.down_diff = #{downDiff}</if>
 			<if test="sample != null "> and ctp.sample = #{sample}</if>
-			<if test="status != null  and status != ''"> and status = #{status}</if>
+			<if test="status != null  and status != ''"> and ctp.status = #{status}</if>
-			<if test="attr1 != null  and attr1 != ''"> and attr1 = #{attr1}</if>
+			<if test="groupId != null  and groupId != ''"> and ctp.group_id = #{groupId}</if>
-			<if test="factoryCode != null  and factoryCode != ''"> and factory_code = #{factoryCode}</if>
+			<if test="materialCode != null  and materialCode != ''"> and ctp.material_code = #{materialCode}</if>
-			<if test="groupId != null  and groupId != ''"> and group_id = #{groupId}</if>
+			<if test="sampleNum != null  and sampleNum != ''"> and ctp.sample_num = #{sampleNum}</if>
-			<if test="materialCode != null  and materialCode != ''"> and material_code = #{materialCode}</if>
+			<if test="ruleName != null  and ruleName != ''"> and cp.rule_name like concat('%', #{ruleName}, '%')</if>
-			<if test="sampleNum != null  and sampleNum != ''"> and sample_num = #{sampleNum}</if>
 		</where>
 	</select>
 

op-modules/op-quality/src/main/resources/mapper/quality/QcUserMaterialMapper.xml

@@ -41,7 +41,10 @@ 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
+			LEFT JOIN lanju_op_xiaolan_ds.dbo.base_product bp ON bp.product_code = um.material_code
+		WHERE t.del_flag = '0'
+		<if test="userName != null  and userName != ''"> and t.nick_name like concat('%', #{userName}, '%')</if>
+		<if test="phonenumber != null  and phonenumber != ''"> and t.phonenumber like concat('%', #{phonenumber}, '%')</if>
 		GROUP BY t.user_id,t.user_name,t.nick_name,t.phonenumber,t.email,t.status,t.create_time