ERP_override.git

			@@ -274,7 +274,7 @@
			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
			@@ -282,16 +282,16 @@
			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
			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}
			UNION
			select #{process}

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

			<select id="SelectHistoryProcessMp">
			@@ -531,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};
			@@ -566,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>