From 21d415aeaaa4de2cee01a146ad982fa8f47da2b1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 十二月 2022 15:37:32 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/IntentionCustomerService.cs | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 7ffaf19..4d9b9a9 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using AutoMapper;
+using CommonToolsCore;
using DTO;
using IServices;
using Microsoft.AspNetCore.Mvc.Rendering;
@@ -100,10 +101,20 @@
updateproject.Weixiner = intentionCustomer.Weixiner;
updateproject.Weixintime = intentionCustomer.Weixintime;
+ if (!string.IsNullOrEmpty(intentionCustomer.HuiyuanId))
+ {
+ updateproject.HuiyuanId = intentionCustomer.HuiyuanId;
+ }
}
_context.SaveChanges();
- resultEntity.ReturnID = intentionCustomer.Id;
+
+ var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();
+
+ var intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
+
+ resultEntity.ReturnID = intentionCustomer.Id;
resultEntity.Result = true;
}
catch (Exception ex)
@@ -232,7 +243,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
&& (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
- && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null))
+ //&& (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
select new IntentionCustomerDTO
{
Id = a.Id,
@@ -281,6 +292,7 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
+ Customertype = "妗ｆ瀹㈡埛",
Yixiangtime = a.Yixiangtime,
YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
Yixiang = a.Yixiang,
@@ -289,13 +301,29 @@
Zuijinzhuizongtime = a.Zuijinzhuizongtime,
ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
}
- ).OrderByDescending(x => x.Modifytime).ToList();
+ );
+ if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
+ {
+ query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
+ }
+ if (!string.IsNullOrWhiteSpace(searchEntity.ShifouDianhua))
+ {
+ if (searchEntity.ShifouDianhua != "A")
+ {
+ query = query.Where(a => a.Tel == null || a.Tel == "");
+ }
+ else
+ {
+ query = query.Where(a => a.Tel != null && a.Tel != "");
+ }
+
+ }
+
-
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
- var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
return data;
}
@@ -333,9 +361,16 @@
/// <returns></returns>
public List<IntentionCustomerDTO> GetList()
{
-
+ List<IntentionCustomerDTO> intentionCustomerDTOs = (List<IntentionCustomerDTO>)CacheHelperNetCore.CacheValue("intentionCustomerDTOs");
+ if (intentionCustomerDTOs != null && intentionCustomerDTOs.Count > 0)
+ {
+ return intentionCustomerDTOs;
+ }
var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A").ToList();
+
+ intentionCustomerDTOs = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ CacheHelperNetCore.CacheInsert("intentionCustomerDTOs", intentionCustomerDTOs);
var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
return list;
@@ -371,5 +406,26 @@
var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
return list;
}
+
+ public List<IntentionCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Weixiner == userid && r.Weixintime >= datemin && r.Weixintime < datemax).ToList();
+
+ var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ return list;
+ }
+
+ public List<IntentionCustomerDTO> GetListsalaryyixiang(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Dianxiaozhuanyuan == userid && r.Yixiangtime >= datemin && r.Yixiangtime < datemax).ToList();
+
+ var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ return list;
+ }
+
}
}
--
Gitblit v1.9.1