new-LIMS-after.git

			@@ -4,12 +4,21 @@
			<select id="pageQualityMonitorDetail" resultType="com.ruoyi.process.dto.QualityMonitorDetailsDto">
			select * from (
			SELECT cqmd.*,
			ru.name responsible_name,
			eu.name evaluator_name,
			qot.id inspection_task_id,
			qot.entrust_code inspection_task_code,
			qot.ins_state inspection_task_state,
			qot.state inspection_task_order_state,
			qmp.ratify_status plan_ratify_status,
			qmp.ratify_user_id plan_ratify_user_id,
			CASE
			WHEN cqmder.is_finish = 1 THEN 3
			WHEN cqmder.is_finish = 0 THEN 2
			WHEN cqmder.quality_monitor_details_id IS NOT NULL THEN 1
			ELSE 0 END details_ratify_status,
			CASE
			WHEN cqmd.item_kind = 'INSPECTION' THEN -1
			WHEN cqmd.ratify_status = 1 THEN 3
			WHEN cqmd.ratify_status = 0 THEN 2
			WHEN cqmd.finish_report_url IS NOT NULL THEN 1
			@@ -18,8 +27,13 @@
			WHEN cqmde.is_finish = 1 THEN 3
			WHEN cqmde.ratify_user_id IS NOT NULL THEN 2
			WHEN cqmde.implement_user_id IS NOT NULL and cqmde.details_evaluate_id is not null THEN 1
			WHEN qot.ins_state = 5 THEN 1
			ELSE 0 END evaluate_status
			FROM cnas_quality_monitor_details cqmd
			LEFT JOIN user ru ON ru.id = cqmd.responsible_user_id
			LEFT JOIN user eu ON eu.id = cqmd.evaluator_user_id
			LEFT JOIN cnas_quality_monitor qmp ON qmp.quality_monitor_id = cqmd.quality_monitor_id
			LEFT JOIN ins_order qot ON qot.quality_monitor_details_id = cqmd.quality_monitor_details_id
			LEFT JOIN cnas_quality_monitor_details_evaluate cqmde
			ON cqmd.quality_monitor_details_id = cqmde.quality_monitor_details_id
			LEFT JOIN cnas_quality_monitor_details_ratify cqmder
			@@ -29,12 +43,6 @@
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			</if>
			order by quality_monitor_id, monitor_purpose, -- 提取年份
			CAST(SUBSTRING(planned_time, 1, 4) AS SIGNED) ASC,
			-- 提取月份
			CASE
			WHEN planned_time LIKE '% - %' THEN 1
			ELSE CAST(SUBSTRING_INDEX(SUBSTRING(planned_time, 6), '月', 1) AS SIGNED)
			END ASC
			order by quality_monitor_id, COALESCE(sort_no, 2147483647), quality_monitor_details_id
			</select>
			</mapper>