特殊核算单元数据写入、handsontable加载数据时不同列数据类型的切换

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -397,7 +397,7 @@
             保存采集内容
             </summary>
         </member>
-        <member name="M:Performance.Api.Controllers.CollectController.SubmitCollectData(System.Int32,System.String)">
+        <member name="M:Performance.Api.Controllers.CollectController.SubmitCollectData(System.Int32,Performance.DtoModels.SaveCollectData)">
             <summary>
             提交采集信息
             </summary>

performance/Performance.DtoModels/HandsonTable.cs

@@ -88,12 +88,16 @@ private void InitColHeaders(int sheetType, string[] cols)
 
         private void InitColumns(List<collect_permission> permissions)
         {
+            var defaults = new List<string> { "核算单元（医技组）", "核算单元（医生组）", "核算单元（护理组）", "核算单元", "科室名称" };
+
             List<HandsonColumn> columns = new List<HandsonColumn>();
             foreach (var col in ColHeaders)
             {
                 var item = col.ToLower();
                 var readnoly = _permissions.FirstOrDefault(f => f.HeadName == item)?.Readnoly == 1;
-                columns.Add(new HandsonColumn(item.ToLower(), readnoly));
+
+                DataFormat format = defaults.Contains(col) ? DataFormat.普通格式 : DataFormat.小数;
+                columns.Add(new HandsonColumn(item.ToLower(), readnoly, format));
             }
             Columns = columns;
         }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -147,7 +147,7 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
             ExtractHelper.CreateNotExistSheet(models, workbook);
 
             var employeeDict = peremployeeRepository.GetEntities(t => t.AllotId == allot.ID);
-            var collectData = collectdataRepository.GetEntities(t => t.AllotID == allot.ID);
+            var collectData = collectdataRepository.GetEntities(t => t.AllotID == allot.ID && t.Status == 3);
 
             var drugfactorData = drugtypefactorRepository.GetEntities(t => t.AllotID == allot.ID) ?? new List<cof_drugtype_factor>();
             if (!exdict.ContainsKey(ExDataDict.IncomeFactor))

performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs

@@ -22,6 +22,17 @@ public SpecialUnitDataWrite(ILogger logger)
 
         public void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, List<collect_data> collects, Dictionary<ExDataDict, object> exdict = null)
         {
+            if (collects == null || !collects.Any()) return;
+
+            var data = collects.Select(t => new ExtractTransDto
+            {
+                Department = t.Department,
+                SpecialAccounting = t.Department,
+                Category = t.TypeName,
+                Value = ConvertHelper.To<decimal>(t.CellValue)
+            }).ToList();
+
+            WriteSheetData(sheet, point, sheetType, style, data, exdict);
         }
 
         public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetType, ExcelStyle style, object data, Dictionary<ExDataDict, object> exdict = null)