Auto stash before merge of "feature/second" and "origin/feature/second"

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Performance.DtoModels;
+using Performance.EntityModels;
 using Performance.Services;
 using System;
 using System.Collections.Generic;
@@ -42,8 +43,17 @@ public ApiResponse List()
         /// <returns></returns>
         [Route("api/second/savevalue")]
         [HttpPost]
-        public ApiResponse SaveValue()
+        public ApiResponse SaveValue([FromBody]List<ag_fixatitem> request)
         {
+            var count = request.Where(t => t.SecondId > 0).Select(t => t.SecondId).Distinct().Count();
+            if (count == 0 || request.Any(t => t.SecondId == 0))
+                throw new PerformanceException("二次绩效ID错误");
+
+            var repetition = request.GroupBy(t => new { t.RowNumber, t.ItemName }).Where(t => t.Count() > 1);
+            if (repetition.Any())
+                throw new PerformanceException(string.Join(";", repetition.Select(t => $"行{t.Key.RowNumber}项{t.Key.ItemName}重复录入")));
+
+            var result = secondAllotService.SaveValue(request);
             return new ApiResponse(ResponseType.OK);
         }
 

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

@@ -721,7 +721,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.SaveValue">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SaveValue(System.Collections.Generic.List{Performance.EntityModels.ag_fixatitem})">
             <summary>
             二次绩效项目内容保存
             </summary>
@@ -733,25 +733,37 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadList">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.UseTemp(Performance.DtoModels.UseTempRequest)">
+            <summary>
+            使用二次绩效模板
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.RefreshTemp">
+            <summary>
+            应用模板
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadList(Performance.DtoModels.WorkloadRequest)">
             <summary>
             二次绩效工作量列表
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadAdd">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadAdd(Performance.DtoModels.WorkloadRequest)">
             <summary>
             二次绩效工作量新增
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadUpdate">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadUpdate(Performance.DtoModels.WorkloadRequest)">
             <summary>
             二次绩效工作量修改
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadDelete">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkloadDelete(Performance.DtoModels.WorkloadRequest)">
             <summary>
             二次绩效工作量删除
             </summary>
@@ -763,12 +775,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.UseTemp">
-            <summary>
-            使用二次绩效模板
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:Performance.Api.Controllers.SheetController.SheetList(Performance.DtoModels.SheetRequest)">
             <summary>
             sheet 列表

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

@@ -1509,6 +1509,41 @@
             工作量绩效项
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.Id">
+            <summary>
+            绩效ID
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.HospitalId">
+            <summary>
+            医院ID
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.Department">
+            <summary>
+            科室
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.UnitType">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.ItemName">
+            <summary>
+            工作量名称
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.FactorValue">
+            <summary>
+            工作量系数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.Sort">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
             <summary>
             最大工龄范围（小于）

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

@@ -34,6 +34,9 @@
         <member name="P:Performance.EntityModels.PerformanceDbContext.ag_tempitem">
             <summary> 二次绩效模板项 </summary>
         </member>
+        <member name="P:Performance.EntityModels.PerformanceDbContext.ag_usetemp">
+            <summary>  </summary>
+        </member>
         <member name="P:Performance.EntityModels.PerformanceDbContext.ag_workload">
             <summary> 二次绩效工作量绩效 </summary>
         </member>
@@ -471,6 +474,11 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_fixatitem.RowNumber">
+            <summary>
+            行号
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_fixatitem.ItemName">
             <summary>
             项目名
@@ -481,6 +489,11 @@
             值
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_fixatitem.FactorValue">
+            <summary>
+            系数
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_fixatitem.Sort">
             <summary>
             排序
@@ -488,7 +501,7 @@
         </member>
         <member name="P:Performance.EntityModels.ag_fixatitem.Type">
             <summary>
-            字段类型 1 顶部概况 2 表格固定
+            字段类型 1 顶部概况 2 表格固定 3 工作量
             </summary>
         </member>
         <member name="P:Performance.EntityModels.ag_fixatitem.SourceType">
@@ -691,6 +704,36 @@
             1 自动带出 2 计算得出
             </summary>
         </member>
+        <member name="T:Performance.EntityModels.ag_usetemp">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_usetemp.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_usetemp.HospitalId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_usetemp.Department">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_usetemp.UnitType">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_usetemp.UseTempId">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ag_workload">
             <summary>
             二次绩效工作量绩效
@@ -701,14 +744,19 @@
             
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_workload.AllotId">
+        <member name="P:Performance.EntityModels.ag_workload.HospitalId">
             <summary>
-            绩效ID
+            医院ID
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_workload.SecondId">
+        <member name="P:Performance.EntityModels.ag_workload.Department">
             <summary>
-            二次绩效ID
+            科室
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_workload.UnitType">
+            <summary>
+            
             </summary>
         </member>
         <member name="P:Performance.EntityModels.ag_workload.ItemId">

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -7,65 +7,65 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Performance.EntityModels	
+namespace Performance.EntityModels
 {
     /// <summary>
     /// 二次绩效固定项
     /// </summary>
     [Table("ag_fixatitem")]
-	public class ag_fixatitem
+    public class ag_fixatitem
     {
         /// <summary>
         /// 
         /// </summary>
         [Key]
-		public int Id { get; set; }
-    
+        public int Id { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
         public Nullable<int> AllotId { get; set; }
-    
+
         /// <summary>
         /// 二次绩效ID
         /// </summary>
         public Nullable<int> SecondId { get; set; }
-    
+
         /// <summary>
         /// 
         /// </summary>
         public string UnitType { get; set; }
-    
+
         /// <summary>
         /// 行号
         /// </summary>
         public Nullable<int> RowNumber { get; set; }
-    
+
         /// <summary>
         /// 项目名
         /// </summary>
         public string ItemName { get; set; }
-    
+
         /// <summary>
         /// 值
         /// </summary>
         public Nullable<decimal> ItemValue { get; set; }
-    
+
         /// <summary>
         /// 系数
         /// </summary>
         public Nullable<decimal> FactorValue { get; set; }
-    
+
         /// <summary>
         /// 排序
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
-    
+
         /// <summary>
         /// 字段类型 1 顶部概况 2 表格固定 3 工作量
         /// </summary>
         public Nullable<int> Type { get; set; }
-    
+
         /// <summary>
         /// 1 自动带出 2 计算得出
         /// </summary>

performance/Performance.Services/SecondAllotService.cs

@@ -153,7 +153,7 @@ public void RefreshTemp(int secondId)
             if (fixatList == null || fixatList.Count == 0)
                 throw new PerformanceException("参数secondId 无效");
 
-
+            throw new NotImplementedException();
         }
 
         /// <summary>
@@ -166,6 +166,30 @@ public List<ag_workload> GetWorkloadList(WorkloadRequest request)
             return perforAgworkloadRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.Department);
         }
 
+        public bool SaveValue(List<ag_fixatitem> request)
+        {
+            var secondId = request.First().SecondId;
+            var fixatitems = perforAgfixatitemRepository.GetEntities(t => t.SecondId == secondId);
+            foreach (var item in request)
+            {
+                if (fixatitems != null && fixatitems.Any(t => t.SecondId == secondId && t.RowNumber == item.RowNumber && t.ItemName == item.ItemName))
+                {
+                    var cellItem = fixatitems.First(t => t.SecondId == secondId && t.RowNumber == item.RowNumber && t.ItemName == item.ItemName);
+                    cellItem.ItemValue = item.ItemValue;
+                    cellItem.Sort = item.Sort;
+                    cellItem.SourceType = item.SourceType;
+                    cellItem.Type = item.Type;
+                    cellItem.UnitType = item.UnitType;
+                    perforAgfixatitemRepository.Update(cellItem);
+                }
+                else
+                {
+                    perforAgfixatitemRepository.Add(item);
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// 新增
         /// </summary>