DocumentService.git

			@@ -96,13 +96,27 @@
			/// <returns></returns>
			public async Task<IActionResult> PostDocumentItemList(DocumentSearch search)
			{
			var data = await _docManageService.GetListAsync(c => c.is_del == false && c.doc_code == search.Code && c.tenant_code == search.TenantID);
			if(search.Code == "002")
			{
			var data = await _achievementService.GetListAsync(c => c.status == 1 && c.tenant_code == search.TenantID);
			if (search.class_id > 0)
			{
			data = data.Where(c => c.classification_id == search.class_id).ToList();
			}

			return new JsonResult(data.Select(c => new { name= c.doc_name, c.id }).ToList());
			return new JsonResult(data.OrderBy(x => x.sort).Select(c => new { name = c.achievement_name, idcode = c.id+ "/002" }).ToList());
			}
			else
			{
			var data = await _docManageService.GetListAsync(c => c.status == 1 && c.is_del == false && c.doc_code == search.Code && c.org_id == search.TenantID);
			if (search.class_id > 0)
			{
			data = data.Where(c => c.classification_id == search.class_id).ToList();
			}

			return new JsonResult(data.OrderBy(x => x.sort).Select(c => new { name = c.doc_name , idcode = c.id + "/" + c.doc_code }).ToList());
			}

			}

			/// <summary>
			@@ -114,7 +128,7 @@
			{
			var msg = false;
			Expression<Func<Doc_Info, bool>> expression = t => true;
			expression = expression.And(c => c.tenant_code == model.tenant_id && c.doc_name == model.name && c.doc_code == model.code );
			expression = expression.And(c => c.tenant_code == model.tenant_id && c.doc_name == model.name && c.doc_code == model.code && c.is_del == false );
			if (model.class_id.HasValue && model.class_id!=0)
			{
			expression = expression.And(t => t.classification_id == model.class_id);
			@@ -172,7 +186,7 @@
			.Includes(c=>c.DocOrganization)
			.Includes(c=>c.DocProject)
			.Where(expression)
			.OrderByDescending(c=>c.id)
			.OrderBy(c=>c.sort)
			.ToPageListAsync(page.PageIndex, page.PageSize, total);

			if (data != null && total > 0)
			@@ -188,7 +202,8 @@
			org_name = c.DocOrganization?.UnitName,
			project_id = c.project_id,
			project_name = c.DocProject?.ProjectName,
			status = c.status
			status = c.status,
			sort = c.sort,
			}).ToList();

			}
			@@ -240,6 +255,7 @@
			doc.org_id = info.org_id;
			doc.status = info.status;
			doc.tenant_code = info.tenant_id;
			doc.sort = info.sort;

			var id =await _docManageService.InsertReturnIdentityAsync(doc);
			if (id > 0)
			@@ -287,7 +303,7 @@
			doc.doc_name = info.name;
			doc.org_id = info.org_id;
			doc.status = info.status;

			doc.sort = info.sort;
			if (await _docManageService.UpdateAsync(doc))
			{
			//新提交的文件
			@@ -380,12 +396,84 @@
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public async Task<IActionResult> GetDocumentFilesList(int id)
			public async Task<IActionResult> GetDocumentFilesList(int id,string code)
			{
			if (code == "002")
			{
			var data = await _achievementService.GetByIdAsync(id);
			List<FileInfo_List_Dto> list_Dtos = new List<FileInfo_List_Dto> ();
			if (data != null)
			{
			if (!string.IsNullOrEmpty(data.zbtzs_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.zbtzs_url;
			fileInfo_List_Dto.fileNewName = "中标通知书";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.zbtzs_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			if (!string.IsNullOrEmpty(data.ht_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.ht_url;
			fileInfo_List_Dto.fileNewName = "合同";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.ht_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			if (!string.IsNullOrEmpty(data.ysbg_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.ysbg_url;
			fileInfo_List_Dto.fileNewName = "验收报告";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.ysbg_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			if (!string.IsNullOrEmpty(data.fkpz_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.fkpz_url;
			fileInfo_List_Dto.fileNewName = "付款凭证";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.fkpz_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			if (!string.IsNullOrEmpty(data.yhpj_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.yhpj_url;
			fileInfo_List_Dto.fileNewName = "用户评价";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.yhpj_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			if (!string.IsNullOrEmpty(data.hjzs_url))
			{
			FileInfo_List_Dto fileInfo_List_Dto = new FileInfo_List_Dto();
			fileInfo_List_Dto.filePath = data.hjzs_url;
			fileInfo_List_Dto.fileNewName = "获奖证书";
			fileInfo_List_Dto.suffix = Path.GetExtension(data.hjzs_url);
			list_Dtos.Add(fileInfo_List_Dto);
			}

			}



			return new JsonResult(list_Dtos);
			}
			else
			{
			var data = await _fileManageService.GetListAsync(c => c.status == 1 && c.doc_id == id);

			var list = data.Select(c => new FileInfo_List_Dto(c)).OrderBy(c => c.sort).ToList();

			return new JsonResult(list);
			}


			}

			#endregion
			@@ -414,13 +502,89 @@
			{
			expression = expression.And(t => t.achievement_name.Contains(page.Name));
			}
			if (page.zbtzs.HasValue)
			{
			if (page.zbtzs == 1)
			{
			expression = expression.And(t => t.zbtzs_url != null);
			}
			else
			{
			expression = expression.And(t => t.zbtzs_url == null);
			}

			}
			if (page.ht.HasValue)
			{
			if (page.ht == 1)
			{
			expression = expression.And(t => t.ht_url != null);
			}
			else
			{
			expression = expression.And(t => t.ht_url == null);
			}

			}

			if (page.ysbg.HasValue)
			{
			if (page.ysbg == 1)
			{
			expression = expression.And(t => t.ysbg_url != null);
			}
			else
			{
			expression = expression.And(t => t.ysbg_url == null);
			}

			}

			if (page.fkpz.HasValue)
			{
			if (page.fkpz == 1)
			{
			expression = expression.And(t => t.fkpz_url != null);
			}
			else
			{
			expression = expression.And(t => t.fkpz_url == null);
			}

			}

			if (page.yhpj.HasValue)
			{
			if (page.yhpj == 1)
			{
			expression = expression.And(t => t.yhpj_url != null);
			}
			else
			{
			expression = expression.And(t => t.yhpj_url == null);
			}

			}

			if (page.hjzs.HasValue)
			{
			if (page.hjzs == 1)
			{
			expression = expression.And(t => t.hjzs_url != null);
			}
			else
			{
			expression = expression.And(t => t.hjzs_url == null);
			}

			}

			RefAsync<int> total = 0;
			var data = await _achievementService.Context.Queryable<Doc_Achievement>()
			.Includes(c => c.DocClassification)
			.Includes(c => c.DocProject)
			.Where(expression)
			.OrderByDescending(c => c.id)
			.OrderBy(c => c.sort)
			.ToPageListAsync(page.PageIndex, page.PageSize, total);

			if (data != null && total > 0)
			@@ -432,14 +596,15 @@
			class_name = c.DocClassification?.doc_classification,
			id = c.id,
			project_id = c.project_id,
			project_name = c.DocProject?.ProjectName,
			project_name = c.achievement_name,//c.DocProject?.ProjectName,
			fkpz=c.fkpz_url,
			hjzs=c.hjzs_url,
			ht=c.ht_url,
			yhpj=c.yhpj_url,
			ysbg=c.ysbg_url,
			zbtzs=c.zbtzs_url,
			status = c.status
			status = c.status,
			sort = c.sort,
			}).ToList();

			}
			@@ -464,10 +629,18 @@
			{
			var msg = false;
			var ck = await _achievementService.GetFirstAsync(c=>c.status==1 && c.tenant_code==model.tenant_id
			&& c.project_id==model.project_id && c.classification_id==c.classification_id);
			&& c.achievement_name==model.name && c.classification_id==c.classification_id);
			if (ck != null)
			{
			if(model.id>0 && model.id != ck.id)
			{
			msg = true;
			}
			else
			{
			msg = false;
			}

			}
			return msg;
			}
			@@ -478,6 +651,29 @@
			/// <param name="info"></param>
			/// <returns></returns>
			public async Task<bool> PostAddDocAchievement(Achievement_Submit_Dto info)
			{
			if (info.id > 0)
			{
			Doc_Achievement doc = new Doc_Achievement();
			doc.id = info.id;
			doc.add_time = DateTime.Now;
			doc.classification_id = info.class_id;
			doc.project_id = info.project_id;
			doc.achievement_name = info.name;

			doc.fkpz_url = info.fkpz;
			doc.hjzs_url = info.hjzs;
			doc.ht_url = info.ht;
			doc.yhpj_url = info.yhpj;
			doc.ysbg_url = info.ysbg;
			doc.zbtzs_url = info.zbtzs;

			doc.status = 1;
			doc.tenant_code = info.tenant_id;
			doc.sort = info.sort;
			return await _achievementService.UpdateAsync(doc);
			}
			else
			{
			Doc_Achievement doc = new Doc_Achievement();
			doc.add_time = DateTime.Now;
			@@ -494,10 +690,63 @@

			doc.status = 1;
			doc.tenant_code = info.tenant_id;
			doc.sort = info.sort;

			return await _achievementService.InsertAsync(doc);
			}

			}



			/// <summary>
			/// 删除文档数据
			/// </summary>
			/// <param name="doc"></param>
			/// <returns></returns>
			public async Task<IActionResult> PostDelAchievement(Achievement_Submit_Dto doc)
			{
			bool msg = false;
			var sss = new Doc_Achievement();
			sss.id = doc.id;

			msg = await _achievementService.DeleteAsync(sss);
			return new JsonResult(msg);
			}


			/// <summary>
			/// 根据文档号查询
			/// </summary>
			/// <param name="search"></param>
			/// <returns></returns>
			public async Task<IActionResult> PostAchievementInfo(DocumentSearch search)
			{
			var data = await _achievementService.GetFirstAsync(c => c.id == search.ID && c.tenant_code == search.TenantID);
			if (data != null)
			{
			Achievement_Submit_Dto achievement_Submit_Dto = new Achievement_Submit_Dto();
			achievement_Submit_Dto.id = data.id;
			achievement_Submit_Dto.class_id = data.classification_id.Value;
			//achievement_Submit_Dto.project_id = data.project_id.Value;
			achievement_Submit_Dto.name = data.achievement_name;
			achievement_Submit_Dto.zbtzs = data.zbtzs_url;
			achievement_Submit_Dto.ht = data.ht_url;
			achievement_Submit_Dto.ysbg = data.ysbg_url;
			achievement_Submit_Dto.fkpz = data.fkpz_url;
			achievement_Submit_Dto.yhpj = data.yhpj_url;
			achievement_Submit_Dto.hjzs = data.hjzs_url;
			achievement_Submit_Dto.tenant_id = data.tenant_code;
			achievement_Submit_Dto.status = data.status;
			achievement_Submit_Dto.sort = data.sort;


			return new JsonResult(achievement_Submit_Dto);
			}

			return null;
			}

			#endregion
			}
			}