优化

Src/Configs.cs

@@ -39,6 +39,8 @@ namespace Kivii.Finances.Seeyon
         internal static string templateCodeInvoiceVoid = "InvoiceVoid";//OA提供
         internal static string templateCodeInvoiceRedOffset = "InvoiceRedOffset";//OA提供
         internal static string templateCodeIncome = "DEPARTMENTALREVENUE";//OA提供
+        internal static string templateCodeContract = "contractFile";//OA提供
+        internal static string templateCodeContractRightId = "7866746717091285245.6832991593302278445_-6245354230910071662.-712354477639973320_683831699372263267.-3542418042388265102";//OA提供
 
         internal static string restUserName = "settlement";//"rest";
         internal static string restPassword = "53aab6e3-05e5-4f6f-9084-38247e6142b6";//"fba09671-2b1e-4c8c-9aaf-de16821070df";

Src/Entities/OaEntity.cs

@@ -35,7 +35,7 @@ namespace Kivii.Finances.Seeyon.Entities
         /// <summary>
         /// 表单模版code（与应用绑定中保持一致）
         /// </summary>
-        public string templateCode { get; set; }
+        public string templateCode { get; set; } = Configs.templateCodeContract;
 
         /// <summary>
         /// 导出数据的起始时间.eg:2020-06-30
@@ -50,7 +50,7 @@ namespace Kivii.Finances.Seeyon.Entities
         /// <summary>
         /// 权限id
         /// </summary>
-        public string rightId { get; set; }
+        public string rightId { get; set; } = Configs.templateCodeContractRightId;
 
         /// <summary>
         /// 数据id

Src/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.4020")]
-[assembly: AssemblyFileVersion("5.4.2024.4020")]
+[assembly: AssemblyVersion("5.4.2024.7290")]
+[assembly: AssemblyFileVersion("5.4.2024.7290")]

Src/RestfulOA.cs

@@ -28,23 +28,48 @@ namespace Kivii.Finances.Seeyon
         }
     }
 
+    [RequiresAnyRole(SystemRoles.Everyone)]
     public class ContractGetFromOa : RestfulExecution<Contract>
     {
-        public RequestOaContract Item { get; set; }
+        /// <summary>
+        /// 导出数据的起始时间.eg:2020-06-30
+        /// </summary>
+        public DateTime BeginTime { get; set; }
+
+        /// <summary>
+        /// 导出数据的截止创建时间.eg:2020-06-30
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 权限id
+        /// </summary>
+        public string rightId { get; set; } = Configs.templateCodeContractRightId;
+
 
         public string loginName { get; set; }
 
         public override object OnExecution(IRequest req, IResponse res)
         {
+            if (loginName.IsNullOrEmpty())
+            {
+                var session = KiviiContext.Request.GetSession();
+                loginName = session.FullName;
+            }
+            var item = new RequestOaContract();
+            if (BeginTime == DateTime.MinValue) item.beginDateTime = $"{DateTime.Now.Year}-01-01";
+            else item.beginDateTime = $"{BeginTime.ToString("yyyy-MM-dd")}";
+            if (EndTime == DateTime.MinValue) item.endDateTime = DateTime.Now.ToString("yyyy-MM-dd");
+            else item.endDateTime = $"{EndTime.ToString("yyyy-MM-dd")}";
             var client = new JsonServiceClient(Configs.BaseUrl);
             var token = client.RequestRestToken(loginName);
-            var reps = client.RequestGetOaContract(Item, token);
+            var reps = client.RequestGetOaContract(item, token);
             var rtns = new RestfulQueryResponse<Contract>();
             rtns.Results = new List<Contract>();
 
-            foreach (var item in reps.data.data.data)
+            foreach (var data in reps.data.data.data)
             {
-                var oaData = item.masterData;
+                var oaData = data.masterData;
                 var rtn = new Contract();
                 rtn.ContractNumber = oaData.Field0063.showValue;
                 rtn.SerialNumber = oaData.Field0081.showValue;
@@ -52,6 +77,10 @@ namespace Kivii.Finances.Seeyon
                 rtn.Field0060 = oaData.Field0060.showValue;
                 rtn.Field0062 = oaData.Field0062.showValue;
                 rtn.ApplierName = oaData.Field0059.showValue;
+                //if (DateTime.TryParse(oaData.Field0043.showValue, out var field0043))
+                //{
+                //    rtn.ApplyTime = field0043;
+                //}
                 rtn.ApplyTime = oaData.Field0043.showValue;
                 rtn.ApplyDepart = oaData.Field0078.showValue;
                 rtn.DepartCode = oaData.Field0079.showValue;
@@ -73,6 +102,14 @@ namespace Kivii.Finances.Seeyon
                 rtn.Type = oaData.Field0011.showValue;
                 rtn.Field0072 = oaData.Field0072.showValue;
                 rtn.AgreeYear = oaData.Field0012.showValue;
+                //if (DateTime.TryParse(oaData.Field0045.showValue, out var field0045))
+                //{
+                //    rtn.AgreeBeginTime = field0045;
+                //}
+                //if (DateTime.TryParse(oaData.Field0046.showValue, out var field0046))
+                //{
+                //    rtn.AgreeEndTime = field0046;
+                //}
                 rtn.AgreeBeginTime = oaData.Field0045.showValue;
                 rtn.AgreeEndTime = oaData.Field0046.showValue;
                 rtn.RateText = oaData.Field0014.showValue;
@@ -85,9 +122,17 @@ namespace Kivii.Finances.Seeyon
                 rtn.Quantity = oaData.Field0033.showValue;
                 rtn.LimsNumber = oaData.Field0085.showValue;
                 rtn.Field0064 = oaData.Field0064.showValue;
+                //if (DateTime.TryParse(oaData.Field0070.showValue, out var field0070))
+                //{
+                //    rtn.FirstPayTime = field0070;
+                //}
+                //if (DateTime.TryParse(oaData.Field0089.showValue, out var field0089))
+                //{
+                //    rtn.StampTime = field0089;
+                //}
                 rtn.FirstPayTime = oaData.Field0070.showValue;
-                rtn.Field0074 = oaData.Field0074.showValue;
                 rtn.StampTime = oaData.Field0089.showValue;
+                rtn.Field0074 = oaData.Field0074.showValue;
                 rtns.Results.Add(rtn);
             }