Skip to content

P
performance
Commit 1aedaf30 by 1391696987
Options

修复bug

parent 38eeaef2
Showing with 7 additions and 13 deletions
performance/Performance.Api/appsettings.Localhost.json
......@@ -10,8 +10,8 @@
"GetUserInfo": "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo",
//"Access_token": "http://localhost:5001/api/Account/GetAccess_token",
//"GetUserInfo": "http://localhost:5001/api/Account/GetUserId",
"CorpId": "ww58ec167201a95da7",
"CorpSecret": "1rgWzgJBIZ3r0Q2sW1trVw5QdXOHmgUhepk90ecI2rk"
"CorpId": "wwef48121e4dfd11d1",
"CorpSecret": "Nqhbb-v5El1LQtNTxRHmy6E9e0pnNIpWaxNqb2EgT0Q"
},
"WzOAuth": {
"Code": "CNYICE",
......
performance/Performance.Services/AllotService.cs
......@@ -888,7 +888,9 @@ public List<OwnerMobilePerformanceDto> GetOwnerMobilePerformance(string jobNumbe
// 发放时间 归档状态永远显示，如果没有发放时间则使用归档时间，绩效下发状态下显示标记发放时间
Func<OwnerPerformanceDto, string> getIssueDate = (owner) =>
{
var batch = batchs.FirstOrDefault(p => p.AllotId == owner.AllotId
per_batch batch = new per_batch();
if (batchs!=null)
batch = batchs.FirstOrDefault(p => p.AllotId == owner.AllotId
&& p.UnitType == owner.UnitType && p.AccountingUnit == owner.AccountingUnit
&& p.PersonnelNumber == owner.JobNumber);
......
performance/performance.sln

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2026
# Visual Studio Version 17
VisualStudioVersion = 17.2.32602.215
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.ConsoleApp", "Performance.ConsoleApp\Performance.ConsoleApp.csproj", "{59218B05-5CE3-4EC1-A304-28183F191A04}"
EndProject
......@@ -25,8 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.EntityModels",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Performance.Api", "Performance.Api\Performance.Api.csproj", "{3AE00FF5-F0BA-4D72-A23B-770186309327}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Performance.Extract.Api", "Performance.Extract.Api\Performance.Extract.Api.csproj", "{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -61,23 +59,17 @@ Global
{3AE00FF5-F0BA-4D72-A23B-770186309327}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3AE00FF5-F0BA-4D72-A23B-770186309327}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3AE00FF5-F0BA-4D72-A23B-770186309327}.Release|Any CPU.Build.0 = Release|Any CPU
{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{59218B05-5CE3-4EC1-A304-28183F191A04} = {69CFD3FA-0B61-41D4-A9E8-44B933001293}
{930CBA1F-A51A-4A12-897A-AA6ED02D3E70} = {2E5D3959-48C9-4BAD-89BF-9CF1DDCB453D}
{5E91CFB3-D240-4E38-9E3E-398D53621387} = {B132BEEE-14FF-4DDE-B8D6-7C66AD2B3433}
{9F7723A3-B6BE-4690-BC56-FF93D9992621} = {95E7A23D-DC0E-4C27-AD7C-EAF4917012EF}
{76531E3A-4BCD-4C20-A14C-5D6CCA1C9AEF} = {2E5D3959-48C9-4BAD-89BF-9CF1DDCB453D}
{F7708C0C-0B0B-4E7E-A995-E39F7044FD11} = {95E7A23D-DC0E-4C27-AD7C-EAF4917012EF}
{3AE00FF5-F0BA-4D72-A23B-770186309327} = {69CFD3FA-0B61-41D4-A9E8-44B933001293}
{A7AE6D0F-7B11-4EEF-9FEA-A279001EA54D} = {69CFD3FA-0B61-41D4-A9E8-44B933001293}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {610FC42C-1DE1-4925-93DD-F02908B9FF47}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment