提交

username@email.com

2021-12-06 5a50381b4d3b30a8de467d01d657a3a842ee0298

 zhengcaioa/Services/CooperOrderService.cs

@@ -978,7 +978,7 @@
                    updateproject.RequestInfo = entity.RequestInfo;

                    updateproject.IsReply = entity.IsReply;
                
                    updateproject.Status = entity.Status; 

                    updateproject.Respondent = entity.Respondent;
                    updateproject.RespondDate = entity.RespondDate;
@@ -1568,6 +1568,13 @@
                         into lsss
                          from lll in lsss.DefaultIfEmpty()


                      //    join d in listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "status")
                      //on b.Status equals int.Parse(d.CodeSn)
                      //into dsss
                      //    from ddd in dsss.DefaultIfEmpty()


                          where a.RecStatus == "A" && a.OrderType1 == "代拟质疑函"
                          && (string.IsNullOrWhiteSpace(searchEntity.XdTime) || (b.Createtime >= XdTimestart && b.Createtime <= XdTimeend))
                            && (string.IsNullOrWhiteSpace(searchEntity.Wenshuleixing) || a.OrderType1 == searchEntity.Wenshuleixing.Trim())
@@ -1596,6 +1603,8 @@
                              YishouMoney = lll.YishouMoney ?? 0,
                              WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                              OrderType1 = a.OrderType1,
                              Status = b.Status.ToString(),
                              //StatusName = ddd.Comments
                          }
                ).ToList();

@@ -1648,6 +1657,7 @@
                           YishouMoney = lll.YishouMoney ?? 0,
                           WeishouMoney = (a.Money ?? 0) /*- (a.Youhui ?? 0)*/ - (lll.YishouMoney ?? 0),
                           OrderType1 = a.OrderType1,
                           Status = b.Status.ToString(),
                       }
                ).ToList();

@@ -1670,6 +1680,15 @@
            //if (searchEntity.totalrows == 0)
            searchEntity.totalrows = query.Count();
            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
            foreach (var cooperOrderDTO in lianlist)
            {
              var  codeDataEntity  =  listCode.Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "status" && x.CodeSn == cooperOrderDTO.Status.ToString()).FirstOrDefault();
                if (codeDataEntity != null) {
                    cooperOrderDTO.StatusName = codeDataEntity.Comments;
                }
            }


            data.LoadData(searchEntity, lianlist);
            return data;
        }