From e1064dd08bba4326d19c81a0b9f4da18c2fa462d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 24 十一月 2022 13:22:42 +0800
Subject: [PATCH] 废标公告写入oa
---
zhengcaioa/Services/IntentionCustomerService.cs | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 22e37f2..44f86b8 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;
@@ -97,11 +98,19 @@
updateproject.Weixin = intentionCustomer.Weixin;
updateproject.Shifoutianjiaweixin = intentionCustomer.Shifoutianjiaweixin;
+ updateproject.Weixiner = intentionCustomer.Weixiner;
+ updateproject.Weixintime = intentionCustomer.Weixintime;
}
_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)
@@ -230,7 +239,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,
@@ -273,6 +282,8 @@
Remark = a.Remark,
Weixin = a.Weixin,
Shifoutianjiaweixin = a.Shifoutianjiaweixin,
+ Weixiner = a.Weixiner,
+ Weixintime = a.Weixintime,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
@@ -287,9 +298,25 @@
}
).OrderByDescending(x => x.Modifytime).ToList();
+ if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
+ {
+ query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim()).ToList();
+ }
+ if (!string.IsNullOrWhiteSpace(searchEntity.ShifouDianhua))
+ {
+ if (searchEntity.ShifouDianhua != "A")
+ {
+ query = query.Where(a => a.Tel == null || a.Tel == "").ToList();
+ }
+ else
+ {
+ query = query.Where(a => a.Tel != null && a.Tel != "").ToList();
+ }
+
+ }
+
-
- 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();
data.LoadData(searchEntity, lianlist);
@@ -329,9 +356,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;
@@ -367,5 +401,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