提交

username@email.com

2024-07-08 3cf9d2b6664bf83216c25d33f3f2890de6f25443

提交

 zhengcaioa/Services/ProjectService.cs

@@ -348,21 +348,7 @@

            }

            if (!string.IsNullOrWhiteSpace(searchEntity.NamesToubiao))
            {
                sql.Append(" and ( exists (select b.[ProjectId] from [Projectzhongbiao] b  where  a.[Id]=b.[ProjectId] and   b.[names] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select c.[ProjectId] from [Projectreason] c  where  a.[Id]=c.[ProjectId] and   c.[reasonname] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select d.[ProjectId] from [Projectyouxiao] d  where  a.[Id]=d.[ProjectId] and   d.[namesyouxiao] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or   a.[drhx] like '%" + searchEntity.NamesToubiao + "%' ");

                sql.Append("   or   a.[dshx] like '%" + searchEntity.NamesToubiao + "%'  ");

                sql.Append(" )");

            }
           
            if (!string.IsNullOrWhiteSpace(searchEntity.Fencha))
            {
                decimal aaaa = 0;
@@ -653,7 +639,28 @@



                var query = _context.Projects
            if (!string.IsNullOrWhiteSpace(searchEntity.NamesToubiao))
            {
              var  sqlsss =   sql.ToString();
                sql.Append(" and ( exists (select b.[ProjectId] from [Projectzhongbiao] b  where  a.[Id]=b.[ProjectId] and   b.[names] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select c.[ProjectId] from [Projectreason] c  where  a.[Id]=c.[ProjectId] and   c.[reasonname] like '%" + searchEntity.NamesToubiao + "%') ");

                sql.Append("  or exists (select d.[ProjectId] from [Projectyouxiao] d  where  a.[Id]=d.[ProjectId] and   d.[namesyouxiao] like '%" + searchEntity.NamesToubiao + "%') ");
                sql.Append(" )");
                sql.Append(" union "+ sqlsss + " and (   a.[drhx] like '%" + searchEntity.NamesToubiao + "%' ");

                sql.Append("   or   a.[dshx] like '%" + searchEntity.NamesToubiao + "%'  ");
                sql.Append(" )");


            }





            var query = _context.Projects
           .FromSqlRaw(sql.ToString());



 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

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

                    var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if ((projectDTOsyue!=null && projectDTOsyue.Count > 0 ) || (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.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)
@@ -2272,10 +2272,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();
                                               // var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
                                                if (jixiaotichengfangan.Tichengstandard == "01")
                                                {
                                                    decimal youxiaojijian = projectDTOri.Count + zhengfuprojectDTOri.Count - renwujishu;
                                                    decimal youxiaojijian = projectDTOri.Count  - renwujishu;//+ zhengfuprojectDTOri.Count
                                                    if (youxiaojijian > 0)
                                                    {
                                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2307,7 +2307,7 @@
                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
                                    if (jixiaotichengfangan.Tichengstandard == "01")
                                    {
                                        decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
                                        decimal youxiaojijian = projectDTOsyue.Count  - renwujishu;//+ zhengfuprojectDTOsyue.Count
                                        if (youxiaojijian > 0)
                                        {
                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);

 zhengcaioa/zhengcaioa/Views/AdmAsk/AskJiaojie.cshtml

@@ -407,18 +407,18 @@

        // 保存
        function saveSimCost(tongyi) {
            var aa = ""; 
            var aa = "";
            if (tongyi == "A") {
                $("input[name='checkbox']:checkbox:checked").each(function () {
                    aa += $(this).val()+","
                })
               
                if (aa == "") {
                    toastr.warning("请选择交接的工作");
                    return;
                }
            }

            if (aa == "") {
                toastr.warning("请选择交接的工作");
                return;
            }
            
            
            $("#JiaojieDtlId").val(aa);
            $("#Tongguojujue").val(tongyi);

 zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml

@@ -250,11 +250,11 @@
                                    投诉人于<span>@(Model.ChallengeDateName)</span>，向<span>@(Model.Questioned)</span>提出质疑，质疑事项为：
                                    @if (string.IsNullOrEmpty(Model.SqdbId))
                                    {
                                        @Html.Raw("<span>　　　　　　　　　　　　　　　　　　　　　　　　　　</span>");
                                        @Html.Raw("<span>　　　　　　　　　　　　　　　　　　　　　　　　　　</span>")
                                    }
                                    else
                                    {
                                        @Html.Raw("<span>" + @Model.SqdbId + "</span>");
                                        @Html.Raw("<span>" + @Model.SqdbId + "</span>")
                                    }