提交

username@email.com

2023-03-14 bf14008acffe7a9a7ac6e2eeb38ce3552b71b33a

提交

 zhengcaioa/IServices/IProjectService.cs

@@ -40,6 +40,8 @@

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

        List<ZhengfuProjectDTO> GetListsalaryzhengfu(string userid, DateTime datemin, DateTime datemax);

        List<ZhengfuProjectDTO> GetcaigougonggaoListsalary(string userid, DateTime datemin, DateTime datemax);

        ResultEntity saveZxdsfxl(ZxdsfxlDTO zxdsfxl);

 zhengcaioa/Services/ProjectService.cs

@@ -884,6 +884,16 @@
            return list;
        }

        public List<ZhengfuProjectDTO> GetListsalaryzhengfu(string userid, DateTime datemin, DateTime datemax)
        {


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

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

        public List<ZhengfuProjectDTO> GetcaigougonggaoListsalary(string userid, DateTime datemin, DateTime datemax)
        {


 zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs

@@ -1021,7 +1021,7 @@
                }

                //销假必须三天以内
                if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-3))
                if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-4))
                {
                    resultEntity.Result = false;
                    resultEntity.Message = "请在72小时内进行销假处理，超过72小时无法提交";

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -201,10 +201,13 @@
            xiangmuDTO.gongzuo = "采购项目录入";
            //本月数量
            var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
            xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
            var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);

            xiangmuDTO.benyueshuliang = (projectDTOsyue.Count+ zhengfuprojectDTOsyue .Count).ToString();
            //本日数量
            var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
            var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();

            var jijianixiangmu = fiPiecerateDTOs.Where(x =>   x.Project == "采购项目录入").FirstOrDefault();

@@ -221,7 +224,7 @@
                        xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {
                            decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            decimal youxiaojijian = projectDTOsri.Count+ zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            if (youxiaojijian > 0)
                            {
                                xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -244,7 +247,7 @@
                    }
                }
            }
            if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 )
            if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 || zhengfuprojectDTOsri.Count > 0)
                tuiguangDTOs.Add(xiangmuDTO);
            #endregion

@@ -2027,10 +2030,12 @@
                    xiangmuDTO.gongzuo = "采购项目录入";
                    //本月数量
                    var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
                    var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
                    xiangmuDTO.benyueshuliang = (projectDTOsyue.Count + zhengfuprojectDTOsyue.Count).ToString();
                    //本日数量
                    var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();
                    var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();

                    var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "采购项目录入").FirstOrDefault();

@@ -2047,7 +2052,7 @@
                                xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    decimal youxiaojijian = projectDTOsri.Count + zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -1776,7 +1776,7 @@



                    hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) * shiyongqichuqinlv, 2);
                    hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice * shiyongqichuqinlv - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) , 2);



@@ -1854,7 +1854,7 @@



                    hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) * zhuanzhengchuqinlv, 2);
                    hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);

                  

@@ -2223,7 +2223,8 @@
                    #region 采购项目录入

                    var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
                    var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if ((projectDTOsyue!=null && projectDTOsyue.Count > 0 ) || (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.Count > 0))
                    {
                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "采购项目录入").FirstOrDefault();
                        if (jijianidddd != null)
@@ -2243,9 +2244,10 @@
                                            if (gongzuoshijian)
                                            {
                                                var projectDTOri = projectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
                                                var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
                                                if (jixiaotichengfangan.Tichengstandard == "01")
                                                {
                                                    decimal youxiaojijian = projectDTOri.Count - renwujishu;
                                                    decimal youxiaojijian = projectDTOri.Count + zhengfuprojectDTOri.Count - renwujishu;
                                                    if (youxiaojijian > 0)
                                                    {
                                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2277,7 +2279,7 @@
                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
                                    if (jixiaotichengfangan.Tichengstandard == "01")
                                    {
                                        decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
                                        decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
                                        if (youxiaojijian > 0)
                                        {
                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);

 zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml

@@ -237,7 +237,7 @@

                                </div>
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    <label class="text-right col-sm-1 col-md-1 control-label">品目<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">品目</label>
                                    <div class="col-sm-2 col-md-2">
                                        <select id="Pingmu" class="form-control" name="Pingmu" data-placeholder="选择 序列 ...">
                                            <option value="" hassubinfo="true">请选择</option>
@@ -269,7 +269,7 @@
                                        <input id="NoticeTime" class="form-control" label="公告日期" name="NoticeTime" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss")" readonly="readonly">

                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">项目编号<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">项目编号</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="OpenTenderCode" class="form-control" label="项目编号" name="OpenTenderCode" labtype="txt" addvisible="true" maxlength="100" editvisible="true" reg="" ismust="true" type="text" value="@Model.OpenTenderCode">

@@ -318,7 +318,7 @@
                                        <input id="Budget" class="form-control" label="预算金额" name="Budget" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Budget" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,4})?/)">

                                    </div>
                                    <label class="text-right col-sm-1 col-md-1 control-label">开标日期<i class="red">*</i></label>
                                    <label class="text-right col-sm-1 col-md-1 control-label">开标日期</label>
                                    <div class="col-sm-2 col-md-2">
                                        <input id="OpenTenderTime" class="form-control" label="开标日期" name="OpenTenderTime" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@(Model.OpenTenderTime.HasValue? Model.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"")" readonly="readonly">

@@ -497,19 +497,19 @@
                toastr.warning("采购方式不能为空");
                return;
            }
            if ($("#Pingmu").val() == '') {
                toastr.warning("品目不能为空");
                return;
            }
            //if ($("#Pingmu").val() == '') {
            //    toastr.warning("品目不能为空");
            //    return;
            //}
            if ($("#NoticeTime").val() == '') {
                toastr.warning("公告日期不能为空");
                return;
            }

            if ($.trim($("#OpenTenderCode").val() )== '') {
                toastr.warning("项目编号不能为空");
                return;
            }
            //if ($.trim($("#OpenTenderCode").val() )== '') {
            //    toastr.warning("项目编号不能为空");
            //    return;
            //}
            if ($.trim($("#Title").val()) == '') {
                toastr.warning("项目名称（长）不能为空");
                return;