ERP_override.git

			@@ -155,6 +155,7 @@
			from patch_log as a
			where a.process_id=#{processIdStr}
			and a.technology_number = #{technologyStr}
			and a.patch_processes = #{process}
			and a.review_status = 1
			group by a.process_id,a.order_sort,a.technology_number
			) as patch
			@@ -273,24 +274,24 @@
			SELECT
			bdp.id,
			bdp.basic_type,
			bdp.basic_name,
			rw.teams as basic_name,
			bd.basic_name,bd.id AS basic_category,
			rw.process
			FROM
			sd.basic_data AS bd
			LEFT JOIN `basic_data_produce` AS bdp
			ON bd.id = bdp.basic_category
			right join (
			select distinct process from
			( select distinct rw.this_process as process
			from reporting_work as rw where rw.process_id=#{processIdStr}
			UNION
			select #{process}
			) as t
			) as rw
			on rw.process=bd.basic_name
			LEFT JOIN `basic_data_produce` AS bdp
			ON bd.id = bdp.basic_category
			right join (
			select distinct process,teams from
			( select distinct rw.this_process as process,rw.teams_groups_name as teams
			from reporting_work as rw where rw.process_id=#{processIdStr}

			) as t
			) as rw
			on rw.process=bd.basic_name
			WHERE
			bdp.basic_type = 'teamsgroups'
			bdp.basic_type = 'teamsgroups'
			GROUP BY rw.process,rw.teams
			</select>

			<select id="SelectHistoryProcessMp">
			@@ -530,6 +531,12 @@
			<if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
			and rw.this_process regexp #{reportingWork.thisProcess}
			</if>
			<if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
			and rw.device_name regexp #{reportingWork.deviceName}
			</if>
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			</if>
			GROUP BY rw.reporting_work_id
			ORDER BY rw.reporting_work_id desc
			limit #{offset},#{pageSize};
			@@ -565,6 +572,12 @@
			<if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
			and rw.this_process regexp #{reportingWork.thisProcess}
			</if>
			<if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
			and rw.device_name regexp #{reportingWork.deviceName}
			</if>
			<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
			and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
			</if>
			ORDER BY rw.reporting_work_id desc
			limit #{offset},#{pageSize};
			</select>