2024-01-12

升级bu3

src/main/resources/mapper/pms/EamMapper.xml

@@ -691,7 +691,7 @@
             a.reach_operator_name,
             b.FeedBackDesc,
             dbo.joint_id(a.Site, a.bu_no, a.OrderNo, a.FunctionType) as adminID,
-            dbo.joint_name(a.Site, a.OrderNo, a.FunctionType) as operator,
+            dbo.joint_name(a.Site, a.bu_no, a.OrderNo, a.FunctionType) as operator,
             a.check_remark,
             a.document_source
         FROM eam_workOrder a
@@ -813,7 +813,7 @@
                 ELSE DATEDIFF(MINUTE, b.CreatedDate, a.reach_date)
                 END AS responseTime,
                 b.FeedBackDesc,
-                dbo.joint_name(a.Site,a.OrderNo,a.FunctionType) as actualOperatorName,
+                dbo.joint_name(a.Site,a.bu_no,a.OrderNo,a.FunctionType) as actualOperatorName,
                 a.fault_reason,
                 a.preventive_measure,
                 a.document_source
@@ -1357,7 +1357,7 @@
             b.defectDesc,
             dbo.eam_Get_eamObjectDesc(a.Site, a.bu_no, a.ObjectID) ObjectDesc,
             FinishDate,
-            dbo.joint_name(a.Site,(select OrderNo from eam_workOrder where PlanID = a.FeedBackID and site = a.site and Result = '维修完成' and bu_no = a.bu_no),a.FunctionType) as actualOperatorName
+            dbo.joint_name(a.Site, a.bu_no, (select OrderNo from eam_workOrder where PlanID = a.FeedBackID and site = a.site and Result = '维修完成' and bu_no = a.bu_no),a.FunctionType) as actualOperatorName
         from eam_defect_feedBack a
         left join eam_defect b on a.DefectID = b.DefectID
         left join operator as c on a.site = c.site and a.CreatedBy = c.operator_id