From 378725af30f2ccf5007f80c553865be2b39f727a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 18 十月 2022 17:09:58 +0800
Subject: [PATCH] 修改数据库地址
---
zhengcaioa/Services/CooperVisitService.cs | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/Services/CooperVisitService.cs b/zhengcaioa/Services/CooperVisitService.cs
index c093088..27ccb94 100644
--- a/zhengcaioa/Services/CooperVisitService.cs
+++ b/zhengcaioa/Services/CooperVisitService.cs
@@ -130,20 +130,36 @@
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
@@ -158,7 +174,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 +184,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,
@@ -231,7 +247,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 +258,12 @@
result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
}
+ else
+ {
+ var listCooperatecustomCustomers = _context.CooperatecustomCustomers.ToList();
+
+ result = _mapper.Map<List<CooperatecustomCustomerDTO>>(listCooperatecustomCustomers);
+ }
--
Gitblit v1.9.1