From 3ea38ff2083d7153c16005b0866fb5892e71f70d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 22 十一月 2021 15:55:14 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 0f9bb7f..6b1736e 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -57,7 +57,9 @@
         private readonly ILiaotianService _liaotianService;
         private readonly IConfiguration _configuration;
         private readonly IHttpClientFactory _clientFactory;
-
+        private readonly IHrPositionService _hrPositionService;
+        private readonly IHrDeptService _hrDeptService;
+        private readonly IAdmSigninService _admSigninService;
 
         public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
             , IAdmAttendanceRuleService attendanceRuleService
@@ -82,9 +84,13 @@
             , IDtChannelArticleNewsService dtChannelArticleNewsService
             , IProjectService projectService
             , ICusFangwenjiluService cusFangwenjiluService
-            ,ILiaotianService liaotianService
-              , IConfiguration configuration
-            , IHttpClientFactory clientFactory)
+            , ILiaotianService liaotianService
+            , IConfiguration configuration
+            , IHttpClientFactory clientFactory
+            , IHrPositionService hrPositionService
+            , IHrDeptService hrDeptService
+            , IAdmSigninService admSigninService
+            )
         {
             _logger = logger;
             _attendanceRuleService = attendanceRuleService;
@@ -112,6 +118,9 @@
             _liaotianService = liaotianService;
             _configuration = configuration;
             _clientFactory = clientFactory;
+            _hrPositionService = hrPositionService;
+            _hrDeptService = hrDeptService;
+            _admSigninService = admSigninService;
         }
 
         public async Task<IActionResult> IndexAsync(string Tongjitime="")
@@ -935,8 +944,8 @@
 
             if (jijianizhucehuiyuan != null)
             {
-                //鏈湀鏁伴噺
-                List<YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
+             //鏈湀鏁伴噺
+             List <YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
                 try
                 {
                     //var pltUserDTO = _userService.GetPltUserEntity(curentuser.Id);
@@ -1802,7 +1811,7 @@
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
 
-            DateTime chauxnshijian = DateTime.Now;
+            DateTime chauxnshijian = DateTime.Now.Date;
             if (!string.IsNullOrEmpty(Tongjitime))
             {
                 DateTime.TryParse(Tongjitime, out chauxnshijian);
@@ -1812,12 +1821,12 @@
             string[] Userids = null;
             if (!string.IsNullOrEmpty(userid) && userid!= "null")
             {
-                Userids = userid.Split(','); ;
+                Userids = userDTOs.Where(x=> userid.Split(',').Contains(x.Id)).OrderBy(x => x.DeptId).ThenBy(x => x.HrPosition).Select(x => x.Id).ToArray();
 
             }
             else
             {
-                Userids = userDTOs.OrderBy(x => x.UserSn).Select(x => x.Id).ToArray();
+                Userids = userDTOs.OrderBy(x => x.DeptId).ThenBy(x=>x.HrPosition).Select(x => x.Id).ToArray();
             }
 
             List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = new List<TongjibaobiaobaobiaoDTO>();
@@ -1881,6 +1890,11 @@
                 {
                     var userDTO = userDTOs.Where(x=>x.Id == Userid).FirstOrDefault();
                     string position = userDTO.HrPosition;
+
+                   var hrPositionDTO = _hrPositionService.Get(userDTO.HrPosition);
+
+                    var deptDTO = _hrDeptService.Get(userDTO.DeptId);
+                   var admSignInDTO = _admSigninService.GetByUserAndDate(Userid, chauxnshijian);
 
                     var hrJixiaotichengThis = hrJixiaotichengDTOs.Where(x => x.PostId == position).ToList();
 
@@ -3488,7 +3502,24 @@
                     tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs = ziliaoweihuDTOs;
                     tongjibaobiaobaobiaoDTO.xiangmushishiDTOs = xiangmushishiDTOs;
                     tongjibaobiaobaobiaoDTO.dingdanDTOsCount = dingdanDTOsCount;
-                    tongjibaobiaobaobiaoDTO.UserName = userDTO.UserName;
+                    tongjibaobiaobaobiaoDTO.UserName = "";
+                    if (deptDTO != null)
+                    {
+                        tongjibaobiaobaobiaoDTO.UserName += "閮ㄩ棬锛�" + deptDTO.DeptName + "&nbsp&nbsp&nbsp&nbsp";
+                    }
+                    tongjibaobiaobaobiaoDTO.UserName += "濮撳悕锛�" + userDTO.UserName + "&nbsp&nbsp&nbsp&nbsp";
+
+                    tongjibaobiaobaobiaoDTO.UserDaka = ""; 
+                    if (hrPositionDTO != null)
+                    {
+                        tongjibaobiaobaobiaoDTO.UserDaka += "鑱屽姟锛�" + hrPositionDTO.PostName + "&nbsp&nbsp&nbsp&nbsp";
+                    }
+                    if (admSignInDTO != null)
+                    {
+                        tongjibaobiaobaobiaoDTO.UserDaka += "    鎵撳崱鏃堕棿锛氫笂鍗� " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
+                            + "&nbsp&nbsp&nbsp&nbsp涓嬪崍 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
+                              + (admSignInDTO.OvertimeIn.HasValue ? "    鍔犵彮 " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
+                    }
 
                     tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);
 

--
Gitblit v1.9.1