Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop

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

@@ -1136,21 +1136,22 @@
             <param name="allotid"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             获取医院其他绩效列表
             </summary>
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprGroupList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprGroupList(System.Int32,Performance.DtoModels.AllotIdRequest)">
             <summary>
             医院其他绩效审核
             </summary>
+            <param name="isAudit">0 其他绩效列表 1 审核列表</param>
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.EntityModels.per_apr_amount)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             医院其他绩效审核详情
             </summary>
@@ -1178,6 +1179,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.CommitResult(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            医院其他绩效提交、撤销
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.AuditResult(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             医院其他绩效审核;驳回、成功
@@ -1211,6 +1218,13 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.ClearAprData(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            清理该科室录入数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeMessage(Performance.EntityModels.per_apr_amount)">
              <summary>
              自动获取人员信息
@@ -1234,17 +1248,18 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideList(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             获取不公示其他绩效列表
             </summary>
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideGroupList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideGroupList(System.Int32,Performance.DtoModels.AllotIdRequest)">
             <summary>
             不公示其他绩效审核
             </summary>
+            <param name="isAudit"></param>
             <param name="request"></param>
             <returns></returns>
         </member>
@@ -1276,6 +1291,12 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.CommitResultHide(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            医院其他绩效提交、撤销
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.AuditResultHide(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             不公示其他绩效审核;驳回、成功
@@ -1309,6 +1330,13 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.ClearAprHideData(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            清理该科室录入不公示数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetDeptComparison(Performance.DtoModels.ComparisonPagingRequest)">
             <summary>
             实发绩效比对

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

@@ -1909,6 +1909,15 @@
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.AllotId">
             <summary> 绩效ID </summary>
         </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.TypeInDepartment">
+            <summary> 录入科室 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.CreateDate">
+            <summary> 创建时间 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.Status">
+            <summary> 提交 1、撤销 2、提交 </summary>
+        </member>
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.IsPass">
             <summary> 审核结果 1、审核通过 2、驳回 </summary>
         </member>

performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs

@@ -7,24 +7,30 @@ namespace Performance.DtoModels
 {
     public class AprAmountAuditRequest
     {
-        public class Member
-        {
-            public string PersonnelNumber { get; set; }
-            public string DoctorName { get; set; }
-        }
         /// <summary> 绩效ID </summary>
         public int AllotId { get; set; }
-        public List<Member> Members { get; set; }
+
+        /// <summary> 录入科室 </summary>
+        public string TypeInDepartment { get; set; }
+
+        /// <summary> 创建时间 </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary> 提交 1、撤销 2、提交 </summary>
+        public int Status { get; set; }
+
         /// <summary> 审核结果 1、审核通过 2、驳回 </summary>
         public int IsPass { get; set; }
+
         /// <summary> 备注 </summary>
         public string Remark { get; set; }
+
+        public List<Member> Members { get; set; }
     }
-    public class AprAmountAuditRequestValidator : AbstractValidator<AprAmountAuditRequest>
+
+    public class Member
     {
-        public AprAmountAuditRequestValidator()
-        {
-            RuleFor(x => x.IsPass).NotNull().NotEmpty().InclusiveBetween(1, 2);
-        }
+        public string PersonnelNumber { get; set; }
+        public string DoctorName { get; set; }
     }
 }

performance/Performance.DtoModels/Response/OhterAmountAuditResponse.cs

@@ -11,7 +11,10 @@ public class OhterAmountAuditResponse
         public string TypeInDepartment { get; set; }
         public decimal Amount { get; set; }
         public int? Status { get; set; }
+        public string CreateDate { get; set; }
+        public string PerforType { get; set; }
         public string AuditTime { get; set; }
         public string Remark { get; set; }
+        public bool ShowCommit { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -74,7 +74,7 @@ public class per_apr_amount
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
+        public DateTime CreateDate { get; set; }
 
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/per_apr_amount_hide.cs

@@ -69,7 +69,7 @@ public class per_apr_amount_hide
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
+        public DateTime CreateDate { get; set; }
 
         /// <summary>
         /// 

performance/Performance.Repository/PerforPerapramountRepository.cs

@@ -64,7 +64,7 @@ public partial class PerforPerapramountRepository : PerforRepository<per_apr_amo
         //}
 
 
-        public List<view_per_apr_amount> GetFullAmount(int? allotId, int? status, string typeInDepartment = "")
+        public List<view_per_apr_amount> GetFullAmount(int? allotId, int? status, string typeInDepartment = "", DateTime? date = null)
         {
             string sql = "select AllotId, PersonnelNumber, Trim(AccountingUnit) AccountingUnit, UnitType, DoctorName, PerforType, Amount, TypeInDepartment, Status, Remark from view_other_amount where ifnull(amount,0)<>0 ";
 
@@ -85,6 +85,11 @@ public List<view_per_apr_amount> GetFullAmount(int? allotId, int? status, string
                 sql += " and typeInDepartment = @typeInDepartment";
                 parameters.Add(name: "typeInDepartment", typeInDepartment);
             }
+            if (date.HasValue)
+            {
+                sql += " and createDate = @createDate";
+                parameters.Add(name: "createDate", date);
+            }
 
             return DapperQuery<view_per_apr_amount>(sql, parameters).ToList();
         }