提交

username@email.com

2021-11-25 3a6b641fd48f7377fec66e31b069c472fac5ba60

提交

 zhengcaioa/IServices/IExpertService.cs

@@ -36,5 +36,7 @@

        ResultEntity Phone1Chongfu(string Phone1 = "", string Id = "");

        List<ExpertDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);

    }
}

 zhengcaioa/Services/ExpertService.cs

@@ -818,5 +818,16 @@
            }
            return resultEntity;
        }


        public List<ExpertDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
        {


            var listPosition = _context.Experts.Where(r => r.RecStatus == "A"&& r.ShenheStatus=="A"&& r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();

            var list = _mapper.Map<List<ExpertDTO>>(listPosition);
            return list;
        }
    }
}

 zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs

@@ -119,6 +119,7 @@

            ViewBag.users = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.YearJiou = _liaotianService.GetSYScode("experts", "year_jiou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.Createtime = DateTime.Now.ToString("yyyy-MM-dd"); ;
            return View();
        }


 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -60,6 +60,7 @@
        private readonly IHrPositionService _hrPositionService;
        private readonly IHrDeptService _hrDeptService;
        private readonly IAdmSigninService _admSigninService;
        private readonly IExpertService _expertService;

        public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
            , IAdmAttendanceRuleService attendanceRuleService
@@ -90,6 +91,7 @@
            , IHrPositionService hrPositionService
            , IHrDeptService hrDeptService
            , IAdmSigninService admSigninService
            , IExpertService expertService
            )
        {
            _logger = logger;
@@ -121,6 +123,7 @@
            _hrPositionService = hrPositionService;
            _hrDeptService = hrDeptService;
            _admSigninService = admSigninService;
            _expertService = expertService;
        }

        public async Task<IActionResult> IndexAsync(string Tongjitime="")
@@ -1091,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


@@ -2797,6 +2853,59 @@
                    #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


                    List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();

                    #region 上门拜访客户

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -50,6 +50,7 @@
        private readonly IHttpClientFactory _clientFactory;
        private readonly IAskService _askService;
        private readonly IAdmEvaluateService _admEvaluateService;
        private readonly IExpertService _expertService;

        private readonly decimal jiabangongzibiaozhun = new decimal(21.5);
        public TimedBackgroundService(ILogger<TimedBackgroundService> logger, IServiceScopeFactory factory)
@@ -83,6 +84,7 @@
            _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
            _askService= factory.CreateScope().ServiceProvider.GetRequiredService<IAskService>();
            _admEvaluateService = factory.CreateScope().ServiceProvider.GetRequiredService<IAdmEvaluateService>();
            _expertService = factory.CreateScope().ServiceProvider.GetRequiredService<IExpertService>();
        }
        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
        {
@@ -3452,6 +3454,53 @@

                    #endregion




                    #region 专家录入

                    var zhuanjialuruDTOsyue = _expertService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if (zhuanjialuruDTOsyue != null && zhuanjialuruDTOsyue.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 = zhuanjialuruDTOsyue.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 = zhuanjialuruDTOsyue.Count - renwujishu;
                                        if (youxiaojijian > 0)
                                        {
                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                                        }

                                    }
                                }
                            }

                        }
                    }
                    #endregion

                }



 zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml

@@ -275,7 +275,7 @@
                                        <input class="form-control" label="身份证号" name="IdCard" id="IdCard" labtype="txt" addvisible="true" editvisible="true" maxlength="18" reg="" ismust="true" type="text" value="@Model.IdCard" autocomplete="off">
                                    </div>

                                    <label class="text-right col-sm-1 col-md-1 control-label">专家证号</label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">专家证号<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                        <input class="form-control" label="专家证号" name="CertiNumber" id="CertiNumber" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.CertiNumber">
                                    </div>
@@ -377,7 +377,7 @@

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">联系电话1</label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">联系电话1<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <input class="form-control" label="联系电话1" name="Phone1" id="Phone1" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Phone1" autocomplete="off">
                                    </div>
@@ -912,14 +912,14 @@
                toastr.warning("专家姓名不能为空");
                return;
            };
            //if (Verify.isNull($("#Province").val()) || Verify.isNull($("#City").val()) ) {
            //    toastr.warning("区域不能为空");
            //    return;
            //}
            //if ($("#IdCard").val() == '') {
            //    toastr.warning("身份证号不能为空");
            //    return;
            //}
            if ($.trim($("#Phone1").val()) == '') {
                toastr.warning("联系电话不能为空");
                return;
            }
            if ($.trim($("#CertiNumber").val()) == '' || $.trim($("#CertiNumber").val()) == 'SC') {
                toastr.warning("专家证号不能为空");
                return;
            }



@@ -1113,7 +1113,10 @@


                    if (data.Result) {
                        if ($("#Province").val() != data.Remark) {
                        if (data.Remark == null || data.Remark == "") {
                            return;
                        }
                        if ($("#Province").val() != data.Remark ) {
                            $("#Province").val(data.Remark);

                            var sheng = $("#Province").val();

 zhengcaioa/zhengcaioa/Views/Expert/Indexziliao.cshtml

@@ -11,7 +11,9 @@
        var level = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.level))';
        var ReviewItem = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ReviewItem))';
        var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
         var YearJiou= '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.YearJiou))';
        var YearJiou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.YearJiou))';
        var Createtime = '@Html.Raw(ViewBag.Createtime)';
        
        loseherght = 60;
        gridConfig = { multiselect: true, selectcol: "Id" };
        dataCol = [
@@ -40,7 +42,7 @@
            { label: '修改时间', name: 'Modifytime', labtype: 'txt', hidden: true }

        ];
        dataUrl = "/Expert/GetList";
        dataUrl = "/Expert/GetList?Province=510000&City=510100";
        searchCol = [
            { label: '省', name: 'Province', labtype: 'combox', hidden: false, data: JSON.parse(Province), cwidth: '5%', cccwidth: '6.5%' },
            { label: '市', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '1%', cccwidth: '7%' },
@@ -52,11 +54,24 @@
            { label: '评审品目', name: 'ReviewItem', labtype: 'combox', hidden: false, data: JSON.parse(ReviewItem) },
            { label: '考试时间', name: 'YearJiou', labtype: 'combox', hidden: false, data: JSON.parse(YearJiou) },

            




        ];


        var _pageSearch = function () {
            $("#jqGrid").jqGrid('setGridParam', {
                url: '/Expert/GetList', postData: jsons, page: 1
            }); //重新载入
            var jsons = GetSearchEnd();
            if (jsons == false) {
                msg.info("请录入查询条件");
                return false;
            }
            LoadGrid(jsons);
        }

        var _pagedel = function (id) {
            if (confirm('是否删除记录')) {
@@ -170,6 +185,42 @@
            $("#PBSReviewItem").parent().next().remove();


            $("#PBSProvince").val("510000");
            $("#PBSProvince").trigger('chosen:updated');//更新选项

            $.ajax({
                type: "GET",
                url: "/Project/getCity?shengid=510000",
                dataType: "json",
                global: false,
                data: "",
                success: function (data) {

                    var city = $("#PBSCity");
                    city.find('option').remove();
                    var aaa = '<option value="" hassubinfo="true">请选择</option>';
                    city.append(aaa);
                    if (data.length > 0) {
                        for (var i = 0; i < data.length; i++) {

                            var o = '<option value="' + data[i].CodeId + '" hassubinfo="true">' + data[i].Name + '</option>';
                            city.append(o);
                        }
                        $("#PBSCity").val("510100");
                    }
                    $("#PBSCity").trigger('chosen:updated');//更新选项
                },
                error: function () { }
            });

           
            $("#PBSCreatetimeend").val(Createtime);

             
          

         

        });
    </script>
}