diff --git a/Src/Dlhis.Basic/Common/Message/JinkoApiService.cs b/Src/Dlhis.Basic/Common/Message/JinkoApiService.cs index 3780ad21..c2b7d909 100644 --- a/Src/Dlhis.Basic/Common/Message/JinkoApiService.cs +++ b/Src/Dlhis.Basic/Common/Message/JinkoApiService.cs @@ -8,6 +8,9 @@ namespace Dlhis.Basic.Common.Message; public class JinkoApiService : IJinkoApiService { private readonly IHttpClientFactory _httpClientFactory; + private const string _agentId = "2984453842"; + private const string _appKey = "dingppvj6wvtgbagwpsw"; + private const string _appSecret = "k9mxYwilZgQiuhV_RVYRueoIAWHCQWrUdhbj6DAmiEiqMzSQE4igt0kAj97rmLaS"; public JinkoApiService(IHttpClientFactory httpClientFactory) { @@ -23,10 +26,10 @@ public class JinkoApiService : IJinkoApiService var form = new FormUrlEncodedContent(new Dictionary { - { "appkey", "dingumelppews6rah7x9" }, - { "appsecret", "nsWfJTVjYesHVzrLiP-t1TQqMQvC1L_kZNfXfnIyzcXK4pCTfKprkjZcxAbsDR_l" } + { "appkey", _appKey }, + { "appsecret", _appSecret } }); - + //appkey=dingumelppews6rah7x9&appsecret=nsWfJTVjYesHVzrLiP-t1TQqMQvC1L_kZNfXfnIyzcXK4pCTfKprkjZcxAbsDR_l var response = await httpClient.GetStringAsync($"/gettoken?{await form.ReadAsStringAsync()}"); var jObj = JObject.Parse(response); @@ -50,7 +53,7 @@ public class JinkoApiService : IJinkoApiService var body = new { - agent_id = "2768073678", + agent_id = _agentId, userid_list = userStringIds, msg = new { diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs index e0edfb2f..a0284fed 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs @@ -296,13 +296,13 @@ public class GainfoFaceService : IGainfoFaceService face = new GainfoFaceEntity { UserCode = gainfo.Code, - Face = request.Face + Face = request.Face, + CreatedBy = _currentUser.GetIntSubjectId(), + CreateTime = DateTime.Now, + ModifiedBy = _currentUser.GetIntSubjectId(), + ModifiedTime = DateTime.Now }; - face.CreatedBy = _currentUser.GetIntSubjectId(); - face.CreateTime = DateTime.Now; - face.ModifiedBy = _currentUser.GetIntSubjectId(); - face.ModifiedTime = DateTime.Now; await _faceDbContext.InsertAsync(face); } else diff --git a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridUserPageResponse.cs b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridUserPageResponse.cs index ddc14d4b..118b868b 100644 --- a/Src/Dlhis.Basic/WorkGrids/Response/WorkGridUserPageResponse.cs +++ b/Src/Dlhis.Basic/WorkGrids/Response/WorkGridUserPageResponse.cs @@ -19,6 +19,11 @@ public class WorkGridUserPageResponse /// public string Remark { get; set; } + /// + /// 员工数 + /// + public int UserCount { get; set; } + /// /// 员工明细 /// @@ -36,7 +41,7 @@ public class WorkGridUserPageDetailResponse /// 人员姓名 /// public string Name { get; set; } - + /// /// 最大连续排班信息 /// diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs index ce8210fc..5e10f086 100644 --- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs +++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs @@ -186,6 +186,7 @@ public class WorkGridService : IWorkGridService if (myWorkGrid != null) { + myWorkGrid.UserCount = await _dbContext.Queryable().Where(x => x.WorkGridCode == myWorkGrid.Code).CountAsync(); myWorkGrid.UserInfos = await _dbContext.Queryable() .LeftJoin((x, ga) => x.UserCode == ga.Code) .Where((x, ga) => x.WorkGridCode == myWorkGrid.Code)