工资绩效改版

username@email.com

2023-02-28 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c

 zhengcaioa/Services/CooperVisitService.cs

@@ -130,22 +130,41 @@

            var query = (from a in _context.CooperVisits
                         join b in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "visType")
                         on a.VisType equals b.CodeSn
                           on a.VisType equals b.CodeSn
                            into bzsssss
                         from bzzzzz in bzsssss.DefaultIfEmpty()

                         join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
                         on a.Jtype equals c.CodeSn
                           into czsssss
                         from czzzzz in czsssss.DefaultIfEmpty()

                         join d in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "zw")
                          on a.Zw equals d.CodeSn
                            into dzsssss
                         from dzzzzz in dzsssss.DefaultIfEmpty()

                         join e in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "yx")
                         on a.Yx equals e.CodeSn
                           into ezsssss
                         from ezzzzz in ezsssss.DefaultIfEmpty()

                         join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jy")
                          on a.Jy equals f.CodeSn
                         join zz in _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A")
                            into fzsssss
                         from fzzzzz in fzsssss.DefaultIfEmpty()

                         join zz in _context.CooperatecustomCustomers
                         on a.Viscustomer equals zz.Id
                         join g in _context.Areas on zz.Sheng equals g.CodeId
                         join h in _context.Areas on zz.City equals h.CodeId
                         join i in _context.Areas on zz.AreaId equals i.CodeId

                         //join g in _context.Areas on zz.Sheng equals g.CodeId
                         //join h in _context.Areas on zz.City equals h.CodeId
                         //join i in _context.Areas on zz.AreaId equals i.CodeId

                         join zzz in _context.PltUsers.Where(x => x.RecStatus == "A")
                        on a.Creater equals zzz.Id
                        into zsssss
                         from zzzzz in zsssss.DefaultIfEmpty()


                         where a.RecStatus == "A"
@@ -158,7 +177,7 @@
                              && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zz.Sheng == searchEntity.Sheng.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())

                                 && (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
                         select new CooperVisitDTO
                         {
                             Id = a.Id,
@@ -168,12 +187,12 @@
                             Name = zz.Name,
                             Jtype = a.Jtype,
                             Jdr = a.Jdr,
                             ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = b.Comments,
                             JtypeName = c.Comments,
                             ZwName = d.Comments,
                             YxName = e.Comments,
                             JyName = f.Comments,
                             //ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = bzzzzz.Comments,
                             JtypeName = czzzzz.Comments,
                             ZwName = dzzzzz.Comments,
                             YxName = ezzzzz.Comments,
                             JyName = fzzzzz.Comments,
                             Zw = a.Zw,
                             Talk = a.Talk,
                             Khfk = a.Khfk,
@@ -182,7 +201,7 @@
                             Jy = a.Jy,
                             Creater = a.Creater,
                             Createtime = a.Createtime,

                             CreaterName = zzzzz.UserName,
                             RecStatus = a.RecStatus,
                             Modifier = a.Modifier,
                             Modifytime = a.Modifytime,
@@ -231,7 +250,7 @@
        /// 获取所有有效合作客户
        /// </summary>
        /// <returns></returns>
        public List<CooperatecustomCustomerDTO> GetList(string[] id)
        public List<CooperatecustomCustomerDTO> GetList(string[] id=null)
        {
            List<CooperatecustomCustomerDTO> result = new List<CooperatecustomCustomerDTO>();
            if (id != null)
@@ -242,6 +261,12 @@

                result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
            }
            else
            {
                var listCooperatecustomCustomers = _context.CooperatecustomCustomers.ToList();

                result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
            }