今日开发 我的报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工作报表中的 ...

username@email.com

2021-07-22 ddd7b8e07e5d7f76e5ee28eaab91e75a419b3750

今日开发        我的报表中的  新增注册会员 改为非手工几件登记，自动从系统读取
                      工作报表中的  新增注册会员 改为非手工几件登记，自动从系统读取
                      工资计算中的  新增注册会员 改为非手工几件登记，自动从系统读取

 zhengcaioa/DTO/TongjiBaoBiaoDTO.cs

@@ -37,4 +37,14 @@
        public string UserName { get; set; }
    }


    public class YaoQingYongHuDTO
    {
        public string ID { get; set; }
        public string PhoneCode { get; set; }
        public string UserName { get; set; }
        public DateTime CreatTime { get; set; }
        
    }

}

 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,6 +55,8 @@
        private readonly IProjectService _projectService;
        private readonly ICusFangwenjiluService _cusFangwenjiluService;
        private readonly ILiaotianService _liaotianService;
        private readonly IConfiguration _configuration;
        private readonly IHttpClientFactory _clientFactory;


        public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
@@ -77,7 +82,9 @@
            , IDtChannelArticleNewsService dtChannelArticleNewsService
            , IProjectService projectService
            , ICusFangwenjiluService cusFangwenjiluService
            ,ILiaotianService liaotianService)
            ,ILiaotianService liaotianService
              , IConfiguration configuration
            , IHttpClientFactory clientFactory)
        {
            _logger = logger;
            _attendanceRuleService = attendanceRuleService;
@@ -103,9 +110,11 @@
            _projectService = projectService;
            _cusFangwenjiluService = cusFangwenjiluService;
            _liaotianService = liaotianService;
            _configuration = configuration;
            _clientFactory = clientFactory;
        }

        public IActionResult Index(string Tongjitime="")
        public async Task<IActionResult> IndexAsync(string Tongjitime="")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
@@ -927,13 +936,56 @@
            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 +995,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);
@@ -1738,7 +1797,7 @@



        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;
@@ -2580,13 +2639,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 +2700,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);
@@ -2836,7 +2940,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 +2997,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 +3053,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();

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -1,12 +1,17 @@
using DTO;
using IServices;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
using System.Transactions;
@@ -41,6 +46,8 @@
        private readonly ICusFangwenjiluService _cusFangwenjiluService;
        private readonly ILiaotianService _liaotianService;
        private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
        private readonly IConfiguration _configuration;
        private readonly IHttpClientFactory _clientFactory;

        private readonly decimal jiabangongzibiaozhun = new decimal(21.5);
        public TimedBackgroundService(ILogger<TimedBackgroundService> logger, IServiceScopeFactory factory)
@@ -70,6 +77,8 @@
            _cusFangwenjiluService = factory.CreateScope().ServiceProvider.GetRequiredService<ICusFangwenjiluService>();
            _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>();
            _dtChannelArticleNewsService = factory.CreateScope().ServiceProvider.GetRequiredService<IDtChannelArticleNewsService>();
            _configuration = factory.CreateScope().ServiceProvider.GetRequiredService<IConfiguration>();
            _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
        }
        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
        {
@@ -101,7 +110,7 @@
                                //using (TransactionScope scope = new TransactionScope())
                                //{
                                this.jisuankaoqin();
                                    this.jisuangongzi();
                                 await   this.jisuangongziAsync();
                                    //scope.Complete();
                                //}

@@ -1094,7 +1103,7 @@


        //计算工资
        public void jisuangongzi()
        public async Task jisuangongziAsync()
        {
            //查询所有的有效人员
            DateTime dateminkaoqin = new DateTime(DateTime.Now.Year, DateTime.Now.Month - 1, 1);
@@ -1893,6 +1902,96 @@
                    }
                    #endregion


                    #region 新增注册会员

                    //本月数量
                    List<YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
                    try
                    {
                        //var pltUserDTO = _userService.GetPltUserEntity(userList[i].Id);
                        string huiyuanurl = _configuration.GetSection("huiyuanurl").Value;
                        string GetYGYaoQingYonghu = _configuration.GetSection("GetYGYaoQingYonghu").Value;
                        Uri postUrl2 = new Uri(huiyuanurl + GetYGYaoQingYonghu);

                        JObject questions2 = new JObject();
                        questions2.Add("UserID", userList[i].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")
                        {
                            
                            zhucehuiyuansyue = JsonConvert.DeserializeObject<List<YaoQingYongHuDTO>>(jobjectresult["data"].ToString());

                        }
                        
                    }
                    catch (Exception ex)
                    {

                    }


                    //var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if (zhucehuiyuansyue != null && zhucehuiyuansyue.Count > 0)
                    {
                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "新增注册会员").FirstOrDefault();
                        if (jijianidddd != null)
                        {
                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                            {
                                if (jixiaotichengfangan.Renwustandard == "01")
                                {
                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
                                    if (jixiaotichengfangan.Tichengstandard == "01")
                                    {
                                        decimal youxiaojijian = zhucehuiyuansyue.Count - renwujishu;
                                        if (youxiaojijian > 0)
                                        {
                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                                        }

                                    }

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

                                    }
                                }
                            }

                        }
                    }
                    #endregion


                    #region 新增签约客户

                    var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);

 zhengcaioa/zhengcaioa/appsettings.Development.json

@@ -20,6 +20,7 @@
  "GetUserinfoAndRule": "/api/ZCBackgRound/GetUserinfoAndRule",
  "SetCaseOrder": "/api/ZCBackgRound/SetCaseOrder",
  "GetYGPromoteCode": "/api/ZCBackgRound/GetYGPromoteCode",
  "GetYGYaoQingYonghu": "/api/ZCBackgRound/GetYGYaoQingYonghu",
  "yaoqingma": "http://51zhengcai.com/regist?id="

}

 zhengcaioa/zhengcaioa/appsettings.json

@@ -20,5 +20,6 @@
  "GetUserinfoAndRule": "/api/ZCBackgRound/GetUserinfoAndRule",
  "SetCaseOrder": "/api/ZCBackgRound/SetCaseOrder",
  "GetYGPromoteCode": "/api/ZCBackgRound/GetYGPromoteCode",
  "GetYGYaoQingYonghu": "/api/ZCBackgRound/GetYGYaoQingYonghu",
  "yaoqingma": "http://51zhengcai.com/regist?id="
}