From 00501bf99a6eeb26b79bbe2c83de84edff7e8f65 Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期四, 07 九月 2023 15:29:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/DocumentService
---
DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs | 8
DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs | 2
DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs | 33 +++
DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs | 15 +
DocumentServiceAPI.Web.Core/Startup.cs | 2
DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs | 17 +
DocumentFile.Service/Program.cs | 2
DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs | 4
DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs | 4
DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs | 63 +++++++
DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs | 333 +++++++++++++++++++++++++++++++++++++
11 files changed, 476 insertions(+), 7 deletions(-)
diff --git a/DocumentFile.Service/Program.cs b/DocumentFile.Service/Program.cs
index 17cc37e..eb31e67 100644
--- a/DocumentFile.Service/Program.cs
+++ b/DocumentFile.Service/Program.cs
@@ -46,7 +46,7 @@
c.DefaultModelsExpandDepth(-1);
});
-app.UseHttpsRedirection();
+//app.UseHttpsRedirection();
app.UseAuthorization();
diff --git a/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs b/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
index 447649c..7aebb93 100644
--- a/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
+++ b/DocumentServiceAPI.Application/DocManage/DocClassificationManageAppService.cs
@@ -42,11 +42,11 @@
PageResult<Doc_Classification> result = new PageResult<Doc_Classification>();
if (page.Status.HasValue)
{
- result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status && c.parent_code == page.Code,pg,c=>c.sort_id,OrderByType.Asc);
+ result.Items = await _classificationService.GetPageListAsync(c => c.status ==page.Status && c.parent_code == page.Code && c.is_system == false , pg,c=>c.sort_id,OrderByType.Asc);
}
else
{
- result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code, pg, c => c.sort_id, OrderByType.Asc);
+ result.Items = await _classificationService.GetPageListAsync(c => c.parent_code == page.Code && c.is_system == false , pg, c => c.sort_id, OrderByType.Asc);
}
result.TotalCount = pg.TotalCount;
result.PageIndex = pg.PageIndex;
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
index 50ddd30..1b33fe7 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
@@ -118,6 +118,8 @@
public bool SaveFileInfo(File_Info dp);
- public List<Doc_Classification> GetDocClassificationList();
+ public List<Doc_Classification> GetDocClassificationList();
+
+ public bool SaveDocumentTBXYFileInfoNotRep(Document_TBXYFile dp);
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs
index 80a6b66..5ec9064 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs
@@ -44,5 +44,20 @@
public PageResult<Document_PerformanceInfo> GetDocumentPerformanceInfoListByPaper(DocumentProjectInfoPageSearch page);
+
+ public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page);
+
+
+
+ public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page);
+
+ public bool GetDelDocumentLayInfo(int ID);
+
+ public bool SaveDocumentLayInfo(Document_LayInfo dp);
+
+ public Document_LayInfo GetDocumentLayInfo(int ID);
+
+ public Document_LayInfo GetDocumentLayInfoByName(string LayName);
+
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
index f54364c..8f1b6d1 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
@@ -1803,9 +1803,24 @@
public List<Doc_Classification> GetDocClassificationList()
{
- var ret = _db.Queryable<Doc_Classification>().Where(x => x.parent_code =="003" && x.status == 1).ToList();
+ var ret = _db.Queryable<Doc_Classification>().Where(x => x.parent_code =="003" && x.status == 1 && x.is_system == true).ToList();
return ret;
}
+ public bool SaveDocumentTBXYFileInfoNotRep(Document_TBXYFile dp)
+ {
+
+ if (dp.Id > 0)
+ {
+ _db.Updateable<Document_TBXYFile>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_TBXYFile>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
}
}
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;
+ }
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs b/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs
index dd31fd1..b192c8a 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs
@@ -171,6 +171,69 @@
{
return _sheZhiService.GetDocumentPerformanceInfoListByPaper(page);
}
+
+
+ /// <summary>
+ /// 鑾峰彇璐㈠姟淇℃伅postGetFinancialList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<DocumentProjectInfoDTO> postGetFinancialList(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.postGetFinancialList(page);
+ }
+
+
+
+
+
+ // <summary>
+ /// 鑾峰彇娉曞緥鍒楄〃postDocumentLayInfoList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_LayInfo> postDocumentLayInfoList(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.postDocumentLayInfoList(page);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎娉曞緥GetDelDocumentLayInfo
+ /// </summary>
+ /// <param name="ID"></param>
+ /// <returns></returns>
+ public bool GetDelDocumentLayInfo(int ID)
+ {
+ return _sheZhiService.GetDelDocumentLayInfo(ID);
+ }
+
+ /// <summary>
+ /// 淇敼娉曞緥SaveDocumentLayInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentLayInfo(Document_LayInfo dp)
+ {
+ return _sheZhiService.SaveDocumentLayInfo(dp);
+ }
+
+ /// <summary>
+ /// 鑾峰彇娉曞緥GetDocumentLayInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_LayInfo GetDocumentLayInfo(int ID)
+ {
+ return _sheZhiService.GetDocumentLayInfo(ID);
+ }
+ /// <summary>
+ /// 鑾峰彇娉曞緥GetDocumentLayInfoByName
+ /// <param name="LayName"></param>
+ /// </summary>
+ public Document_LayInfo GetDocumentLayInfoByName(string LayName)
+ {
+ return _sheZhiService.GetDocumentLayInfoByName(LayName);
+ }
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
index 4b92ef8..63c7dcf 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
@@ -61,6 +61,13 @@
public string FilePath { get; set; }
+ public string LayType { get; set; }
+
+ public string LayName { get; set; }
+
+ public string LayProvince { get; set; }
+
+
}
public class DocumentProjectInfoDTO
{
@@ -430,6 +437,32 @@
public string tbqk { get; set; }
public int? DocumentStatus { get; set; }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? TenderDepositStartTime { get; set; }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? TenderDepositEndTime { get; set; }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? BidbondStartTime { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? BidbondEndTime { get; set; }
+
/// <summary>
/// Desc:
diff --git a/DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs b/DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs
index 6b67007..be334f5 100644
--- a/DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs
+++ b/DocumentServiceAPI.Application/UserAndLogin/Services/UserService.cs
@@ -400,7 +400,7 @@
if(tp == null )
{
tp= await _db.Queryable<TenantPermissions>().Where(x=>x.TenantId == TenderID).FirstAsync();
- if (tp == null)
+ if (tp != null)
_cacheService.Add<TenantPermissions>(Key, tp, 300);
else
return false;
diff --git a/DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs b/DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs
index d98e9a0..702a742 100644
--- a/DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs
+++ b/DocumentServiceAPI.Model/cyDocumentModel/Document_LayInfo.cs
@@ -114,5 +114,13 @@
/// </summary>
public int? UserId {get;set;}
+
+ /// <summary>
+ /// Desc:
+ /// Default:1
+ /// Nullable:False
+ /// </summary>
+ public int? TenantID { get; set; }
+
}
}
diff --git a/DocumentServiceAPI.Web.Core/Startup.cs b/DocumentServiceAPI.Web.Core/Startup.cs
index 126af8e..f672793 100644
--- a/DocumentServiceAPI.Web.Core/Startup.cs
+++ b/DocumentServiceAPI.Web.Core/Startup.cs
@@ -36,7 +36,7 @@
app.UseDeveloperExceptionPage();
}
- app.UseHttpsRedirection();
+ // app.UseHttpsRedirection();
app.UseRouting();
--
Gitblit v1.9.1