1

src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java

@@ -36,8 +36,8 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     private String difficultyRemark;
     private String planPeriod;
     private String planCycle;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "HH:mm")
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
     private Date taskStartDate;
     // 审核员名称
     private String checkerName;

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

@@ -741,7 +741,7 @@
             a.WorkTime,
             a.PlanOperatorName,
             a.checkerName,
-            dbo.eam_Get_eamAdminName(a.Site, a.ActualOperator) as actualOperatorName,
+            dbo.eam_Get_eamAdminName_TPM(a.Site, a.ActualOperator) as actualOperatorName,
             eo.ObjectDesc as objectDesc,
             dbo.eam_Get_eam_properties_CodeDesc(a.site, a.bu_no, a.FunctionType, a.PropertiesCode) as codeDesc,
             a.result,