提交

username@email.com

2021-12-15 8e5d569d8362b0bc25b45a8003f8be6be65a8104

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -22,6 +22,9 @@
using Grpc.Core;
using System;
using System.Transactions;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json.Linq;
using System.Net.Http.Headers;

namespace zhengcaioa.Controllers.Finance
{
@@ -52,7 +55,12 @@
        private readonly IProjectService _projectService;
        private readonly ICusFangwenjiluService _cusFangwenjiluService;
        private readonly ILiaotianService _liaotianService;

        private readonly IConfiguration _configuration;
        private readonly IHttpClientFactory _clientFactory;
        private readonly IHrPositionService _hrPositionService;
        private readonly IHrDeptService _hrDeptService;
        private readonly IAdmSigninService _admSigninService;
        private readonly IExpertService _expertService;

        public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
            , IAdmAttendanceRuleService attendanceRuleService
@@ -77,7 +85,14 @@
            , IDtChannelArticleNewsService dtChannelArticleNewsService
            , IProjectService projectService
            , ICusFangwenjiluService cusFangwenjiluService
            ,ILiaotianService liaotianService)
            , ILiaotianService liaotianService
            , IConfiguration configuration
            , IHttpClientFactory clientFactory
            , IHrPositionService hrPositionService
            , IHrDeptService hrDeptService
            , IAdmSigninService admSigninService
            , IExpertService expertService
            )
        {
            _logger = logger;
            _attendanceRuleService = attendanceRuleService;
@@ -103,9 +118,15 @@
            _projectService = projectService;
            _cusFangwenjiluService = cusFangwenjiluService;
            _liaotianService = liaotianService;
            _configuration = configuration;
            _clientFactory = clientFactory;
            _hrPositionService = hrPositionService;
            _hrDeptService = hrDeptService;
            _admSigninService = admSigninService;
            _expertService = expertService;
        }

        public IActionResult Index(string Tongjitime="")
        public async Task<IActionResult> IndexAsync(string Tongjitime="")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -926,14 +947,57 @@

            if (jijianizhucehuiyuan != null)
            {
                //本月数量
                var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
             //本月数量
             List <YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
                try
                {
                    //var pltUserDTO = _userService.GetPltUserEntity(curentuser.Id);
                    string huiyuanurl = _configuration.GetSection("huiyuanurl").Value;
                    string GetYGYaoQingYonghu = _configuration.GetSection("GetYGYaoQingYonghu").Value;
                    Uri postUrl2 = new Uri(huiyuanurl + GetYGYaoQingYonghu);

                zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                    JObject questions2 = new JObject();
                    questions2.Add("UserID", curentuser.Id);
                    questions2.Add("StartTime", dateminkaoqin.ToString("yyyy-MM-dd HH:mm:ss"));
                    questions2.Add("EndTime", datemaxkaoqin.ToString("yyyy-MM-dd HH:mm:ss"));

                    string requestJson2 = questions2.ToString();
                    string result2 = string.Empty;

                    using (HttpContent httpContent = new StringContent(requestJson2))
                    {
                        httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");

                        var httpClient2 = _clientFactory.CreateClient();
                        httpClient2.Timeout = new TimeSpan(0, 0, 10);
                        var Result2 = await httpClient2.PostAsync(postUrl2, httpContent);
                        result2 = Result2.Content.ReadAsStringAsync().Result;
                    }

                    _logger.LogInformation("result2:" + result2);
                    JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);

                    if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
                    {
                        zhucehuiyuanDTO.benyueshuliang = jobjectresult["count"].ToString();
                        zhucehuiyuansyue = JsonConvert.DeserializeObject<List<YaoQingYongHuDTO>>(jobjectresult["data"].ToString());

                    }
                    else
                    {
                        zhucehuiyuanDTO.benyueshuliang = "0";
                    }
                }
                catch (Exception ex)
                {

                }
                //var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();

                //zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                //本日数量
                var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
                zhucehuiyuanDTO.benrishuliang = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                zhucehuiyuanDTO.dangrijixiao = (zhucehuiyuansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
                var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.CreatTime >= chauxnshijian.Date && x.CreatTime < chauxnshijian.Date.AddDays(1)).ToList();
                zhucehuiyuanDTO.benrishuliang = zhucehuiyuansri.Count.ToString(); 

                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhucehuiyuan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
@@ -943,23 +1007,30 @@

                        zhucehuiyuanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        zhucehuiyuanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        //if (jixiaotichengfangan.Tichengstandard == "01")
                        //{
                        //    decimal youxiaojijian = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
                        //    if (youxiaojijian > 0)
                        //    {
                        //        zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
                        //    }
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {

                        //}
                            zhucehuiyuanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                            zhucehuiyuanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                            if (jixiaotichengfangan.Tichengstandard == "01")
                            {
                                decimal youxiaojijian = zhucehuiyuansri.Count - jixiaotichengfangan.Renwu.Value;
                                if (youxiaojijian > 0)
                                {
                                    zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                                }

                            }

                        }

                    }
                    else if (jixiaotichengfangan.Renwustandard == "02")
                    {
                        zhucehuiyuanDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                        zhucehuiyuanDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        //if (jixiaotichengfangan.Tichengstandard == "01")
                        //{
                        //    decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
                        //    decimal youxiaojijian = qianyueDTOs.Count - renwujishu;
                        //    if (youxiaojijian > 0)
                        //    {
                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1023,6 +1094,59 @@
            }
            if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
                tuiguangDTOs.Add(qianyueDTO);
            #endregion


            #region 专家录入
            TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
            zhuanjialuruDTO.gongzuo = "专家录入";
            //本月数量
            var zhuanjialuruDTOsyue = _expertService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
            zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
            //本日数量
            var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();

            var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "专家录入").FirstOrDefault();

            if (jijianizhuanjialuru != null)
            {
                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                {
                    if (jixiaotichengfangan.Renwustandard == "01")
                    {

                        zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {
                            decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            if (youxiaojijian > 0)
                            {
                                zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                            }

                        }

                    }
                    else if (jixiaotichengfangan.Renwustandard == "02")
                    {
                        zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                        //if (jixiaotichengfangan.Tichengstandard == "01")
                        //{
                        //    decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
                        //    if (youxiaojijian > 0)
                        //    {
                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                        //    }

                        //}
                    }
                }
            }
            if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
                tuiguangDTOs.Add(zhuanjialuruDTO);
            #endregion


@@ -1738,12 +1862,12 @@



        public IActionResult IndexSuoyou(string Tongjitime = "",string userid = "")
        public async Task<IActionResult> IndexSuoyouAsync(string Tongjitime = "",string userid = "")
        {
            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);
@@ -1753,12 +1877,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>();
@@ -1822,6 +1946,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();

@@ -2580,13 +2709,58 @@
                    if (jijianizhucehuiyuan != null)
                    {
                        //本月数量
                        var zhucehuiyuansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
                        List<YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
                        try
                        {
                            //var pltUserDTO = _userService.GetPltUserEntity(Userid);
                            string huiyuanurl = _configuration.GetSection("huiyuanurl").Value;
                            string GetYGYaoQingYonghu = _configuration.GetSection("GetYGYaoQingYonghu").Value;
                            Uri postUrl2 = new Uri(huiyuanurl + GetYGYaoQingYonghu);

                        zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                            JObject questions2 = new JObject();
                            questions2.Add("UserID", Userid);
                            questions2.Add("StartTime", dateminkaoqin.ToString("yyyy-MM-dd HH:mm:ss"));
                            questions2.Add("EndTime", datemaxkaoqin.ToString("yyyy-MM-dd HH:mm:ss"));

                            string requestJson2 = questions2.ToString();
                            string result2 = string.Empty;

                            using (HttpContent httpContent = new StringContent(requestJson2))
                            {
                                httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");

                                var httpClient2 = _clientFactory.CreateClient();
                                httpClient2.Timeout = new TimeSpan(0, 0, 10);
                                var Result2 = await httpClient2.PostAsync(postUrl2, httpContent);
                                result2 = Result2.Content.ReadAsStringAsync().Result;
                            }

                            _logger.LogInformation("result2:" + result2);
                            JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);

                            if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
                            {
                                zhucehuiyuanDTO.benyueshuliang = jobjectresult["count"].ToString();
                                zhucehuiyuansyue = JsonConvert.DeserializeObject<List<YaoQingYongHuDTO>>(jobjectresult["data"].ToString());

                            }
                            else
                            {
                                zhucehuiyuanDTO.benyueshuliang = "0";
                            }
                        }
                        catch (Exception ex)
                        {

                        }


                        //var zhucehuiyuansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();

                        //zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                        //本日数量
                        var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
                        zhucehuiyuanDTO.benrishuliang = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
                        zhucehuiyuanDTO.dangrijixiao = (zhucehuiyuansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
                        var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.CreatTime >= chauxnshijian.Date && x.CreatTime < chauxnshijian.Date.AddDays(1)).ToList();
                        zhucehuiyuanDTO.benrishuliang = zhucehuiyuansri.Count.ToString();

                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhucehuiyuan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
@@ -2596,23 +2770,23 @@

                                zhucehuiyuanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                                zhucehuiyuanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                //if (jixiaotichengfangan.Tichengstandard == "01")
                                //{
                                //    decimal youxiaojijian = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
                                //    if (youxiaojijian > 0)
                                //    {
                                //        zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
                                //    }
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = zhucehuiyuansri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                                    }

                                //}
                                }

                            }
                            else if (jixiaotichengfangan.Renwustandard == "02")
                            {
                                zhucehuiyuanDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                                zhucehuiyuanDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                //if (jixiaotichengfangan.Tichengstandard == "01")
                                //{
                                //    decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
                                //    decimal youxiaojijian = qianyueDTOs.Count - renwujishu;
                                //    if (youxiaojijian > 0)
                                //    {
                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2676,6 +2850,59 @@
                    }
                    if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
                        tuiguangDTOs.Add(qianyueDTO);
                    #endregion


                    #region 专家录入
                    TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
                    zhuanjialuruDTO.gongzuo = "专家录入";
                    //本月数量
                    var zhuanjialuruDTOsyue = _expertService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
                    //本日数量
                    var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();

                    var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "专家录入").FirstOrDefault();

                    if (jijianizhuanjialuru != null)
                    {
                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                        {
                            if (jixiaotichengfangan.Renwustandard == "01")
                            {

                                zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                                zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                                    }

                                }

                            }
                            else if (jixiaotichengfangan.Renwustandard == "02")
                            {
                                zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                                //if (jixiaotichengfangan.Tichengstandard == "01")
                                //{
                                //    decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
                                //    if (youxiaojijian > 0)
                                //    {
                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                                //    }

                                //}
                            }
                        }
                    }
                    if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
                        tuiguangDTOs.Add(zhuanjialuruDTO);
                    #endregion


@@ -2836,7 +3063,7 @@
                    DtChannelArticleNewsDTOSearch searchEntity = new DtChannelArticleNewsDTOSearch();
                    searchEntity.EndTime = datemaxkaoqin;
                    searchEntity.AddTime = dateminkaoqin;
                    searchEntity.UserName = curentuser.UserSn;
                    searchEntity.UserName = userDTO.UserSn;
                    searchEntity.CategoryId = 3;
                    var dtChannelArticleNewsDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
                    xinwenzixunDTO.benyueshuliang = dtChannelArticleNewsDTOs.Count.ToString();
@@ -2893,7 +3120,7 @@
                    searchEntity = new DtChannelArticleNewsDTOSearch();
                    searchEntity.EndTime = datemaxkaoqin;
                    searchEntity.AddTime = dateminkaoqin;
                    searchEntity.UserName = curentuser.UserSn;
                    searchEntity.UserName = userDTO.UserSn;
                    searchEntity.CategoryId = 85;
                    var dianxinanDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
                    dianxinanliDTO.benyueshuliang = dianxinanDTOs.Count.ToString();
@@ -2949,7 +3176,7 @@
                    searchEntity = new DtChannelArticleNewsDTOSearch();
                    searchEntity.EndTime = datemaxkaoqin;
                    searchEntity.AddTime = dateminkaoqin;
                    searchEntity.UserName = curentuser.UserSn;
                    searchEntity.UserName = userDTO.UserSn;
                    searchEntity.CategoryId = 73;
                    var zhengcaizhishiDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
                    zhengcaizhishiDTO.benyueshuliang = zhengcaizhishiDTOs.Count.ToString();
@@ -3384,7 +3611,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);