From 04e051727c2d44f36362fc09b94f9d2b24afa69a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 八月 2021 16:44:29 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ProjectService.cs | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 14bf1cf..ca6e783 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -93,7 +93,8 @@
updateproject.Dailicontact = project.Dailicontact;
updateproject.Dailiaddress = project.Dailiaddress;
updateproject.Fencha = project.Fencha;
- updateproject.Shuliang = updateproject.Shuliang;
+ updateproject.Shuliang = project.Shuliang;
+ updateproject.Caigouyusuan = project.Caigouyusuan;
}
@@ -236,6 +237,7 @@
var projectDTO = _mapper.Map<ProjectDTO>(entity);
projectDTO.DrhxDefenName = projectDTO.DrhxDefen.HasValue ? projectDTO.DrhxDefen.Value.ToString("F2") : "";
projectDTO.DshxDefenName = projectDTO.DshxDefen.HasValue ? projectDTO.DshxDefen.Value.ToString("F2") : "";
+ projectDTO.CaigouyusuanName = projectDTO.Caigouyusuan.HasValue ? projectDTO.Caigouyusuan.Value.ToString() : "";
if (projectreasons!=null && projectreasons.Count>0)
{
projectDTO.projectreasons = projectreasons;
@@ -295,7 +297,7 @@
List<ProjectDTO> list = new List<ProjectDTO>();
//绛涢��
StringBuilder sql = new StringBuilder();
- sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[dshx_defen] ,b.[name] +'-'+c.[name]+'-'+d.[name] Sheng ,a.city ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia] , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] for xml path('')), 1,1, '') "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '')
+ sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,b.[name] +'-'+c.[name]+'-'+d.[name] Sheng ,a.city ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia] , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] for xml path('')), 1,1, '') "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '')
sql.Append("FROM [Project] a ");
sql.Append("left join [Area] b on a.[sheng] = b.[codeID] ");
sql.Append("left join [Area] c on a.[city] = c.[codeID] ");
@@ -333,6 +335,16 @@
sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] and (b.[defen]-a.[drhx_defen]) <= " + aaaa + " ) ");
}
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.Baojiachaxiaoyu))
+ {
+ decimal aaaa = 0;
+ decimal.TryParse(searchEntity.Baojiachaxiaoyu, out aaaa);
+ if (aaaa > 0)
+ {
+ sql.Append(" and exists ( select b.[ProjectId] from [Projectzhongbiao] b where a.[Id]=b.[ProjectId] and (convert(numeric(10,2),b.[price] )-convert(numeric(10,2),a.[drhx_price] )) <= " + aaaa + " ) ");
+ }
+ }
+
if (!string.IsNullOrWhiteSpace(searchEntity.Fenchadayu))
{
@@ -528,7 +540,7 @@
- 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();
list = _mapper.Map<List<ProjectDTO>>(lianlist);
@@ -626,5 +638,16 @@
CacheHelperNetCore.CacheInsert("Projects", list);
return list;
}
+
+
+ public List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.Projects.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<ProjectDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1