ERP_override.git

			@@ -47,6 +47,81 @@
			<where>
			date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
			and o.create_order>0
			<if test="patchLog.patchId != null and patchLog.patchId != ''">
			and r.patch_id regexp #{patchLog.patchId}
			</if>
			<if test="patchLog.orderId != null and patchLog.orderId != ''">
			and r.order_id regexp #{patchLog.orderId}
			</if>
			<if test="patchLog.reportingWorkId != null and patchLog.reportingWorkId != ''">
			and r.reporting_work_id regexp #{patchLog.reportingWorkId}
			</if>
			<if test="patchLog.processId != null and patchLog.processId != ''">
			and r.process_id regexp #{patchLog.processId}
			</if>
			<if test="patchLog.project != null and patchLog.project != ''">
			and o.project regexp #{patchLog.project}
			</if>
			<if test="patchLog.batch != null and patchLog.batch != ''">
			and o.batch regexp #{patchLog.batch}
			</if>
			<if test="patchLog.orderSort != null and patchLog.orderSort != ''">
			and r.order_sort regexp #{patchLog.orderSort}
			</if>
			<if test="patchLog.buildingNumber != null and patchLog.buildingNumber != ''">
			and od.building_number regexp #{patchLog.buildingNumber}
			</if>
			<if test="patchLog.productName != null and patchLog.productName != ''">
			and od.product_name regexp #{patchLog.productName}
			</if>
			<if test="patchLog.technologyNumber != null and patchLog.technologyNumber != ''">
			and r.technology_number regexp #{patchLog.technologyNumber}
			</if>
			<if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
			and r.quality_inspector regexp #{patchLog.qualityInspector}
			</if>
			<if test="patchLog.width != null and patchLog.width != ''">
			and od.width regexp #{patchLog.width}
			</if>
			<if test="patchLog.height != null and patchLog.height != ''">
			and od.height regexp #{patchLog.height}
			</if>
			<if test="patchLog.shape != null and patchLog.shape != ''">
			and od.shape regexp #{patchLog.shape}
			</if>
			<if test="patchLog.patchNum != null and patchLog.patchNum != ''">
			and r.patch_num regexp #{patchLog.patchNum}
			</if>
			<if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
			and ogd.glass_address regexp #{patchLog.glassAddress}
			</if>
			<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
			and r.responsible_team regexp #{patchLog.responsibleTeam}
			</if>
			<if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
			and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
			</if>
			<if test="patchLog.responsiblePersonnel != null and patchLog.responsiblePersonnel != ''">
			and r.responsible_personnel regexp #{patchLog.responsiblePersonnel}
			</if>
			<if test="patchLog.patchType != null and patchLog.patchType != ''">
			and r.patch_type regexp #{patchLog.patchType}
			</if>
			<if test="patchLog.patchReason != null and patchLog.patchReason != ''">
			and r.patch_reason regexp #{patchLog.patchReason}
			</if>
			<if test="patchLog.patchArea != null and patchLog.patchArea != ''">
			and r.patch_area regexp #{patchLog.patchArea}
			</if>
			<if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
			and r.quality_inspector regexp #{patchLog.qualityInspector}
			</if>
			<if test="patchLog.patchProcesses != null and patchLog.patchProcesses != ''">
			and r.patch_processes regexp #{patchLog.patchProcesses}
			</if>
			<if test="patchLog.reviewer != null and patchLog.reviewer != ''">
			and r.reviewer regexp #{patchLog.reviewer}
			</if>
			</where>
			order by r.review_status,r.id desc
			limit #{offset},#{pageSize};
			@@ -62,6 +137,81 @@
			on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
			<where>
			date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
			<if test="patchLog.patchId != null and patchLog.patchId != ''">
			and r.patch_id regexp #{patchLog.patchId}
			</if>
			<if test="patchLog.orderId != null and patchLog.orderId != ''">
			and r.order_id regexp #{patchLog.orderId}
			</if>
			<if test="patchLog.reportingWorkId != null and patchLog.reportingWorkId != ''">
			and r.reporting_work_id regexp #{patchLog.reportingWorkId}
			</if>
			<if test="patchLog.processId != null and patchLog.processId != ''">
			and r.process_id regexp #{patchLog.processId}
			</if>
			<if test="patchLog.project != null and patchLog.project != ''">
			and o.project regexp #{patchLog.project}
			</if>
			<if test="patchLog.batch != null and patchLog.batch != ''">
			and o.batch regexp #{patchLog.batch}
			</if>
			<if test="patchLog.orderSort != null and patchLog.orderSort != ''">
			and r.order_sort regexp #{patchLog.orderSort}
			</if>
			<if test="patchLog.buildingNumber != null and patchLog.buildingNumber != ''">
			and od.building_number regexp #{patchLog.buildingNumber}
			</if>
			<if test="patchLog.productName != null and patchLog.productName != ''">
			and od.product_name regexp #{patchLog.productName}
			</if>
			<if test="patchLog.technologyNumber != null and patchLog.technologyNumber != ''">
			and r.technology_number regexp #{patchLog.technologyNumber}
			</if>
			<if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
			and r.quality_inspector regexp #{patchLog.qualityInspector}
			</if>
			<if test="patchLog.width != null and patchLog.width != ''">
			and od.width regexp #{patchLog.width}
			</if>
			<if test="patchLog.height != null and patchLog.height != ''">
			and od.height regexp #{patchLog.height}
			</if>
			<if test="patchLog.shape != null and patchLog.shape != ''">
			and od.shape regexp #{patchLog.shape}
			</if>
			<if test="patchLog.patchNum != null and patchLog.patchNum != ''">
			and r.patch_num regexp #{patchLog.patchNum}
			</if>
			<if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
			and ogd.glass_address regexp #{patchLog.glassAddress}
			</if>
			<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
			and r.responsible_team regexp #{patchLog.responsibleTeam}
			</if>
			<if test="patchLog.responsibleEquipment != null and patchLog.responsibleEquipment != ''">
			and r.responsible_equipment regexp #{patchLog.responsibleEquipment}
			</if>
			<if test="patchLog.responsiblePersonnel != null and patchLog.responsiblePersonnel != ''">
			and r.responsible_personnel regexp #{patchLog.responsiblePersonnel}
			</if>
			<if test="patchLog.patchType != null and patchLog.patchType != ''">
			and r.patch_type regexp #{patchLog.patchType}
			</if>
			<if test="patchLog.patchReason != null and patchLog.patchReason != ''">
			and r.patch_reason regexp #{patchLog.patchReason}
			</if>
			<if test="patchLog.patchArea != null and patchLog.patchArea != ''">
			and r.patch_area regexp #{patchLog.patchArea}
			</if>
			<if test="patchLog.qualityInspector != null and patchLog.qualityInspector != ''">
			and r.quality_inspector regexp #{patchLog.qualityInspector}
			</if>
			<if test="patchLog.patchProcesses != null and patchLog.patchProcesses != ''">
			and r.patch_processes regexp #{patchLog.patchProcesses}
			</if>
			<if test="patchLog.reviewer != null and patchLog.reviewer != ''">
			and r.reviewer regexp #{patchLog.reviewer}
			</if>
			</where>
			) as zu
			limit #{offset},#{pageSize};
			@@ -165,10 +315,10 @@
			and dd.reporting_work_id regexp #{patchLogAddDTO.reportingWorkId}
			</if>
			<if test="patchLogAddDTO.productionId != null and patchLogAddDTO.productionId != ''">
			and rw.process_id regexp #{patchLogAddDTO.productionId}
			and rw.production_id regexp #{patchLogAddDTO.productionId}
			</if>
			<if test="patchLogAddDTO.processId != null and patchLogAddDTO.processId != ''">
			and o.order_id regexp #{patchLogAddDTO.processId}
			and rw.process_id regexp #{patchLogAddDTO.processId}
			</if>
			<if test="patchLogAddDTO.project != null and patchLogAddDTO.project != ''">
			and o.project regexp #{patchLogAddDTO.project}