增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

增加制单人查询条件

 zhengcaioa/Services/CooperatecustomCustomerService.cs

@@ -145,8 +145,6 @@

                var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();

               var  CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
                CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);

                resultEntity.ReturnID = cooperatecustomCustomer.Id;
                resultEntity.Result = true;
@@ -512,38 +510,21 @@
        /// <returns></returns>
        public List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "", string Name = "")
        {
            List<CooperatecustomCustomerDTO> CooperatecustomCustomerDTOs = (List<CooperatecustomCustomerDTO>)CacheHelperNetCore.CacheValue("CooperatecustomCustomerDTOs");
            if (CooperatecustomCustomerDTOs != null && CooperatecustomCustomerDTOs.Count > 0)
            {
                if (!string.IsNullOrEmpty(HuiyuanId))
                {
                    CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
                }

                if (!string.IsNullOrEmpty(Name))
                {
                    CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
                }

                return CooperatecustomCustomerDTOs;
            }

            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();

            CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            CacheHelperNetCore.CacheInsert("CooperatecustomCustomerDTOs", CooperatecustomCustomerDTOs);
          


            if (!string.IsNullOrEmpty(HuiyuanId))
            {
                CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.HuiyuanId == HuiyuanId).ToList();
                listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
            }

            if (!string.IsNullOrEmpty(Name))
            {
                CooperatecustomCustomerDTOs = CooperatecustomCustomerDTOs.Where(x => x.Name == Name).ToList();
                listPosition = listPosition.Where(x => x.Name == Name).ToList();
            }

            var CooperatecustomCustomerDTOs = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
            return CooperatecustomCustomerDTOs;



 zhengcaioa/Services/IntentionCustomerService.cs

@@ -142,8 +142,8 @@

                var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();

              var  intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
                CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
                // var  intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
                //CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);

                resultEntity.ReturnID = intentionCustomer.Id;
            resultEntity.Result = true;
@@ -527,32 +527,19 @@
        /// <returns></returns>
        public List<IntentionCustomerDTO> GetList(string huiyuanId = null)
        {
            List<IntentionCustomerDTO> intentionCustomerDTOs = (List<IntentionCustomerDTO>)CacheHelperNetCore.CacheValue("intentionCustomerDTOs");
             

            if (intentionCustomerDTOs != null && intentionCustomerDTOs.Count > 0)
            {
                if (!string.IsNullOrEmpty(huiyuanId))
                {
                    intentionCustomerDTOs = intentionCustomerDTOs.Where(x => x.HuiyuanId == huiyuanId).ToList();
                }

                
                return intentionCustomerDTOs;
            }


            var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();

            intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
            CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
           


            if (!string.IsNullOrEmpty(huiyuanId))
            {
                intentionCustomerDTOs = intentionCustomerDTOs.Where(x => x.HuiyuanId == huiyuanId).ToList();
                listPosition = listPosition.Where(x => x.HuiyuanId == huiyuanId).ToList();
            }

            var intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
            return intentionCustomerDTOs;
        }


 zhengcaioa/Services/ProjectService.cs

@@ -231,7 +231,7 @@
                        }
                    }
                }
                CacheHelperNetCore.CacheNull("Projects");
                //CacheHelperNetCore.CacheNull("Projects");


                _context.SaveChanges();
@@ -860,16 +860,12 @@
        /// <returns></returns>
        public List<ProjectDTO> GetList()
        {
            List<ProjectDTO> projectDTOs = (List<ProjectDTO>)CacheHelperNetCore.CacheValue("Projects");
            if (projectDTOs!=null&& projectDTOs.Count > 0)
            {
                return projectDTOs;
            }
             

            var listPosition = _context.Projects.Where(r => r.RecStatus == "A").ToList();
           
            var list = _mapper.Map<List<ProjectDTO>>(listPosition);
            CacheHelperNetCore.CacheInsert("Projects", list);
            
            return list;
        }


 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

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

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

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

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

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

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

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

 zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml

@@ -269,7 +269,7 @@

            { label: '订单状态', name: 'ShouliStatus', labtype: 'combox', hidden: false, data: JSON.parse(ShouliStatus), cwidth: '5%', cccwidth: '8%' },


            { label: '制单人', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(users), cwidth: '5%', cccwidth: '8%' },