java/laboratory.git

			@@ -9,6 +9,7 @@
			<result column="test_result" property="testResult" />
			<result column="test_reason" property="testReason" />
			<result column="status" property="status" />
			<result column="commit_user_id" property="commitUserId" />
			<result column="create_time" property="createTime" />
			<result column="update_time" property="updateTime" />
			<result column="create_by" property="createBy" />
			@@ -18,11 +19,12 @@

			<!-- 通用查询结果列 -->
			<sql id="Base_Column_List">
			id, dispatch_id, test_result, test_reason, status, create_time, update_time, create_by, update_by, disabled
			id, dispatch_id, test_result, test_reason, status,commit_user_id, create_time, update_time, create_by, update_by, disabled
			</sql>
			<select id="pageList" resultType="com.ruoyi.system.vo.TInspectionReportVO">
			select tir.id, tir.dispatch_id, tir.test_result, tir.test_reason, tir.status, tir.create_time,
			tir.update_time, tir.create_by, tir.update_by, tir.disabled, ted.experiment_name, ted.experiment_code,
			tir.update_time, tir.create_by, tir.update_by, tir.disabled, tir.commit_user_id,
			ted.experiment_name, ted.experiment_code,
			tpp.project_name
			from t_inspection_report tir
			left join t_experiment_dispatch ted on ted.id = tir.dispatch_id
			@@ -43,6 +45,9 @@
			<if test="query.status != null">
			and tir.status = #{query.status}
			</if>
			<if test="query.roleType != null and query.roleType == 4 and query.userId != null">
			AND tir.commit_user_id = #{query.userId}
			</if>
			<if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
			and tir.dispatch_id in
			<foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">