diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index ff2fff40..529e3b51 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -869,12 +869,12 @@ a.ActualDate, a.FunctionType, a.CreateDate, - d.operator_name as createBy, + dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy, a.Remark, a.StartTime, a.EndTime, a.WorkTime, - dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName, + dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName, a.checkerName, dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName, eo.ObjectDesc as objectDesc, @@ -1013,12 +1013,12 @@ a.ActualDate, a.FunctionType, a.CreateDate, - d.operator_name as createBy, + dbo.eam_Get_eamAdminName_TPM(a.Site,a.CreateBy) as createBy, a.Remark, a.StartTime, a.EndTime, a.WorkTime, - dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as planOperatorName, + dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as planOperatorName, b.DefectID, c.DefectDesc, e.ObjectDesc as objectDesc, @@ -1645,12 +1645,12 @@ a.deleteFlag, a.CreatedDate, a.CreatedBy, - c.operator_name as feedbackBy, + dbo.eam_Get_eamAdminName_TPM(a.site,a.CreatedBy) as feedbackBy, a.UpdateDate, a.UpdateBy, a.Version, a.DefectDate, - dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) as PlanOperatorName, + dbo.eam_Get_eamAdminName_TPM(a.Site,a.PlanOperator) as PlanOperatorName, b.defectDesc, e.ObjectDesc as ObjectDesc, FinishDate,