From 38aff235316e8d49bf3558bfaa44f4c6ab2b78a4 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期五, 15 九月 2023 17:26:58 +0800
Subject: [PATCH] 修改权限体系，增加标书信息管理权限分离，分为标书信息管理平台使用，和标书制作管理使用，修改权限表，订单表
---
DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 333 insertions(+), 0 deletions(-)
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs
index 8b3df48..fd25822 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs
@@ -609,5 +609,338 @@
return jwtInfo;
}
+
+ public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page)
+ {
+ var aaa = GetJwtInfo();
+
+ SqlSugar.PageModel pg = new SqlSugar.PageModel();
+ pg.PageSize = page.PageSize;
+ pg.PageIndex = page.PageIndex;
+ //page.ToEmployeeId = a.EID;
+ int total = 0;
+ PageResult<DocumentProjectInfoDTO> result = new PageResult<DocumentProjectInfoDTO>();
+
+
+
+ result.Items = _db.Queryable<Document_ProjectInfo, Document_ProjectExpand>((a, d) =>
+ new JoinQueryInfos
+ (
+ JoinType.Left, a.ProjectId == d.ProjectId && d.UnitId == page.UnitId
+
+ ))
+ .Where((a, d) => a.TenantID == aaa.TEID)
+ //鐪�
+ .WhereIF(!string.IsNullOrEmpty(page.Province) && page.Province != "璇烽�夋嫨", (a, d) => (a.Province == page.Province))
+ //甯�
+ .WhereIF(!string.IsNullOrEmpty(page.City) && page.City != "璇烽�夋嫨", (a, d) => (a.City == page.City))
+ //鍖哄幙
+ .WhereIF(!string.IsNullOrEmpty(page.County) && page.County != "璇烽�夋嫨", (a, d) => (a.County == page.County))
+ //鎶ュ悕鏃堕棿
+ .WhereIF(!string.IsNullOrEmpty(page.ddlSignupStartTime), (a, d) => a.SignupStartTime >= DateTime.Parse(page.ddlSignupStartTime))
+ //鎶ュ悕鏃堕棿
+ .WhereIF(!string.IsNullOrEmpty(page.ddlSignupEndTime), (a, d) => a.SignupEndTime <= DateTime.Parse(page.ddlSignupEndTime))
+ //寮�鏍囨椂闂�
+ .WhereIF(!string.IsNullOrEmpty(page.ddlTenderStartTime), (a, d) => a.TenderTime >= DateTime.Parse(page.ddlTenderStartTime))
+ //寮�鏍囨椂闂�
+ .WhereIF(!string.IsNullOrEmpty(page.ddlTenderEndTime), (a, d) => a.TenderTime <= DateTime.Parse(page.ddlTenderEndTime))
+ //閲囪喘鏂瑰紡
+ .WhereIF(page.ddlPurchaseMethod > 0, (a, d) => a.PurchaseMethod == page.ddlPurchaseMethod)
+ //椤圭洰鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.txtProjectName), (a, d) => a.ProjectName.Contains(page.txtProjectName))
+ //椤圭洰缂栧彿
+ .WhereIF(!string.IsNullOrEmpty(page.txtProjectCode), (a, d) => a.ProjectCode.Contains(page.txtProjectCode))
+ //閲囪喘鍗曚綅
+ .WhereIF(!string.IsNullOrEmpty(page.txtPurchaseUnit), (a, d) => a.PurchaseUnit.Contains(page.txtPurchaseUnit))
+ //浠ｇ悊鏈烘瀯
+ .WhereIF(!string.IsNullOrEmpty(page.txtAgencyUnit), (a, d) => a.AgencyUnit.Contains(page.txtAgencyUnit))
+ ////鎶曟爣浜�
+ //.WhereIF(!string.IsNullOrEmpty(page.txtTenderPerson), (a, d) => d.TenderPerson.Contains(page.txtTenderPerson))
+ // //涓撳
+ // .WhereIF(!string.IsNullOrEmpty(page.Experts), (a, d) => d.Experts.Contains(page.Experts))
+ // //鎶ュ悕鐘舵��
+ // .WhereIF(page.ddlSignUp > 0 && page.ddlSignUp == 1, (a, d) => (d.IsSignup == 0 || d.IsSignup == null))
+ // .WhereIF(page.ddlSignUp > 0 && page.ddlSignUp != 1, (a, d) => d.IsSignup == 1)
+ //淇濊瘉閲戠姸鎬�
+ .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 12, (a, d) => d.TenderDepositStatus == null)
+ .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 36, (a, d) => a.TenderTime < DateTime.Now.AddDays(15) && d.TenderDepositStatus == 13)
+ .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit != 12 && page.ddlTenderDeposit != 36, (a, d) => d.TenderDepositStatus == page.ddlTenderDeposit)
+ //灞ョ害閲戠姸鎬�
+ .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond == 32, (a, d) => (d.BidbondStatus == null))
+ .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond != 32, (a, d) => d.BidbondStatus == page.ddlBidbond)
+ // //鏍囦功鐘舵��
+ // .WhereIF(page.ddlDocumentStatus > 0 && page.ddlDocumentStatus == 15, (a, d) => (d.DocumentStatus == null || d.DocumentStatus == 0 || d.DocumentStatus == 15))
+ // .WhereIF(page.ddlDocumentStatus > 0 && page.ddlDocumentStatus != 15, (a, d) => d.DocumentStatus == page.ddlDocumentStatus)
+ // //鎶曟爣鐘舵��
+ // .WhereIF(page.ddlTenderStatus > 0 && page.ddlTenderStatus == 1, (a, d) => (d.TenderStatus == null || d.TenderStatus == 0))
+ // .WhereIF(page.ddlTenderStatus > 0 && page.ddlTenderStatus != 1, (a, d) => d.TenderStatus == 1)
+ ////涓爣鎯呭喌
+ //.WhereIF(page.ddlWinStatus > 0 && page.ddlWinStatus == 1, (a, d) => n.IsWin == null)
+ // .WhereIF(page.ddlWinStatus > 0 && page.ddlWinStatus != 1, (a, d) => n.IsWin == (page.ddlWinStatus - 1))
+ ////璐ㄧ枒鎯呭喌
+ //.WhereIF(page.ddlOppugnStatus > 0 && page.ddlOppugnStatus == 1, (a, d) => (e.FilePath == null || e.FilePath == ""))
+ // .WhereIF(page.ddlOppugnStatus > 0 && page.ddlOppugnStatus != 1, (a, d) => (e.FilePath != null && e.FilePath != ""))
+ ////鎶曡瘔鎯呭喌
+ //.WhereIF(page.ddlComplainStatus > 0 && page.ddlComplainStatus == 1, (a, d) => (f.FilePath == null || f.FilePath == ""))
+ // .WhereIF(page.ddlComplainStatus > 0 && page.ddlComplainStatus != 1, (a, d) => (f.FilePath != null && f.FilePath != ""))
+ // //澶嶈鎯呭喌
+ // .WhereIF(page.ddlReviewStatus > 0 && page.ddlReviewStatus == 1, (a, d) => (g.FilePath == null || g.FilePath == ""))
+ // .WhereIF(page.ddlReviewStatus > 0 && page.ddlReviewStatus != 1, (a, d) => (g.FilePath != null && g.FilePath != ""))
+ // //璇夎鎯呭喌
+ // .WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus == 1, (a, d) => (h.FilePath == null || h.FilePath == ""))
+ // .WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus != 1, (a, d) => (h.FilePath != null && h.FilePath != ""))
+ .Select((a, d) => new DocumentProjectInfoDTO
+ {
+ ProjectId = a.ProjectId,
+ SignupStartTime = a.SignupStartTime,
+ Province = a.Province,
+ City = a.City,
+ County = a.County,
+ ProjectName = a.ProjectName,
+ PurchaseUnit = a.PurchaseUnit,
+ AgencyUnit = a.AgencyUnit,
+ TenderTime = a.TenderTime,
+ TenderPerson = d.TenderPerson,
+ IsSignup = d.IsSignup,
+ TenderDepositStatus = d.TenderDepositStatus,
+ BidbondStatus = d.BidbondStatus,
+ TenderStatus = d.TenderStatus,
+ tbqk = "鎶曟爣鎯呭喌",
+ wj = "",
+ NoticeTypeName = "鎷涙爣鍏憡",
+ NoticeType = a.NoticeType,
+ PurchaseMethod = a.PurchaseMethod,
+ DocumentStatus = d.DocumentStatus,
+ TenderDepositStartTime = d.TenderDepositStartTime,
+ TenderDeposit = a.TenderDeposit,
+ TenderDepositEndTime = d.TenderDepositEndTime,
+ BidbondStartTime = d.BidbondStartTime,
+ BidbondEndTime = d.BidbondEndTime,
+ Bidbond = a.Bidbond,
+ }
+ )
+ .OrderByDescending(a => a.ProjectId).ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+ if (result.Items != null && result.Items.Count > 0)
+ {
+ var ret = _db.Queryable<Document_Dictionary>().ToList();
+ foreach (var documentProjectInfoDTO in result.Items)
+ {
+ if (documentProjectInfoDTO.City == "璇烽�夋嫨" && documentProjectInfoDTO.County == "璇烽�夋嫨")
+ {
+ documentProjectInfoDTO.xmqy = documentProjectInfoDTO.Province;
+ }
+ else if (documentProjectInfoDTO.City == "璇烽�夋嫨" && documentProjectInfoDTO.County == "鍏朵粬")
+ {
+ documentProjectInfoDTO.xmqy = documentProjectInfoDTO.City;
+ }
+ else
+ {
+ documentProjectInfoDTO.xmqy = documentProjectInfoDTO.City + documentProjectInfoDTO.County;
+ }
+
+ //if (documentProjectInfoDTO.IsSignup == 1)
+ //{
+ // documentProjectInfoDTO.bm = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.bm = "鎶ュ悕";
+ //}
+
+ if (!documentProjectInfoDTO.TenderDepositStatus.HasValue || documentProjectInfoDTO.TenderDepositStatus == 0)
+ {
+ documentProjectInfoDTO.bzj = "缂磋垂";
+ }
+ else if (documentProjectInfoDTO.TenderDepositStatus == 13)
+ {
+ documentProjectInfoDTO.bzj = "閫�娆�";
+ }
+ else
+ {
+ documentProjectInfoDTO.bzj = "鈭�";
+ }
+
+ if (!documentProjectInfoDTO.BidbondStatus.HasValue || documentProjectInfoDTO.BidbondStatus == 0)
+ {
+ documentProjectInfoDTO.lybzj = "缂磋垂";
+ }
+ else if (documentProjectInfoDTO.BidbondStatus == 33)
+ {
+ documentProjectInfoDTO.lybzj = "閫�娆�";
+ }
+ else
+ {
+ documentProjectInfoDTO.lybzj = "鈭�";
+ }
+
+ //if (documentProjectInfoDTO.TenderStatus == 1)
+ //{
+ // documentProjectInfoDTO.tb = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.tb = "鎶曟爣";
+ //}
+
+ //if (documentProjectInfoDTO.DocumentStatus == 17)
+ //{
+ // documentProjectInfoDTO.bs = "鈭�";
+ //}
+ //else if (documentProjectInfoDTO.DocumentStatus == 16)
+ //{
+ // documentProjectInfoDTO.bs = "鍒朵綔涓�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.bs = "鏈埗浣�";
+ //}
+
+
+ //if (!documentProjectInfoDTO.IsWin.HasValue || documentProjectInfoDTO.IsWin <= 0)
+ //{
+ // documentProjectInfoDTO.zb = "涓爣";
+ //}
+ //else if (documentProjectInfoDTO.IsWin == 2)
+ //{
+ // documentProjectInfoDTO.zb = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.zb = "脳";
+ //}
+
+ //if (documentProjectInfoDTO.IsAdvise == 1)
+ //{
+ // documentProjectInfoDTO.Advise = "鏂规淇濆瓨";// "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.Advise = "鏂规淇濆瓨";
+ //}
+
+ //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathzy))
+ //{
+ // documentProjectInfoDTO.zy = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.zy = "";
+ //}
+
+ //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathts))
+ //{
+ // documentProjectInfoDTO.ts = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.ts = "";
+ //}
+
+
+ //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathfy))
+ //{
+ // documentProjectInfoDTO.fy = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.fy = "";
+ //}
+
+
+ //if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathss))
+ //{
+ // documentProjectInfoDTO.ss = "鈭�";
+ //}
+ //else
+ //{
+ // documentProjectInfoDTO.ss = "";
+ //}
+ //if (documentProjectInfoDTO.PurchaseMethod.HasValue && documentProjectInfoDTO.PurchaseMethod.Value > 0)
+ //{
+ // var document_Dictionary = ret.Where(x => x.Id == documentProjectInfoDTO.PurchaseMethod).FirstOrDefault();
+ // if (document_Dictionary != null)
+ // {
+ // documentProjectInfoDTO.PurchaseMethodName = document_Dictionary.Name;
+ // }
+ //}
+
+ }
+ }
+
+ return result;
+ }
+
+
+
+ public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page)
+ {
+ var aaa = GetJwtInfo();
+
+ SqlSugar.PageModel pg = new SqlSugar.PageModel();
+ pg.PageSize = page.PageSize;
+ pg.PageIndex = page.PageIndex;
+ //page.ToEmployeeId = a.EID;
+ int total = 0;
+ PageResult<Document_LayInfo> result = new PageResult<Document_LayInfo>();
+
+
+
+ result.Items = _db.Queryable<Document_LayInfo>()
+ .Where(a => a.TenantID == aaa.TEID)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.LayName), a => a.LayName == page.LayName)
+ .WhereIF(!string.IsNullOrEmpty(page.LayType) && page.LayType != "璇烽�夋嫨", a => a.LayType == page.LayType)
+ .WhereIF(!string.IsNullOrEmpty(page.LayProvince), a => a.LayProvince == page.LayProvince)
+
+ .OrderByDescending(a => a.LayId).ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+
+
+ return result;
+ }
+
+ public bool GetDelDocumentLayInfo(int ID)
+ {
+ _db.Deleteable<Document_LayInfo>().Where(x => x.LayId == ID).ExecuteCommand();
+
+
+
+ return true;
+ }
+
+ public bool SaveDocumentLayInfo(Document_LayInfo dp)
+ {
+ if (dp.LayId > 0)
+ {
+ _db.Updateable<Document_LayInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_LayInfo>(dp).ExecuteCommand();
+ }
+ return true;
+ }
+
+ public Document_LayInfo GetDocumentLayInfo(int ID)
+ {
+ var result = _db.Queryable<Document_LayInfo>().Where(x => x.LayId == ID).First();//鎵ц鏌ヨ
+ return result;
+ }
+
+ public Document_LayInfo GetDocumentLayInfoByName(string LayName)
+ {
+ var aaa = GetJwtInfo();
+ var result = _db.Queryable<Document_LayInfo>().Where(x => x.LayName == LayName && x.TenantID == aaa.EID).First();//鎵ц鏌ヨ
+ return result;
+ }
}
}
--
Gitblit v1.9.1