计算工资

    审批模板
 增加 comments 审批申请备注信息，可能有多个备注节点

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -832,7 +832,21 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(true, "操作成功!", data.checkindata));
         }
 
-
+        /// <summary>
+        /// 审批详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostApprovalDetailAsync(string spNo)
+        {
+            if (string.IsNullOrEmpty(spNo))
+            {
+                return Ok(JsonView(false, "审批单号不能为空!!"));
+            }
+            var data = await _qiYeWeChatApiService.GetApprovalDetailAsync(spNo);
+            return Ok(JsonView(true, "操作成功!", data));
+        }
         #endregion
 
     }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/IQiYeWeChatApiService.cs

@@ -125,5 +125,12 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// <param name="template_id">模板Id</param>
         /// <returns></returns>
         Task<TemplateDetailView> GetTemplateDetailAsync(string template_id);
+
+        /// <summary>
+        /// 获取审批详情
+        /// </summary>
+        /// <param name="spNo">审批No</param>
+        /// <returns></returns>
+        Task<ApprovalDetailView> GetApprovalDetailAsync(string spNo);
     }
 }

OASystem/OASystem.Api/OAMethodLib/QiYeWeChatAPI/QiYeWeChatApiService.cs

@@ -1121,7 +1121,7 @@ namespace OASystem.API.OAMethodLib.QiYeWeChatAPI
         /// </summary>
         /// <param name="sp_no"></param>
         /// <returns></returns>
-        private async Task<ApprovalDetailView> GetApprovalDetailAsync(string sp_no)
+        public async Task<ApprovalDetailView> GetApprovalDetailAsync(string sp_no)
         {
             ApprovalDetailView ApprovalDetailView = new ApprovalDetailView();
 

OASystem/OASystem.Domain/ViewModels/QiYeWeChat/ApprovalDataView.cs

@@ -614,9 +614,10 @@ namespace OASystem.Domain.ViewModels.QiYeWeChat
         /// <summary>
         /// 审批申请备注信息，可能有多个备注节点
         /// </summary>
-        public List<string> comments { get; set; }
+        public List<Comment> comments { get; set; }
     }
 
+
     /// <summary>
     /// 审批申请备注信息
     /// </summary>
@@ -638,7 +639,7 @@ namespace OASystem.Domain.ViewModels.QiYeWeChat
         public string commentcontent { get; set; }
 
         /// <summary>
-        /// commentid
+        /// 	备注id
         /// </summary>
         public string commentid { get; set; }