java/laboratory.git

			@@ -16,6 +16,8 @@
			<result column="evaluate_six" property="evaluateSix" />
			<result column="evaluate_person_id" property="evaluatePersonId" />
			<result column="evaluate_time" property="evaluateTime" />
			<result column="old_status" property="oldStatus" />
			<result column="reject_remark" property="rejectRemark" />
			<result column="create_time" property="createTime" />
			<result column="update_time" property="updateTime" />
			<result column="create_by" property="createBy" />
			@@ -29,7 +31,8 @@
			</sql>
			<select id="pageList" resultType="com.ruoyi.system.vo.TExperimentResultReportVO">
			select terr.id, terr.dispatch_id, terr.experiment_result, terr.status, terr.evaluate_one, terr.evaluate_two, terr.evaluate_three,
			terr.evaluate_four, terr.evaluate_five, terr.evaluate_six, terr.evaluate_person_id, terr.evaluate_time, terr.create_time,
			terr.evaluate_four, terr.evaluate_five, terr.evaluate_six, terr.evaluate_person_id, terr.evaluate_time, terr.old_status,
			terr.reject_remark,terr.create_time,
			terr.update_time, terr.create_by, terr.update_by, terr.disabled, tpp.project_name AS projectName,
			ted.experiment_code AS experimentCode, ted.experiment_name AS experimentName
			from t_experiment_result_report terr
			@@ -69,7 +72,8 @@
			</select>
			<select id="evaluatePageList" resultType="com.ruoyi.system.vo.TExperimentResultReportVO">
			select terr.id, terr.dispatch_id, terr.experiment_result, terr.status, terr.evaluate_one, terr.evaluate_two, terr.evaluate_three,
			terr.evaluate_four, terr.evaluate_five, terr.evaluate_six, terr.evaluate_person_id, terr.evaluate_time, terr.create_time,
			terr.evaluate_four, terr.evaluate_five, terr.evaluate_six, terr.evaluate_person_id, terr.evaluate_time, terr.old_status,
			terr.reject_remark,terr.create_time,
			terr.update_time, terr.create_by, terr.update_by, terr.disabled, tpp.project_name AS projectName,
			ted.experiment_code AS experimentCode, ted.experiment_name AS experimentName
			from t_experiment_result_report terr