修改handsontable返回type类型

performance/Performance.Services/AttendanceService.cs

@@ -125,15 +125,23 @@ public HandsonTable GetBatchCallInHandsonTable()
                     column.Type = "text";
                     if (column.Data == "调入组别")
                     {
+                        column.Type = "autocomplete";
                         column.Source = EnumHelper.GetItems<UnitType>().Select(w => w.Description.Replace("行政后勤", "行政工勤")).ToArray();
                         column.Strict = true;
                     }
 
                     if (column.Data == "调入核算单元")
                     {
+                        column.Type = "autocomplete";
                         column.Source = EnumHelper.GetItems<AccountUnitType>().Where(w => w.Description != "").Select(w => w.Description).ToArray();
                         column.Strict = true;
                     }
+
+                    if (column.Data == "调入时间")
+                    {
+                        column.Type = "date";
+                        column.DateFormat = "YYYY/MM/DD";
+                    }
                 }
             }
             return handson;
@@ -148,6 +156,15 @@ public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData requ
             if (dicData == null || dicData.Count == 0)
                 return new ApiResponse(ResponseType.Error, "空数据，无效操作");
 
+            var convertDicData = dicData.Select(w => new per_attendance
+            {
+                PersonnelNumber = w["AttendanceName"],
+                PersonnelName = w["PersonnelName"],
+                CallInAccountingUnit = w["CallInAccountingUnit"],
+                CallInUnitType = w["CallInUnitType"],
+                CallInDate = ConvertHelper.To<DateTime>(w["CallInDate"]),
+            });
+
             var jsons = JsonHelper.Serialize(dicData);
             var newAttendanceVacatione = JsonHelper.Deserialize<List<per_attendance>>(jsons);
             var oldCallinAttendance = perforPerAttendanceRepository.GetEntities(t => t.AllotId == allotId && t.HospitalId == hospitalId);
@@ -337,7 +354,7 @@ public HandsonTable GetAttendanceVacationHandsonTable()
                     column.Type = "text";
                     if (column.Data.Contains("时间"))
                     {
-                        column.Type = "DateFormat";
+                        column.Type = "date";
                         column.DateFormat = "YYYY/MM/DD";
                     }
                     if (column.Data == "考勤类型")
@@ -390,7 +407,17 @@ public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData
             if (dicData == null || dicData.Count == 0)
                 return new ApiResponse(ResponseType.Error, "空数据，无效操作");
 
-            var jsons = JsonHelper.Serialize(dicData);
+
+            var convertDicData = dicData.Select(w => new RecordAttendcance
+            {
+                PersonnelNumber = w["AttendanceName"],
+                PersonnelName = w["PersonnelName"],
+                AttendanceName = w["AttendanceName"],
+                BegDate = ConvertHelper.To<DateTime>(w["BegDate"]),
+                EndDate = ConvertHelper.To<DateTime>(w["EndDate"]),
+            });
+
+            var jsons = JsonHelper.Serialize(convertDicData);
             var newAttendanceVacatione = JsonHelper.Deserialize<List<RecordAttendcance>>(jsons);
             var oldAttendanceVacatione = perfoPperAttendanceVacationeRepository.GetEntities(t => t.AllotId == allotId && t.HospitalId == hospitalId);