新增提取日志显示，自定义加载上次配置

performance/Performance.Api/Controllers/ConfigController.cs

@@ -813,5 +813,43 @@ public ApiResponse SaveDrugtypeFactor([FromBody] DrugtypeFactorRequest request)
         }
 
         #endregion
+
+        /// <summary>
+        /// 加载上次
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("loadthelasttime")]
+        public ApiResponse LoadTheLastTime([FromBody] CopyRequest request)
+        {
+            var allot = _allotService.GetAllot(request.AllotId);
+            if (allot == null)
+                return new ApiResponse(ResponseType.ParameterError, "AllotID错误");
+
+            _configService.NewCopy(request);
+            return new ApiResponse(ResponseType.OK, "保存成功！");
+        }
+
+
+        /// <summary>
+        /// 下拉
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("copydropdown")]
+        public ApiResponse CopyDropDown()
+        {
+            var result = new List<CopyDrop>
+            {
+                new CopyDrop{Label="工作量配置",Value="workItems"},
+                new CopyDrop{Label="收入费用类别",Value="drugTypes"},
+                new CopyDrop{Label="支出费用类别",Value="drugTypeDisburses"},
+                new CopyDrop{Label="费用类别系数",Value="drugTypeFactors"},
+                new CopyDrop{Label="科室类型",Value="deptTypes"},
+                new CopyDrop{Label="二次绩效配置",Value="agains"},
+                new CopyDrop{Label="核算单元及组别",Value="accountings"},
+            }; ;
+            return new ApiResponse(ResponseType.OK, result);
+        }
     }
 }
\ No newline at end of file

performance/Performance.Api/Controllers/TemplateController.cs

@@ -285,6 +285,21 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
             // B 使用配置作为模板
         }
 
+
+        /// <summary>
+        /// 提取日志
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("PrejudgeLog/{allotId}")]
+        public ApiResponse PrejudgeLog([FromRoute] int allotId)
+        {
+            var allot = allotService.GetAllot(allotId);
+            if (allot == null)
+                return new ApiResponse(ResponseType.ParameterError, "AllotID错误");
+            var result=logService.GetLogDbug(allotId);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
         #endregion 新版提取
 
         /// <summary>
@@ -439,5 +454,7 @@ public IActionResult ExtractIncome(int allotId)
             var memi = provider.Mappings[fileExt];
             return File(memoryStream, memi, Path.GetFileName(filepath));
         }
+
+
     }
 }

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

@@ -843,6 +843,20 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.LoadTheLastTime(Performance.DtoModels.CopyRequest)">
+            <summary>
+            加载上次
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.CopyDropDown">
+            <summary>
+            下拉
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.CostTransferController.SubmitApplications(Performance.DtoModels.CostTransferRequest)">
             <summary>
             申请划拨
@@ -1946,6 +1960,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.TemplateController.PrejudgeLog(System.Int32)">
+            <summary>
+            提取日志
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.TemplateController.DownFile(Performance.DtoModels.AllotRequest)">
             <summary>
             从WebAPI下载文件

performance/Performance.DtoModels/Request/CopyRequest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class CopyRequest
+    {
+        public int AllotId { get; set; }
+
+        public string[] Type { get; set; }
+    }
+
+    public class CopyDrop
+    {
+        public string  Label { get; set; }
+        public string Value { get; set; }
+    }
+}

performance/Performance.Services/LogManageService.cs

@@ -3,9 +3,11 @@
 using Microsoft.Extensions.Options;
 using Performance.DtoModels;
 using Performance.DtoModels.AppSettings;
+using Performance.EntityModels;
 using Performance.Infrastructure;
 using Performance.Repository;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Performance.Services
@@ -130,5 +132,11 @@ public bool ClearExtractLog(int allotId)
         {
             return logdbug.ClearExtractLog(allotId);
         }
+
+        //todo:log信息展示
+        public List<log_dbug> GetLogDbug(int allotId)
+        {
+            return logdbug.GetEntities(t => t.AllotID == allotId && t.Type==2);
+        }
     }
 }

performance/Performance.Services/UserService.cs

@@ -760,7 +760,7 @@ public string SaveUserHandsFlat(UserCollectData request)
                 var getUsers = _userRepository.GetEntities();
                 var roles = _roleRepository.GetEntities();
                 var hospitals = _hospitalRepository.GetEntities();
-                //hack:后续修改为accounting中的数据
+                
                 var accounts = perforCofaccountingRepository.GetEntities();
                 //var allot = _perallotRepository.GetEntities(t => t.HospitalId == request.HospitalId);
                 //var res = accounts?.Join(allot, t => t.AllotId, w => w.ID, (t, w) => new cof_accounting { AccountingUnit = t.AccountingUnit }).Distinct();