ERP_override.git

			@@ -107,6 +107,8 @@
			<result column="glassNumber" property="glassNumber"/>
			<result column="child_width" property="childWidth"/>
			<result column="child_height" property="childHeight"/>
			<result column="this_process" property="thisProcess"/>
			<result column="creator" property="creator"/>
			</resultMap>

			<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
			@@ -271,7 +273,8 @@
			ogd.glass_child,
			rw.this_process,
			JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id
			CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
			rw.creator
			from
			sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
			left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
			@@ -314,6 +317,9 @@
			</if>
			<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
			and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
			</if>
			<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
			and rw.creator regexp #{crossProcessBreakingDTO.creator}
			</if>
			GROUP BY dd.id
			order by dd.id desc
			@@ -621,7 +627,9 @@
			ogd.glass_child,
			ogd.child_width,
			ogd.child_height,
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
			ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
			rw.this_process,
			rw.creator
			FROM
			sd.ORDER AS o
			LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
			@@ -671,6 +679,12 @@
			<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
			and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
			</if>
			<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
			and rw.this_process regexp #{damageReportDTO.thisProcess}
			</if>
			<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
			and rw.creator regexp #{damageReportDTO.creator}
			</if>
			GROUP BY
			dd.id
			limit #{offset},#{pageSize};