zhengcaioa.git - Gitblit

			@@ -64,6 +64,9 @@
			updateproject.Name = project.Name;
			updateproject.Drhx = project.Drhx;
			updateproject.DrhxPrice = project.DrhxPrice;
			updateproject.DrhxDefen = project.DrhxDefen;
			updateproject.DshxDefen = project.DshxDefen;
			updateproject.Dshx = project.Dshx;
			updateproject.Dshx = project.Dshx;
			updateproject.DshxPrice = project.DshxPrice;
			updateproject.Zhuanjia = project.Zhuanjia;
			@@ -188,6 +191,7 @@
			}
			projectzhongbiao.Names = projectDTO.Names[i];
			projectzhongbiao.Price = projectDTO.Price[i];
			projectzhongbiao.Defen = projectDTO.Defen[i];
			projectzhongbiao.ProjectId = project.Id;
			_context.Projectzhongbiaos.Add(projectzhongbiao);
			}
			@@ -227,7 +231,9 @@


			var projectDTO = _mapper.Map<ProjectDTO>(entity);
			if(projectreasons!=null && projectreasons.Count>0)
			projectDTO.DrhxDefenName = projectDTO.DrhxDefen.HasValue ? projectDTO.DrhxDefen.Value.ToString("F2") : "";
			projectDTO.DshxDefenName = projectDTO.DshxDefen.HasValue ? projectDTO.DshxDefen.Value.ToString("F2") : "";
			if (projectreasons!=null && projectreasons.Count>0)
			{
			projectDTO.projectreasons = projectreasons;
			}
			@@ -251,12 +257,26 @@

			if (Projectzhongbiaos != null && Projectzhongbiaos.Count > 0)
			{
			projectDTO.Projectzhongbiaos = Projectzhongbiaos;
			List<ProjectzhongbiaoDTO> projectzhongbiaoDTOs = new List<ProjectzhongbiaoDTO>();
			foreach(var projectzhongbiao in Projectzhongbiaos)
			{
			ProjectzhongbiaoDTO projectzhongbiaoDTO = new ProjectzhongbiaoDTO();
			projectzhongbiaoDTO.DefenName = projectzhongbiao.Defen.HasValue ? projectzhongbiao.Defen.Value.ToString("F2") : "";

			projectzhongbiaoDTO.ZhongbiaoId = projectzhongbiao.ZhongbiaoId;
			projectzhongbiaoDTO.ProjectId = projectzhongbiao.ProjectId;
			projectzhongbiaoDTO.Names = projectzhongbiao.Names;
			projectzhongbiaoDTO.Price = projectzhongbiao.Price;
			projectzhongbiaoDTO.Defen = projectzhongbiao.Defen;

			projectzhongbiaoDTOs.Add(projectzhongbiaoDTO);
			}
			projectDTO.Projectzhongbiaos = projectzhongbiaoDTOs;
			}
			else
			{
			var Projectzhongbiaoslist = new List<Projectzhongbiao>();
			Projectzhongbiaoslist.Add(new Projectzhongbiao());
			var Projectzhongbiaoslist = new List<ProjectzhongbiaoDTO>();
			Projectzhongbiaoslist.Add(new ProjectzhongbiaoDTO());
			projectDTO.Projectzhongbiaos = Projectzhongbiaoslist;
			}

			@@ -272,7 +292,7 @@
			List<ProjectDTO> list = new List<ProjectDTO>();
			//筛选
			StringBuilder sql = new StringBuilder();
			sql.Append("SELECT distinct a.[Id],a.[start_time] ,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.[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.[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.[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] ");
			@@ -301,8 +321,17 @@
			sql.Append(" )");

			}
			if (!string.IsNullOrWhiteSpace(searchEntity.Fencha))
			{
			decimal aaaa = 0;
			decimal.TryParse(searchEntity.Fencha, out aaaa);
			if (aaaa > 0)
			{
			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.Reasonname))
			if (!string.IsNullOrWhiteSpace(searchEntity.Reasonname))
			{
			sql.Append(" and exists (select b.[ProjectId] from [Projectreason] b where a.[Id]=b.[ProjectId] and b.[reasonname] like '%" + searchEntity.Reasonname + "%') ");