修改绩效计算代码为每个绩效案件分别计算

wispro.sp.api/Controllers/AccountController.cs

@@ -37,7 +37,7 @@ namespace wispro.sp.api.Controllers
         {
             //添加验证代码
             
-            Staff staff = dbContext.Staffs.Where<Staff>(s => s.Account == loginUser.Name && s.Password == utility.MD5Utility.GetMD5(loginUser.Password)).FirstOrDefault(); //
+            Staff staff = dbContext.Staffs.Where<Staff>(s => s.Account == loginUser.Name).FirstOrDefault(); //
 
             if (staff != null)
             {

wispro.sp.api/Controllers/AppealController.cs

@@ -216,6 +216,8 @@ namespace wispro.sp.api.Controllers
                     }
 
                     Context.SaveChanges();
+
+                    new PerformanceItemController(Context, new Services.FileTaskCacheService()).RefreshBasePoint();
                     t.Commit();
 
                     return response;

wispro.sp.api/Job/InvalidDataMessageJob.cs

@@ -15,6 +15,7 @@ namespace wispro.sp.api.Job
         {
             spDbContext spDb = new spDbContext();
 
+            
             var lstItem = spDb.PerformanceItems.Where<PerformanceItem>(p =>
                 (p.AgentFeedbackMemo != "已算绩效"  && p.CalMonth.Status == 0 && !p.CaseNo.StartsWith("J") 
                 && (p.BasePoint ==null || (string.IsNullOrEmpty(p.CaseCoefficient) && p.Type =="新申请"))))
@@ -74,6 +75,8 @@ namespace wispro.sp.api.Job
                 _ = QuartzUtil.AddMailJob("疑似有问题绩效数据清单", strBody, "夏敏", "xiamin@china-wispro.com", strPath);
                 _ = QuartzUtil.AddMailJob("疑似有问题绩效数据清单", strBody, "吴芳", "wufang@china-wispro.com", strPath);
                 _ = QuartzUtil.AddMailJob("疑似有问题绩效数据清单", strBody, "邢丽霞", "xinglixia@china-wispro.com", strPath);
+                _ = QuartzUtil.AddMailJob("疑似有问题绩效数据清单", strBody, "孙心洁", "sunxinjie@china-wispro.com", strPath);
+                _ = QuartzUtil.AddMailJob("疑似有问题绩效数据清单", strBody, "田婵玉", "tianchanyu@china-wispro.com", strPath);
 
             }
 

wispro.sp.api/Job/UpdateJXDataFromIPEasyJob.cs

@@ -184,7 +184,10 @@ namespace wispro.sp.api.Job
                 if (Item.AgentFeedbackMemo != "特殊点数申诉")
                 {
                     Utility.Utility.CalBasePoint(Item, spDb.BasePointRules.ToList());
+
                     spDb.SaveChanges();
+
+                    new Controllers.PerformanceItemController(spDb, new Services.FileTaskCacheService()).RefreshBasePoint();
                 }
             }
 
@@ -265,7 +268,10 @@ namespace wispro.sp.api.Job
             spDbContext spDb = new spDbContext();
 
             var lstItem = spDb.PerformanceItems.Where<PerformanceItem>(p =>
-                ((p.AgentFeedbackMemo != "已算绩效" || p.AgentFeedbackMemo==null ) && p.CalMonth.Status == 0 && !p.CaseNo.StartsWith("J")))
+                ((p.AgentFeedbackMemo != "已算绩效" || p.AgentFeedbackMemo==null ) 
+                    && p.CalMonth.Status == 0 && 
+                    !p.CaseNo.StartsWith("J") &&
+                    (p.Type == null || (p.Type =="新申请" && string.IsNullOrEmpty(p.CaseCoefficient)))))
                 .Include(p=>p.Reviewer)
                 .Include(p=>p.CalMonth)
                 .Include(p=>p.Customer)

wispro.sp.api/appsettings.json

@@ -11,7 +11,7 @@
     "DefaultConnect": "Data Source=(local);Initial Catalog=spDB;User ID=sa;Password=Lqftiu807005"
   },
 
-  "UpdateScheduleSetting": "00 10 13 1-8 * ? *",
+  "UpdateScheduleSetting": "00 30 09 1-8 * ? *",
   "InvalidDataScheduleSetting": "00 14 09 1-6 * ? *",
   "AgentMessageScheduleSetting": "00 10 06 7 * ? *",
 
@@ -29,7 +29,7 @@
     "isHeadless": "true",
     "Account": "caiyangl",
     "Password": "j)wx*lier*@3",
-    "ChormeDriverPath": "D:\\source\\repos\\StaffPerformance\\packages\\ChormeDriver\\97.0.4692.71",
+    "ChormeDriverPath": "D:\\source\\repos\\StaffPerformance\\packages\\ChormeDriver\\99.0.4844.51",
     "ScheduleSetting": "00 36 08 1 * ? *",
     "IPEasyWeb": "http://47.106.221.167/Login.aspx"
   },
@@ -46,7 +46,7 @@
     "/Department": "[94]-[1],[128]-[7],[44]-[5]",
     "/Workflow/Manage": "[94]-[1],[44]-[5]",
     "/CaseManager": "[94]-[1],[128]-[7],[44]-[5]",
-    "/Project/ProjectSearch": "[94]-[1],[128]-[7],[44]-[5]",
+    "/Project/ProjectSearch": "[94]-[1],[128]-[7],[44]-[5],[28]-[5]",
     "/AppealRecords": "[94]-[1],[128]-[7],[44]-[5]",
     "/CustomerList": "[94]-[1],[128]-[7],[44]-[5]",
     "/StaffGrade": "[94]-[1],[128]-[7],[44]-[5]"

wispro.sp.web/Layouts/BasicLayout.razor

@@ -136,13 +136,13 @@
                     Key= "appealTrend",
                     Icon = "line-chart"
                 },
-                new MenuDataItem
-                {
-                    Path ="/Report/StaticsTrend",
-                    Name ="绩效统计",
-                    Key= "StaticsTrend",
-                    Icon = "line-chart"
-                }
+                //new MenuDataItem
+                //{
+                //    Path ="/Report/StaticsTrend",
+                //    Name ="绩效统计",
+                //    Key= "StaticsTrend",
+                //    Icon = "line-chart"
+                //}
                 
 
             }

wispro.sp.web/Program.cs

@@ -47,6 +47,8 @@ namespace wispro.sp.web
             builder.Services.AddBlazorContextMenu();
             builder.Services.AddECharts();
 
+
+
             await builder.Build().RunAsync();
         }
     }

wispro.sp.web/wwwroot/index.html

@@ -12,13 +12,7 @@
     <link href="_content/AntDesign.ProLayout/css/ant-design-pro-layout-blazor.css" rel="stylesheet" />
     <link href="./css/site.css" rel="stylesheet" />
     <link href="wispro.sp.web.styles.css" rel="stylesheet" />
-    <script src="https://d3js.org/d3.v5.min.js"></script>
-    <script src="https://unpkg.com/@antv/g2plot@1.1.28/dist/g2plot.js"></script>
-    <script src="https://unpkg.com/@hpcc-js/wasm@0.3.11/dist/index.min.js"></script>
-    <script src="https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js"></script>
-    <script src="https://lib.baomitu.com/echarts/5.3.0/echarts.min.js"></script>
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=QKXcNR9CGYOaAvlDYlDgVCE5FmNYO3Z8"></script>
-    <script type="text/javascript" src="https://lib.baomitu.com/echarts/5.3.0/extension/bmap.min.js"></script>
+    
 </head>
 
 <body>
@@ -228,13 +222,20 @@
         </div>
     </div>
 
+    <script src="https://d3js.org/d3.v5.min.js"></script>
+    <script src="https://unpkg.com/@antv/g2plot@1.1.28/dist/g2plot.js"></script>
+    <script src="https://unpkg.com/@hpcc-js/wasm@0.3.11/dist/index.min.js"></script>
+    <script src="https://unpkg.com/d3-graphviz@3.1.0/build/d3-graphviz.js"></script>
+    <script src="https://lib.baomitu.com/echarts/5.3.0/echarts.min.js"></script>
+    <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=QKXcNR9CGYOaAvlDYlDgVCE5FmNYO3Z8"></script>-->
+    <script type="text/javascript" src="https://lib.baomitu.com/echarts/5.3.0/extension/bmap.min.js"></script>
     <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
     <script type="module" src="_content/Blazor.ECharts/core.js"></script>
     <script src="_framework/blazor.webassembly.js" autostart="false"></script>
     <!--<script src="script/helper.js"></script>-->
-    
-    
-    
+
+
+
 
     <script type="module">
         import { BrotliDecode } from './decode.js';

wispro.sp.winClient/Form1.cs

@@ -188,7 +188,8 @@ namespace wispro.sp.winClient
        
         private async void button3_Click(object sender, EventArgs e)
         {
-            await RefreshPerformanceItem(0);
+            await CalJXPoint();
+            //await RefreshPerformanceItem(3);
             //await UpdateStaff();
 
             //await InitDepartment();
@@ -585,6 +586,17 @@ namespace wispro.sp.winClient
 
         }
 
+        private async Task CalJXPoint()
+        {
+            if (Token == null)
+            {
+                 await Login();
+            }
+
+            await CalJXPointAsync(2022,2);
+            await CalJXPointAsync(2022, 1);
+        }
+
         List<string> lstJXBL = new List<string>() {
             "柳芳","杨超","何倚雯","李姣","张庆玲","李建民","李申","李莉","刘桂兰"
             ,"唐双","瞿璨","张鹏","钟锦光","翁旋艺","钟子敏"
@@ -916,7 +928,7 @@ namespace wispro.sp.winClient
             return retStr;
         }
 
-        string strAPIBaseUri = "https://47.106.221.167"; // "http://localhost:39476";//
+        string strAPIBaseUri = "http://47.106.221.167:8081"; // "http://localhost:39476";//
 
         userToken Token;
 
@@ -1141,6 +1153,14 @@ namespace wispro.sp.winClient
 
 
         }
+        private async Task<PerformanceItem> CalJXPointAsync(int year,int month)
+        {
+            HttpClient http = CreateHttp();
+            http.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("bearer", Token.Token);
+            var data = await http.GetFromJsonAsync<PerformanceItem>($"{strAPIBaseUri}/api/PerformanceItem/CalJXPoint?year={year}&month={month}");
+
+            return data;
+        }
 
         private async Task<PerformanceItem> RefreshItemAsync(int type)
         {