From 9b79040354b59f3182cd90f7157e682d65310712 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 八月 2023 09:20:15 +0800
Subject: [PATCH] 后端
---
DocumentServiceAPI.Web.Entry/appsettings.json | 13
DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs | 20
DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs | 48 +
DocumentServiceAPI.Model/cyDocumentModel/Document_TBXYFile.cs | 132 +++
DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs | 176 ++++
DocumentServiceAPI.Model/cyDocumentModel/Document_DelegatePersonInfo.cs | 7
DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml | 298 +++++++
DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs | 2
DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs | 232 +++++
DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs | 562 +++++++++++++
DocumentServiceAPI.Application/ProjectInfo/dto/Mapper.cs | 5
DocumentServiceAPI.Model/cyDocumentModel/Document_ZhaobiaoFile.cs | 99 ++
DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentEmployeeInfoDTO.cs | 92 ++
DocumentServiceAPI.Model/cyDocumentModel/Document_WinInfo.cs | 21
DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs | 45 +
DocumentServiceAPI.Utility/PageBaseSearch.cs | 8
DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs | 613 +++++++++++++++
17 files changed, 2,366 insertions(+), 7 deletions(-)
diff --git a/DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml b/DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml
index 982fdf5..be1cf10 100644
--- a/DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml
+++ b/DocumentServiceAPI.Application/DocumentServiceAPI.Application.xml
@@ -494,11 +494,309 @@
<param name="dp"></param>
<returns></returns>
</member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDelegatePersonInfo(System.Int32)">
+ <summary>
+ 鑾峰彇椤圭洰GetDelegatePersonInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentProjectOppugnInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_ProjectOppugnInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentProjectOppugnInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetAllDelegatePerson">
+ <summary>
+ 鑾峰彇椤圭洰GetAllDelegatePerson
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentProjectComplainInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_ProjectComplainInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentProjectComplainInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentProjectReviewInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_ProjectReviewInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentProjectReviewInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetPreUnit(System.String)">
+ <summary>
+ 鏌ヨ椤圭洰GetPreUnit
+ </summary>
+ <param name="childName"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentProjectLitigationInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_ProjectLitigationInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentProjectLitigationInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentAdviseInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_AdviseInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentAdviseInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetTempletModel(System.Int32)">
+ <summary>
+ 鑾峰彇椤圭洰GetTempletModel
+ <param name="templetId"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDocumentTempletList">
+ <summary>
+ 鑾峰彇椤圭洰GetDocumentTempletList
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.postDocumentZhaobiaoFileList(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)">
+ <summary>
+ 鑾峰彇鎷涙爣鏂囦欢鍒楄〃postDocumentZhaobiaoFileList
+ </summary>
+ <param name="page"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentZhaobiaoFileInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_ZhaobiaoFile)">
+ <summary>
+ 淇敼鎷涙爣鏂囦欢SaveDocumentZhaobiaoFileInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDeleteDocumentZhaobiaoFile(System.Int32)">
+ <summary>
+ 鍒犻櫎椤圭洰GetDeleteDocumentZhaobiaoFile
+ </summary>
+ <param name="ID"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDocumentZhaobiaoFileInfo(System.Int32)">
+ <summary>
+ 鑾峰彇椤圭洰GetDocumentZhaobiaoFileInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.postDocumentTBXYFileList(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)">
+ <summary>
+ 鑾峰彇鍝嶅簲鏂囦欢鍒楄〃postDocumentTBXYFileList
+ </summary>
+ <param name="page"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocumentTBXYFileInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_TBXYFile)">
+ <summary>
+ 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDeleteDocumentTBXYFile(System.Int32)">
+ <summary>
+ 鍒犻櫎鍝嶅簲鏂囦欢GetDeleteDocumentTBXYFile
+ </summary>
+ <param name="ID"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDocumentTBXYFileInfo(System.Int32)">
+ <summary>
+ 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDocumentTBXYFileList(System.Int32,System.Int32)">
+ <summary>
+ 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.GetDocumentTBXYFileByFileName(System.Int32,System.Int32,System.String)">
+ <summary>
+ 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveDocInfo(DocumentServiceAPI.Model.cyDocumentModel.Doc_Info)">
+ <summary>
+ 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ </summary>
+ <param name="dp"></param>
+ <returns>int</returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.ProjectInfoController.SaveFileInfo(DocumentServiceAPI.Model.cyDocumentModel.File_Info)">
+ <summary>
+ 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
<member name="M:DocumentServiceAPI.Application.ProjectInfo.Services.ProjectInfoService.GetJwtInfo">
<summary>
鑾峰彇Jwt鐩稿叧淇℃伅
</summary>
</member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.Services.SheZhiService.GetJwtInfo">
+ <summary>
+ 鑾峰彇Jwt鐩稿叧淇℃伅
+ </summary>
+ </member>
+ <member name="T:DocumentServiceAPI.Application.ProjectInfo.SheZhiController">
+ <summary>
+ 鐧诲綍鎺у埗鍣�
+ </summary>
+ </member>
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.postDelegatePersonList(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)" -->
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDelDocumentDelegatePersonInfo(System.Int32)">
+ <summary>
+ 鍒犻櫎椤圭洰GetDelDocumentDelegatePersonInfo
+ </summary>
+ <param name="Id"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.SaveDocumentDelegatePersonInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_DelegatePersonInfo)">
+ <summary>
+ 淇敼椤圭洰SaveDocumentDelegatePersonInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDocumentDelegatePersonInfo(System.Int32)">
+ <summary>
+ 鑾峰彇椤圭洰GetDocumentDelegatePersonInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.postDocumentTenderUnitList(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)" -->
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.SaveDocumentTenderUnitInfo(DocumentServiceAPI.Model.cyDocumentModel.Document_TenderUnit)">
+ <summary>
+ 淇敼鍏徃SaveDocumentTenderUnitInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDocumentTenderUnitInfo(System.Int32)">
+ <summary>
+ 鑾峰彇鍏徃GetDocumentTenderUnitInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.postDocumentEmployeeInfoList(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)" -->
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDelDocumentEmployeeInfoInfo(System.Int32)">
+ <summary>
+ 鍒犻櫎鍛樺伐GetDelDocumentEmployeeInfoInfo
+ </summary>
+ <param name="ID"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.SaveDocumentEmployeeInfoInfo(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO)">
+ <summary>
+ 淇敼鍛樺伐SaveDocumentEmployeeInfoInfo
+ </summary>
+ <param name="dp"></param>
+ <returns></returns>
+ </member>
+ <member name="M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDocumentEmployeeInfoInfo(System.Int32)">
+ <summary>
+ 鑾峰彇鍛樺伐GetDocumentEmployeeInfoInfo
+ <param name="ID"></param>
+ </summary>
+ </member>
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDocumentEmployeeInfoByName(System.String)" -->
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.GetDocumentEmployeeInfoByLoginName(System.String)" -->
+ <!-- Badly formed XML comment ignored for member "M:DocumentServiceAPI.Application.ProjectInfo.SheZhiController.postDocumentPerformanceInfoListByPaper(DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch)" -->
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.EmployeeId">
+ <summary>
+ 鍛樺伐ID
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.EmployeeName">
+ <summary>
+ 鍛樺伐鍚嶇О
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.Job">
+ <summary>
+ 宸ヤ綔鑱屼綅
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.Phone">
+ <summary>
+ 鐢佃瘽
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.IsWork">
+ <summary>
+ 鏄惁鍦ㄥ伐浣�
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.LeaveTime">
+ <summary>
+ 绂诲紑鏃堕棿
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.CardPositive">
+ <summary>
+ 璇佷欢姝ｉ潰
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.CardPositiveVersionNo">
+ <summary>
+ 璇佷欢姝ｉ潰鐗堟湰鍙�
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.CardPositiveSize">
+ <summary>
+ 璇佷欢姝ｉ潰澶у皬
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.LastUpdateTime">
+ <summary>
+ 鏈�鍚庢洿鏂版椂闂�
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.LastUpdateName">
+ <summary>
+ 鏈�鍚庢洿鏂颁汉
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.UserName">
+ <summary>
+ 鐢ㄦ埛鍚�
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.UserPassWord">
+ <summary>
+ 鐢ㄦ埛瀵嗙爜
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.LoginTime">
+ <summary>
+ 鐧诲綍鏃堕棿
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.IsLogin">
+ <summary>
+ 鏄惁鐧诲綍
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.AdviseFlag">
+ <summary>
+ 寤鸿鏍囧織
+ </summary>
+ </member>
+ <member name="P:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO.UserId">
+ <summary>
+ 鐢ㄦ埛ID
+ </summary>
+ </member>
<member name="T:DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentProjectInfoPageSearch">
<summary>
椤圭洰鎼滅储 鍙傛暟
diff --git a/DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs b/DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs
index 87c4d97..1ce0cde 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/ProjectInfoController.cs
@@ -318,5 +318,237 @@
{
return _projectInfoService.SaveDocumentProjectDocumentInfo(dp);
}
+
+
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetDelegatePersonInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_DelegatePersonInfo GetDelegatePersonInfo(int ID)
+ {
+ return _projectInfoService.GetDelegatePersonInfo(ID);
+ }
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentProjectOppugnInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentProjectOppugnInfo(Document_ProjectOppugnInfo dp)
+ {
+ return _projectInfoService.SaveDocumentProjectOppugnInfo(dp);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetAllDelegatePerson
+ /// </summary>
+ public List<Document_DelegatePersonInfo> GetAllDelegatePerson()
+ {
+ return _projectInfoService.GetAllDelegatePerson();
+ }
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentProjectComplainInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentProjectComplainInfo(Document_ProjectComplainInfo dp)
+ {
+ return _projectInfoService.SaveDocumentProjectComplainInfo(dp);
+ }
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentProjectReviewInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentProjectReviewInfo(Document_ProjectReviewInfo dp)
+ {
+ return _projectInfoService.SaveDocumentProjectReviewInfo(dp);
+ }
+
+ /// <summary>
+ /// 鏌ヨ椤圭洰GetPreUnit
+ /// </summary>
+ /// <param name="childName"></param>
+ /// <returns></returns>
+ public string GetPreUnit(string childName)
+ {
+ return _projectInfoService.GetPreUnit(childName);
+ }
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentProjectLitigationInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentProjectLitigationInfo(Document_ProjectLitigationInfo dp)
+ {
+ return _projectInfoService.SaveDocumentProjectLitigationInfo(dp);
+ }
+
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentAdviseInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentAdviseInfo(Document_AdviseInfo dp)
+ {
+ return _projectInfoService.SaveDocumentAdviseInfo(dp);
+ }
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetTempletModel
+ /// <param name="templetId"></param>
+ /// </summary>
+ public Document_DocumentTempletInfo GetTempletModel(int templetId)
+ {
+ return _projectInfoService.GetTempletModel(templetId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetDocumentTempletList
+ /// </summary>
+ public List<Document_DocumentTempletInfo> GetDocumentTempletList()
+ {
+ return _projectInfoService.GetDocumentTempletList();
+ }
+
+
+
+ /// <summary>
+ /// 鑾峰彇鎷涙爣鏂囦欢鍒楄〃postDocumentZhaobiaoFileList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_ZhaobiaoFile> postDocumentZhaobiaoFileList(DocumentProjectInfoPageSearch page)
+ {
+ return _projectInfoService.postDocumentZhaobiaoFileList(page);
+ }
+
+
+
+
+ /// <summary>
+ /// 淇敼鎷涙爣鏂囦欢SaveDocumentZhaobiaoFileInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentZhaobiaoFileInfo(Document_ZhaobiaoFile dp)
+ {
+ return _projectInfoService.SaveDocumentZhaobiaoFileInfo(dp);
+ }
+
+
+
+ /// <summary>
+ /// 鍒犻櫎椤圭洰GetDeleteDocumentZhaobiaoFile
+ /// </summary>
+ /// <param name="ID"></param>
+ /// <returns></returns>
+ public bool GetDeleteDocumentZhaobiaoFile(int ID)
+ {
+ return _projectInfoService.GetDeleteDocumentZhaobiaoFile(ID);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetDocumentZhaobiaoFileInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_ZhaobiaoFile GetDocumentZhaobiaoFileInfo(int ID)
+ {
+ return _projectInfoService.GetDocumentZhaobiaoFileInfo(ID);
+ }
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍝嶅簲鏂囦欢鍒楄〃postDocumentTBXYFileList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_TBXYFile> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page)
+ {
+ return _projectInfoService.postDocumentTBXYFileList(page);
+ }
+
+
+
+
+ /// <summary>
+ /// 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentTBXYFileInfo(Document_TBXYFile dp)
+ {
+ return _projectInfoService.SaveDocumentTBXYFileInfo(dp);
+ }
+
+
+
+ /// <summary>
+ /// 鍒犻櫎鍝嶅簲鏂囦欢GetDeleteDocumentTBXYFile
+ /// </summary>
+ /// <param name="ID"></param>
+ /// <returns></returns>
+ public bool GetDeleteDocumentTBXYFile(int ID)
+ {
+ return _projectInfoService.GetDeleteDocumentTBXYFile(ID);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_TBXYFile GetDocumentTBXYFileInfo(int ID)
+ {
+ return _projectInfoService.GetDocumentTBXYFileInfo(ID);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public List<Document_TBXYFile> GetDocumentTBXYFileList(int projectId, int unitId)
+ {
+ return _projectInfoService.GetDocumentTBXYFileList(projectId, unitId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍝嶅簲鏂囦欢GetDocumentTBXYFileInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_TBXYFile GetDocumentTBXYFileByFileName(int projectId, int unitId, string FileName)
+ {
+ return _projectInfoService.GetDocumentTBXYFileByFileName(projectId, unitId, FileName);
+ }
+
+
+ /// <summary>
+ /// 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns>int</returns>
+ public int SaveDocInfo(Doc_Info dp)
+ {
+ return _projectInfoService.SaveDocInfo(dp);
+ }
+
+
+ /// <summary>
+ /// 淇敼鍝嶅簲鏂囦欢SaveDocumentTBXYFileInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveFileInfo(File_Info dp)
+ {
+ return _projectInfoService.SaveFileInfo(dp);
+ }
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
index 953871a..dce64ad 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/IProjectInfoService.cs
@@ -70,6 +70,51 @@
public bool SaveDocumentProjectDocumentInfo(Document_ProjectDocumentInfo dp);
+ public Document_DelegatePersonInfo GetDelegatePersonInfo(int ID);
+ public bool SaveDocumentProjectOppugnInfo(Document_ProjectOppugnInfo dp);
+
+ public List<Document_DelegatePersonInfo> GetAllDelegatePerson();
+
+ public bool SaveDocumentProjectComplainInfo(Document_ProjectComplainInfo dp);
+
+ public bool SaveDocumentProjectReviewInfo(Document_ProjectReviewInfo dp);
+
+ public string GetPreUnit(string childName);
+
+ public bool SaveDocumentProjectLitigationInfo(Document_ProjectLitigationInfo dp);
+
+ public bool SaveDocumentAdviseInfo(Document_AdviseInfo dp);
+
+ public Document_DocumentTempletInfo GetTempletModel(int templetId);
+
+ public List<Document_DocumentTempletInfo> GetDocumentTempletList();
+
+ public PageResult<Document_ZhaobiaoFile> postDocumentZhaobiaoFileList(DocumentProjectInfoPageSearch page);
+
+ public Document_ZhaobiaoFile GetDocumentZhaobiaoFileInfo(int ID);
+
+
+ public bool GetDeleteDocumentZhaobiaoFile(int ID);
+
+ public bool SaveDocumentZhaobiaoFileInfo(Document_ZhaobiaoFile dp);
+
+
+ public PageResult<Document_TBXYFile> postDocumentTBXYFileList(DocumentProjectInfoPageSearch page);
+
+ public Document_TBXYFile GetDocumentTBXYFileInfo(int ID);
+
+
+ public bool GetDeleteDocumentTBXYFile(int ID);
+
+ public bool SaveDocumentTBXYFileInfo(Document_TBXYFile dp);
+
+ public List<Document_TBXYFile> GetDocumentTBXYFileList(int projectId, int unitId);
+
+ public Document_TBXYFile GetDocumentTBXYFileByFileName(int projectId, int unitId,string FileName);
+
+ public int SaveDocInfo(Doc_Info dp);
+
+ public bool SaveFileInfo(File_Info dp);
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs
new file mode 100644
index 0000000..80a6b66
--- /dev/null
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/Interfaces/ISheZhiService.cs
@@ -0,0 +1,48 @@
+锘縰sing DocumentServiceAPI.Application.ProjectInfo.ViewMode;
+using DocumentServiceAPI.Model.cyDocumentModel;
+using DocumentServiceAPI.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Application.ProjectInfo.Services.Interfaces
+{
+ public interface ISheZhiService
+ {
+ public PageResult<Document_DelegatePersonInfo> postDelegatePersonList(DocumentProjectInfoPageSearch page);
+
+ public bool GetDelDocumentDelegatePersonInfo(int ID);
+
+ public bool SaveDocumentDelegatePersonInfo(Document_DelegatePersonInfo dp);
+
+ public Document_DelegatePersonInfo GetDocumentDelegatePersonInfo(int ID);
+
+
+ public PageResult<Document_TenderUnit> postDocumentTenderUnitList(DocumentProjectInfoPageSearch page);
+
+
+ public bool SaveDocumentTenderUnitInfo(Document_TenderUnit dp);
+
+ public Document_TenderUnit GetDocumentTenderUnitInfo(int ID);
+
+
+
+
+ public PageResult<DocumentEmployeeInfoDTO> postDocumentEmployeeInfoList(DocumentProjectInfoPageSearch page);
+
+ public bool GetDelDocumentEmployeeInfoInfo(int ID);
+
+ public bool SaveDocumentEmployeeInfoInfo(DocumentEmployeeInfoDTO dp);
+
+ public DocumentEmployeeInfoDTO GetDocumentEmployeeInfoInfo(int ID);
+
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByName(string EmployeeName);
+
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByLoginName(string textUserName);
+
+
+ public PageResult<Document_PerformanceInfo> GetDocumentPerformanceInfoListByPaper(DocumentProjectInfoPageSearch page);
+ }
+}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
index 6badc72..85207de 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
@@ -24,6 +24,7 @@
using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Diagnostics.Metrics;
using System.Linq;
using System.Reflection.Metadata;
@@ -818,11 +819,11 @@
if (documentProjectInfoDTO.IsAdvise == 1)
{
- documentProjectInfoDTO.Advise = "鈭�";
+ documentProjectInfoDTO.Advise = "鏂规淇濆瓨";// "鈭�";
}
else
{
- documentProjectInfoDTO.Advise = "";
+ documentProjectInfoDTO.Advise = "鏂规淇濆瓨";
}
if (!string.IsNullOrEmpty(documentProjectInfoDTO.FilePathzy))
@@ -957,7 +958,117 @@
public Document_WinInfo GetDocument_WinInfo(int ID, int UnitId)
{
+ var aaa = GetJwtInfo();
var ret = _db.Queryable<Document_WinInfo>().Where(x => x.ProjectId == ID && x.UnitId == UnitId ).First();
+ if (ret == null || string.IsNullOrEmpty(ret.FirstWinCompany))
+ {
+
+ var projectInfo = _db.Queryable<Document_ProjectInfo>().Where(x => x.ProjectId == ID && x.TenantID == aaa.TEID).First();
+ if (projectInfo != null)
+ {
+ _db.AsTenant().ChangeDatabase("zhengcaioa");
+ var sss = _db.Ado.GetDataTable("select [Id] ,[start_time] ,[sheng] ,[city] ,[area_id] ,[cgfs] ,[number] ,[name] from Project where number=@number", new { number = projectInfo.ProjectCode });
+ if(sss!=null && sss.Rows.Count > 0)
+ {
+ ret = new Document_WinInfo();
+ ret.ProjectId = ID;
+ ret.UnitId = UnitId;
+ ret.IsWin = 0;
+ foreach (DataRow row in sss.Rows)
+ {
+ var aaaaaaaa = _db.Ado.GetDataTable("select [zhongbiaoId] ,[ProjectId] ,[names] ,[price] ,[defen] ,[zb_zhiyistatus] ,[zb_zhiyishijian] ,[zb_zhiyichengli] ,[zb_tousustatus] ,[zb_tousushijian] ,[zb_tousuchengli] from Projectzhongbiao where ProjectId=@ProjectId", new { ProjectId = Convert.ToString(row["Id"]).Trim() });
+ if (aaaaaaaa != null && aaaaaaaa.Rows.Count > 0)
+ {
+ int i = 0;
+ foreach (DataRow row0 in aaaaaaaa.Rows)
+ {
+
+ if (i == 0)
+ {
+
+ ret.FirstWinCompany = Convert.ToString(row0["names"]).Trim();
+ if(row0["price"]!=null && !string.IsNullOrEmpty(row0["price"].ToString()))
+ {
+ string price = row0["price"].ToString().Trim().Replace("鍏�", "").Replace("涓�", "");
+ decimal priceprice = 0;
+
+ if(decimal.TryParse(price,out priceprice))
+ {
+ ret.FirstPrice = priceprice;
+ }
+ }
+ ret.FirstWinDefen = Convert.ToString(row0["defen"]).Trim();
+ }
+ if (i == 1)
+ {
+ ret.SecondWinCompany = Convert.ToString(row0["names"]).Trim();
+ if (row0["price"] != null && !string.IsNullOrEmpty(row0["price"].ToString()))
+ {
+ string price = row0["price"].ToString().Trim().Replace("鍏�", "").Replace("涓�", "");
+ decimal priceprice = 0;
+
+ if (decimal.TryParse(price, out priceprice))
+ {
+ ret.SecondPrice = priceprice;
+ }
+ }
+ ret.SecondWinDefen = Convert.ToString(row0["defen"]).Trim();
+ }
+ if (i == 2)
+ {
+ ret.ThirdCompany = Convert.ToString(row0["names"]).Trim();
+ if (row0["price"] != null && !string.IsNullOrEmpty(row0["price"].ToString()))
+ {
+ string price = row0["price"].ToString().Trim().Replace("鍏�", "").Replace("涓�", "");
+ decimal priceprice = 0;
+
+ if (decimal.TryParse(price, out priceprice))
+ {
+ ret.ThirdPrice = priceprice;
+ }
+ }
+ ret.ThirdWinDefen = Convert.ToString(row0["defen"]).Trim();
+ }
+
+ i += 1;
+ }
+
+
+
+
+
+
+ //if (aaaaaaaa.Rows.Count > 0)
+ //{
+ // DataRow row0 = aaaaaaaa.Rows[0];
+ // ret.FirstWinCompany = Convert.ToString(row0.ItemArray[2]).Trim();
+ // ret.FirstPrice = Convert.ToDecimal(row0.ItemArray[3]);
+ // ret.FirstWinDefen = Convert.ToString(row0.ItemArray[4]).Trim();
+ //}
+ //if (aaaaaaaa.Rows.Count > 1)
+ //{
+ // DataRow row1 = aaaaaaaa.Rows[1];
+ // ret.SecondWinCompany = Convert.ToString(row1.ItemArray[2]).Trim();
+ // ret.SecondPrice = Convert.ToDecimal(row1.ItemArray[3]);
+ // ret.SecondWinDefen = Convert.ToString(row1.ItemArray[4]).Trim();
+ //}
+ //if (aaaaaaaa.Rows.Count > 2)
+ //{
+ // DataRow row2 = aaaaaaaa.Rows[2];
+ // ret.ThirdCompany = Convert.ToString(row2.ItemArray[2]).Trim();
+ // ret.ThirdPrice = Convert.ToDecimal(row2.ItemArray[3]);
+ // ret.ThirdWinDefen = Convert.ToString(row2.ItemArray[4]).Trim();
+ //}
+
+ break;
+ }
+ }
+ }
+ }
+
+ }
+
+
return ret;
}
@@ -993,7 +1104,52 @@
public List<Document_OtherCompanyTenderInfo> GetOtherCompanyTenderInfoList(int ID, int TenantID)
{
+ var aaa = GetJwtInfo();
+
var ret = _db.Queryable<Document_OtherCompanyTenderInfo>().Where(x => x.ProjectId == ID && x.TenantID == TenantID).ToList();
+ if (ret == null || ret.Count==0)
+ {
+
+ var projectInfo = _db.Queryable<Document_ProjectInfo>().Where(x => x.ProjectId == ID && x.TenantID == TenantID).First();
+ if (projectInfo != null)
+ {
+
+ _db.AsTenant().ChangeDatabase("zhengcaioa");
+ var sss = _db.Ado.GetDataTable("select [Id] ,[start_time] ,[sheng] ,[city] ,[area_id] ,[cgfs] ,[number] ,[name] from Project where number=@number", new { number = projectInfo.ProjectCode });
+ if (sss != null && sss.Rows.Count > 0)
+ {
+ ret = new List<Document_OtherCompanyTenderInfo>();
+ foreach (DataRow row in sss.Rows)
+ {
+ var aaaaaaaa = _db.Ado.GetDataTable("select [youxiaoId] ,[ProjectId] ,[namesyouxiao] ,[priceyouxiao] ,[yx_zhiyistatus] ,[yx_zhiyishijian] ,[yx_zhiyichengli] ,[yx_tousustatus] ,[yx_tousushijian] ,[yx_tousuchengli] from Projectyouxiao where ProjectId=@ProjectId", new { ProjectId = Convert.ToString(row["Id"]).Trim() });
+ if (aaaaaaaa != null && aaaaaaaa.Rows.Count > 0)
+ {
+ foreach (DataRow row0 in aaaaaaaa.Rows)
+ {
+ Document_OtherCompanyTenderInfo document_OtherCompanyTenderInfo = new Document_OtherCompanyTenderInfo();
+ document_OtherCompanyTenderInfo.ProjectId = ID;
+ document_OtherCompanyTenderInfo.CompanyName = Convert.ToString(row0["namesyouxiao"]).Trim();
+ if (row0["priceyouxiao"] != null && !string.IsNullOrEmpty(row0["priceyouxiao"].ToString()))
+ {
+ string price = row0["priceyouxiao"].ToString().Trim().Replace("鍏�", "").Replace("涓�", "");
+ decimal priceprice = 0;
+
+ if (decimal.TryParse(price, out priceprice))
+ {
+ document_OtherCompanyTenderInfo.TenderPrice = priceprice;
+ }
+ }
+
+ document_OtherCompanyTenderInfo.TenantID = TenantID;
+ ret.Add(document_OtherCompanyTenderInfo);
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ }
return ret;
}
public Document_OtherCompanyTenderInfo GetOtherCompanyTenderInfo(int ID, string companyName)
@@ -1109,9 +1265,54 @@
public List<Document_AptitudeInfo> GetAptitudeInfoByUnitId(int UnitId)
{
- var result = _db.Queryable<Document_AptitudeInfo>().Where( x=> x.UnitId == UnitId).ToList() ;//鎵ц鏌ヨ
+ var result = _db.Queryable<Doc_Info>().Where( x=>x.is_del == false && x.org_id == UnitId).ToList() ;//鎵ц鏌ヨ
- return result;
+ var ids = result.Select(x => x.id).ToArray();
+ var file = _db.Queryable<File_Info>().Where(x => ids.Contains(x.doc_id)).ToList();//鎵ц鏌ヨ
+ var document_AptitudeInfos = new List<Document_AptitudeInfo>();
+
+ foreach (var doc_Info in result)
+ {
+ var document_AptitudeInfo = new Document_AptitudeInfo();
+ var filesss = file.Where(x => x.doc_id == doc_Info.id).ToList();
+
+ if(filesss!=null && filesss.Count > 0)
+ {
+ document_AptitudeInfo.FilePath = "";
+ document_AptitudeInfo.FileName = "";
+ document_AptitudeInfo.FileSize = 0;
+ for (int i=0;i< filesss.Count; i++)
+ {
+ document_AptitudeInfo.FilePath += filesss[i].filepath;
+ document_AptitudeInfo.FileName += filesss[i].filenewname;
+ document_AptitudeInfo.FileSize += filesss[i].filesize; ;
+ if (i!= filesss.Count - 1)
+ {
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+ }
+ }
+
+ document_AptitudeInfo.AptitudeId = doc_Info.id;
+ document_AptitudeInfo.AptitudeName = doc_Info.doc_name;
+ document_AptitudeInfo.AptitudeType = doc_Info.classification_id;
+ document_AptitudeInfo.IsUsed = doc_Info.status;
+
+
+ document_AptitudeInfo.FileVersionNo = "";
+ document_AptitudeInfo.SendTime = doc_Info.add_time.ToShortDateString();
+ document_AptitudeInfo.UnitId = doc_Info.org_id.HasValue ? doc_Info.org_id.Value : 0; ;
+ document_AptitudeInfo.LastUpdateTime = doc_Info.add_time;
+ document_AptitudeInfo.LastUpdateName = "";
+ document_AptitudeInfo.AdviseFlag = 1;
+ document_AptitudeInfo.UserId = doc_Info.tenant_code;
+
+ document_AptitudeInfos.Add(document_AptitudeInfo);
+ }
+
+
+ return document_AptitudeInfos;
}
@@ -1231,5 +1432,358 @@
return true;
}
+
+
+ public Document_DelegatePersonInfo GetDelegatePersonInfo(int ID)
+ {
+ var ret = _db.Queryable<Document_DelegatePersonInfo>().Where(x => x.DelegateId == ID).First();
+ return ret;
+ }
+
+ public bool SaveDocumentProjectOppugnInfo(Document_ProjectOppugnInfo dp)
+ {
+ if (dp.ID > 0)
+ {
+ _db.Updateable<Document_ProjectOppugnInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_ProjectOppugnInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public List<Document_DelegatePersonInfo> GetAllDelegatePerson()
+ {
+ var a = GetJwtInfo();
+
+ var result = _db.Queryable<Document_DelegatePersonInfo>().Where(x => x.IsUse == 1 && x.TenantID == a.TEID ).ToList();//鎵ц鏌ヨ
+ return result;
+
+ }
+
+ public bool SaveDocumentProjectComplainInfo(Document_ProjectComplainInfo dp)
+ {
+ if (dp.ID > 0)
+ {
+ _db.Updateable<Document_ProjectComplainInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_ProjectComplainInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public bool SaveDocumentProjectReviewInfo(Document_ProjectReviewInfo dp)
+ {
+ if (dp.ID > 0)
+ {
+ _db.Updateable<Document_ProjectReviewInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_ProjectReviewInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public string GetPreUnit(string childName)
+ {
+
+ string preUnit = "";
+ Sys_CitySite preModel = null;
+ var m_Sys_CitySite = _db.Queryable<Sys_CitySite>().Where(x => x.Name == childName).First();//鎵ц鏌ヨ
+ if (m_Sys_CitySite != null)
+ {
+ if (m_Sys_CitySite.CityLevel == 3)
+ {
+ preModel = _db.Queryable<Sys_CitySite>().Where(x=>x.Keyid == m_Sys_CitySite.CityId).First();
+ }
+ else if (m_Sys_CitySite.CityLevel == 2)
+ {
+ preModel = _db.Queryable<Sys_CitySite>().Where(x => x.Keyid == m_Sys_CitySite.ProvinceId).First();
+ }
+ else
+ {
+ preModel = m_Sys_CitySite;
+ }
+ }
+ if (preModel != null)
+ {
+ preUnit = preModel.Name;
+ }
+
+ return preUnit;
+ }
+
+
+ public bool SaveDocumentProjectLitigationInfo(Document_ProjectLitigationInfo dp)
+ {
+ if (dp.ID > 0)
+ {
+ _db.Updateable<Document_ProjectLitigationInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_ProjectLitigationInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+
+ public bool SaveDocumentAdviseInfo(Document_AdviseInfo dp)
+ {
+ {
+ if (dp.Id > 0)
+ {
+ _db.Updateable<Document_AdviseInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_AdviseInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+ }
+
+ public Document_DocumentTempletInfo GetTempletModel(int templetId)
+ {
+ var ret = _db.Queryable<Document_DocumentTempletInfo>().Where(x => x.TempletId == templetId).First();
+ return ret;
+ }
+
+ public List<Document_DocumentTempletInfo> GetDocumentTempletList()
+ {
+ var result = _db.Queryable<Document_DocumentTempletInfo>().Where(x => x.IsUsed == 1).ToList();//鎵ц鏌ヨ
+ return result;
+ }
+
+
+
+
+ public PageResult<Document_ZhaobiaoFile> postDocumentZhaobiaoFileList(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_ZhaobiaoFile> result = new PageResult<Document_ZhaobiaoFile>();
+
+
+
+ result.Items = _db.Queryable<Document_ZhaobiaoFile>()
+ .Where(a => a.UnitId == page.UnitId && a.ProjectId == page.ProjectId)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.FileName), a=>a.FileName.Contains(page.FileName))
+
+ .Select(a => new Document_ZhaobiaoFile
+ {
+ Id = a.Id,
+ FileName = a.FileName,
+ FilePath = a.FilePath,
+ FileVersionNo = a.FileVersionNo,
+ FileSize = a.FileSize,
+ UnitId = a.UnitId,
+ LastUpdateTime = a.LastUpdateTime,
+ LastUpdateName = a.LastUpdateName,
+ AdviseFlag = a.AdviseFlag,
+ UserId = a.UserId,
+
+ }
+ )
+ .OrderByDescending(a => a.LastUpdateTime).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 Document_ZhaobiaoFile GetDocumentZhaobiaoFileInfo(int ID)
+ {
+ var result = _db.Queryable<Document_ZhaobiaoFile>().Where(x => x.Id == ID).First();//鎵ц鏌ヨ
+ return result;
+ }
+
+
+ public bool GetDeleteDocumentZhaobiaoFile(int ID)
+ {
+ _db.Deleteable<Document_ZhaobiaoFile>().Where(x => x.Id == ID).ExecuteCommand();
+
+ return true;
+ }
+
+ public bool SaveDocumentZhaobiaoFileInfo(Document_ZhaobiaoFile dp)
+ {
+ if (dp.Id > 0)
+ {
+ _db.Updateable<Document_ZhaobiaoFile>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_ZhaobiaoFile>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+
+
+ public PageResult<Document_TBXYFile> postDocumentTBXYFileList(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_TBXYFile> result = new PageResult<Document_TBXYFile>();
+
+
+
+ result.Items = _db.Queryable<Document_TBXYFile>()
+ .Where(a => a.UnitId == page.UnitId && a.ProjectId == page.ProjectId)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.FileName), a => a.FileName.Contains(page.FileName))
+
+ .Select(a => new Document_TBXYFile
+ {
+ Id = a.Id,
+ FileName = a.FileName,
+ FilePath = a.FilePath,
+ FileVersionNo = a.FileVersionNo,
+ FileSize = a.FileSize,
+ UnitId = a.UnitId,
+ LastUpdateTime = a.LastUpdateTime,
+ LastUpdateName = a.LastUpdateName,
+ AdviseFlag = a.AdviseFlag,
+ UserId = a.UserId,
+ Sort = a.Sort,
+
+ }
+ )
+ .OrderBy(a => a.Sort).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 Document_TBXYFile GetDocumentTBXYFileInfo(int ID)
+ {
+ var result = _db.Queryable<Document_TBXYFile>().Where(x => x.Id == ID).First();//鎵ц鏌ヨ
+ return result;
+ }
+
+
+ public bool GetDeleteDocumentTBXYFile(int ID)
+ {
+
+ _db.Deleteable<Document_TBXYFile>().Where(x => x.Id == ID).ExecuteCommand();
+
+ return true;
+ }
+
+ public bool SaveDocumentTBXYFileInfo(Document_TBXYFile dp)
+ {
+
+
+
+ var result = _db.Queryable<Document_ProjectDocumentInfo>().Where(x => x.ProjectId == dp.ProjectId && x.UnitId == dp.UnitId).First();//鎵ц鏌ヨ
+ if (result != null)
+ {
+ result.LastUpdateTime = dp.LastUpdateTime;
+ _db.Updateable<Document_ProjectDocumentInfo>(result).ExecuteCommand();
+ }
+ if (dp.Id > 0)
+ {
+ _db.Updateable<Document_TBXYFile>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_TBXYFile>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+
+ public List<Document_TBXYFile> GetDocumentTBXYFileList(int projectId, int unitId)
+ {
+ var ret = _db.Queryable<Document_TBXYFile>()
+ .Where(x => x.ProjectId == projectId && x.UnitId == unitId)
+ .Select(a => new Document_TBXYFile
+ {
+ Id = a.Id,
+ FileName = a.FileName,
+ FilePath = a.FilePath,
+ FileVersionNo = a.FileVersionNo,
+ FileSize = a.FileSize,
+ UnitId = a.UnitId,
+ LastUpdateTime = a.LastUpdateTime,
+ LastUpdateName = a.LastUpdateName,
+ AdviseFlag = a.AdviseFlag,
+ UserId = a.UserId,
+ Sort = a.Sort,
+ SaveFlag = a.SaveFlag,
+
+ }).OrderBy(a => a.Sort).ToList();
+ return ret;
+ }
+
+ public Document_TBXYFile GetDocumentTBXYFileByFileName(int projectId, int unitId, string FileName)
+ {
+ var ret = _db.Queryable<Document_TBXYFile>().Where(x => x.ProjectId == projectId && x.UnitId == unitId && x.FileName == FileName ).First();
+ return ret;
+ }
+
+
+ public int SaveDocInfo(Doc_Info dp)
+ {
+ if (dp.id > 0)
+ {
+ _db.Updateable<Doc_Info>(dp).ExecuteCommand();
+ }
+ else
+ {
+ dp.id = _db.Insertable<Doc_Info>(dp).ExecuteReturnIdentity();
+ }
+
+ return dp.id;
+ }
+
+ public bool SaveFileInfo(File_Info dp)
+ {
+ if (dp.id > 0)
+ {
+ _db.Updateable<File_Info>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<File_Info>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
}
}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs
new file mode 100644
index 0000000..8b3df48
--- /dev/null
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/SheZhiService.cs
@@ -0,0 +1,613 @@
+锘縰sing DocumentServiceAPI.Application.ProjectInfo.Services.Interfaces;
+using DocumentServiceAPI.Application.ProjectInfo.ViewMode;
+using DocumentServiceAPI.Application.Repository;
+using DocumentServiceAPI.Model.cyDocumentModel;
+using DocumentServiceAPI.Model.UserInfoModel;
+using DocumentServiceAPI.Utility;
+using MapsterMapper;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using NetTaste;
+using SqlSugar.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Runtime.Intrinsics.Arm;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Application.ProjectInfo.Services
+{
+ public class SheZhiService : ISheZhiService, IScoped
+ {
+
+ private ISqlSugarClient _db { get; set; }
+ private ProjectInfoRepository _projectInfoRepository { get; set; }
+ private IMapper _mapper { get; set; }
+ public SheZhiService(ISqlSugarClient db, ProjectInfoRepository projectInfoRepository, IMapper mapper)
+ {
+ _db = db;
+ _projectInfoRepository = projectInfoRepository;
+ _mapper = mapper;
+ }
+
+ public PageResult<Document_DelegatePersonInfo> postDelegatePersonList(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_DelegatePersonInfo> result = new PageResult<Document_DelegatePersonInfo>();
+
+
+
+ result.Items = _db.Queryable<Document_DelegatePersonInfo>()
+ .Where(a => a.TenantID == aaa.TEID)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.delegateName), a => a.DelegateName.Contains(page.delegateName))
+ .WhereIF(page.isUse > 0, a => a.IsUse == page.isUse)
+
+
+ .OrderByDescending(a => a.DelegateId).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 GetDelDocumentDelegatePersonInfo(int ID)
+ {
+ _db.Deleteable<Document_DelegatePersonInfo>().Where(x => x.DelegateId == ID).ExecuteCommand();
+
+ return true;
+ }
+
+ public bool SaveDocumentDelegatePersonInfo(Document_DelegatePersonInfo dp)
+ {
+ if (dp.DelegateId > 0)
+ {
+ _db.Updateable<Document_DelegatePersonInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_DelegatePersonInfo>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public Document_DelegatePersonInfo GetDocumentDelegatePersonInfo(int ID)
+ {
+ var result = _db.Queryable<Document_DelegatePersonInfo>().Where(x => x.DelegateId == ID).First();//鎵ц鏌ヨ
+ return result;
+ }
+
+
+
+
+
+ public PageResult<Document_TenderUnit> postDocumentTenderUnitList(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_TenderUnit> result = new PageResult<Document_TenderUnit>();
+
+
+
+ result.Items = _db.Queryable<Document_TenderUnit>()
+ .Where(a => a.TenantId == aaa.TEID)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.delegateName), a => a.UnitName.Contains(page.delegateName))
+ .WhereIF(page.isUse > 0, a => a.IsUsed == page.isUse)
+
+
+ .OrderByDescending(a => a.UnitId).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 SaveDocumentTenderUnitInfo(Document_TenderUnit dp)
+ {
+ if (dp.UnitId > 0)
+ {
+ _db.Updateable<Document_TenderUnit>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_TenderUnit>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public Document_TenderUnit GetDocumentTenderUnitInfo(int ID)
+ {
+ var result = _db.Queryable<Document_TenderUnit>().Where(x => x.UnitId == ID).First();//鎵ц鏌ヨ
+ return result;
+ }
+
+
+
+ public PageResult<DocumentEmployeeInfoDTO> postDocumentEmployeeInfoList(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<DocumentEmployeeInfoDTO> result = new PageResult<DocumentEmployeeInfoDTO>();
+
+
+
+ var document_EmployeeInfos = _db.Queryable<Document_EmployeeInfo, EmployeeAtTenant>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.EmployeeId == b.EmployeeID && b.TenantID == aaa.TEID
+
+ )
+ )
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.txtName), (a, b) => a.EmployeeName.Contains(page.txtName))
+
+
+ .OrderByDescending((a, b) => a.EmployeeId).ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+
+
+
+ var documentEmployeeInfoDTOs = _mapper.Map<List<DocumentEmployeeInfoDTO>>(document_EmployeeInfos);
+
+
+
+ if (documentEmployeeInfoDTOs != null && documentEmployeeInfoDTOs.Count > 0)
+ {
+ var ret = _db.Queryable<Document_EmployeeRole>().ToList();
+ foreach (var documentEmployeeInfoDTO in documentEmployeeInfoDTOs)
+ {
+ if (documentEmployeeInfoDTO.IsWork.HasValue && documentEmployeeInfoDTO.IsWork.Value>0)
+ {
+ documentEmployeeInfoDTO.IsWorkName = "鍦ㄨ亴";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.IsWorkName = "绂昏亴";
+ }
+
+ if (documentEmployeeInfoDTO.IsWork.HasValue && documentEmployeeInfoDTO.IsWork.Value == 1)
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = "";
+ }
+ else
+ {
+ if (documentEmployeeInfoDTO.LeaveTime.HasValue)
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = documentEmployeeInfoDTO.LeaveTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = "";
+ }
+ }
+
+ var document_EmployeeRole = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 1).FirstOrDefault();
+ if(document_EmployeeRole != null)
+ {
+ documentEmployeeInfoDTO.BMRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.BMRID = "鍚�";
+ }
+
+ var document_EmployeeRole1 = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 2).FirstOrDefault();
+ if (document_EmployeeRole1 != null)
+ {
+ documentEmployeeInfoDTO.BSZZRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.BSZZRID = "鍚�";
+ }
+
+ var document_EmployeeRole2 = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 3).FirstOrDefault();
+ if (document_EmployeeRole2 != null)
+ {
+ documentEmployeeInfoDTO.TBRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.TBRID = "鍚�";
+ }
+
+
+ }
+ }
+
+ result.Items = documentEmployeeInfoDTOs;
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+
+ return result;
+ }
+
+ public bool GetDelDocumentEmployeeInfoInfo(int ID)
+ {
+ _db.Deleteable<EmployeeAtTenant>().Where(x => x.EmployeeID == ID).ExecuteCommand();
+ _db.Deleteable<Document_EmployeeRole>().Where(x => x.EmployeeId == ID).ExecuteCommand();
+ _db.Deleteable<Document_EmployeeInfo>().Where(x => x.EmployeeId == ID).ExecuteCommand();
+
+
+
+ return true;
+ }
+
+ public bool SaveDocumentEmployeeInfoInfo(DocumentEmployeeInfoDTO dp)
+ {
+ var document_EmployeeInfo = _mapper.Map<Document_EmployeeInfo>(dp);
+
+ if (dp.EmployeeId > 0)
+ {
+ _db.Updateable<Document_EmployeeInfo>(document_EmployeeInfo).ExecuteCommand();
+
+ }
+ else
+ {
+ var aaa = GetJwtInfo();
+
+
+
+ dp.EmployeeId = _db.Insertable<Document_EmployeeInfo>(document_EmployeeInfo).ExecuteReturnIdentity();
+
+ EmployeeAtTenant employeeAtTenant = new EmployeeAtTenant();
+ employeeAtTenant.EmployeeID = dp.EmployeeId;
+ employeeAtTenant.TenantID = aaa.TEID.Value;
+ _db.Insertable<EmployeeAtTenant>(employeeAtTenant).ExecuteCommand();
+ }
+
+
+ if (!string.IsNullOrEmpty(dp.BMRID) && !string.IsNullOrEmpty(dp.BSZZRID) && !string.IsNullOrEmpty(dp.TBRID))
+ {
+ _db.Deleteable<Document_EmployeeRole>().Where(x => x.EmployeeId == dp.EmployeeId).ExecuteCommand();
+ if (dp.BMRID == "鏄�")
+ {
+ Document_EmployeeRole document_EmployeeRole = new Document_EmployeeRole();
+ document_EmployeeRole.EmployeeId = dp.EmployeeId;
+ document_EmployeeRole.RoleType = 1;
+ _db.Insertable<Document_EmployeeRole>(document_EmployeeRole).ExecuteCommand();
+ }
+ if (dp.BSZZRID == "鏄�")
+ {
+ Document_EmployeeRole document_EmployeeRole = new Document_EmployeeRole();
+ document_EmployeeRole.EmployeeId = dp.EmployeeId;
+ document_EmployeeRole.RoleType = 2;
+ _db.Insertable<Document_EmployeeRole>(document_EmployeeRole).ExecuteCommand();
+ }
+ if (dp.TBRID == "鏄�")
+ {
+ Document_EmployeeRole document_EmployeeRole = new Document_EmployeeRole();
+ document_EmployeeRole.EmployeeId = dp.EmployeeId;
+ document_EmployeeRole.RoleType = 3;
+ _db.Insertable<Document_EmployeeRole>(document_EmployeeRole).ExecuteCommand();
+ }
+ }
+
+ return true;
+ }
+
+ public DocumentEmployeeInfoDTO GetDocumentEmployeeInfoInfo(int ID)
+ {
+ var result = _db.Queryable<Document_EmployeeInfo>().Where(x => x.EmployeeId == ID).First();//鎵ц鏌ヨ
+
+ var documentEmployeeInfoDTO = _mapper.Map<DocumentEmployeeInfoDTO>(result);
+
+
+
+ if (documentEmployeeInfoDTO != null )
+ {
+ var ret = _db.Queryable<Document_EmployeeRole>().ToList();
+
+ if (documentEmployeeInfoDTO.IsWork.HasValue && documentEmployeeInfoDTO.IsWork.Value > 0)
+ {
+ documentEmployeeInfoDTO.IsWorkName = "鍦ㄨ亴";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.IsWorkName = "绂昏亴";
+ }
+
+ if (documentEmployeeInfoDTO.IsWork.HasValue && documentEmployeeInfoDTO.IsWork.Value == 1)
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = "";
+ }
+ else
+ {
+ if (documentEmployeeInfoDTO.LeaveTime.HasValue)
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = documentEmployeeInfoDTO.LeaveTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ documentEmployeeInfoDTO.LeaveTimeName = "";
+ }
+ }
+
+ var document_EmployeeRole = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 1).FirstOrDefault();
+ if (document_EmployeeRole != null)
+ {
+ documentEmployeeInfoDTO.BMRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.BMRID = "鍚�";
+ }
+
+ var document_EmployeeRole1 = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 2).FirstOrDefault();
+ if (document_EmployeeRole1 != null)
+ {
+ documentEmployeeInfoDTO.BSZZRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.BSZZRID = "鍚�";
+ }
+
+ var document_EmployeeRole2 = ret.Where(x => x.EmployeeId == documentEmployeeInfoDTO.EmployeeId && x.RoleType == 3).FirstOrDefault();
+ if (document_EmployeeRole2 != null)
+ {
+ documentEmployeeInfoDTO.TBRID = "鏄�";
+ }
+ else
+ {
+ documentEmployeeInfoDTO.TBRID = "鍚�";
+ }
+
+
+
+ }
+
+ return documentEmployeeInfoDTO;
+ }
+
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByName(string EmployeeName)
+ {
+ var aaa = GetJwtInfo();
+ var documentEmployeeInfoDTO = _db.Queryable<Document_EmployeeInfo, EmployeeAtTenant>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.EmployeeId == b.EmployeeID && b.TenantID == aaa.TEID
+ )
+ )
+ //鏂囦欢鍚嶇О
+ .Where((a, b) => a.EmployeeName == EmployeeName).First();
+
+
+
+
+
+ return documentEmployeeInfoDTO;
+ }
+
+
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByLoginName(string textUserName)
+ {
+ var aaa = GetJwtInfo();
+ var documentEmployeeInfoDTO = _db.Queryable<Document_EmployeeInfo, EmployeeAtTenant>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.EmployeeId == b.EmployeeID && b.TenantID == aaa.TEID
+ )
+ )
+ //鏂囦欢鍚嶇О
+ .Where((a, b) => a.UserName == textUserName).First();
+
+
+
+
+
+ return documentEmployeeInfoDTO;
+ }
+
+
+ public PageResult<Document_PerformanceInfo> GetDocumentPerformanceInfoListByPaper(DocumentProjectInfoPageSearch page)
+ {
+ var aaa = GetJwtInfo();
+ List<Document_PerformanceInfo> m_Document_PerformanceInfoList = new List<Document_PerformanceInfo>();
+ SqlSugar.PageModel pg = new SqlSugar.PageModel();
+ pg.PageSize = page.PageSize;
+ pg.PageIndex = page.PageIndex;
+ //page.ToEmployeeId = a.EID;
+ int total = 0;
+ PageResult<Document_PerformanceInfo> result = new PageResult<Document_PerformanceInfo>();
+
+ DateTime txtWorkStartTime = string.IsNullOrEmpty(page.txtWorkStartTime) ? DateTime.MinValue : DateTime.Parse(page.txtWorkStartTime);
+ DateTime txtWorkEndTime = string.IsNullOrEmpty(page.txtWorkEndTime) ? DateTime.MaxValue : DateTime.Parse(page.txtWorkEndTime);
+
+ var dt_Signup = _db.Queryable<Document_ProjectExpand, Document_ProjectInfo>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.ProjectId == b.ProjectId && b.TenantID == aaa.TEID
+
+ )
+ )
+ .Where((a, b) => a.IsSignup == 1)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkStartTime), (a, b) => a.SignupTime >= txtWorkStartTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkEndTime), (a, b) => a.SignupTime <= txtWorkEndTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtEmployeeId) && page.txtEmployeeId != "璇烽�夋嫨" , (a, b) => a.SignupPerson == page.txtEmployeeId)
+ .WhereIF(!string.IsNullOrEmpty(page.projectName), (a, b) => b.ProjectName.Contains(page.projectName))
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkItem), (a, b) => "鎶ュ悕" == page.txtWorkItem)
+ .Select((a, b) =>new Document_PerformanceInfo
+ {
+ WorkTime = a.SignupTime,
+ EmployeeName = a.SignupPerson,
+ Price = a.SignupAllowance,
+ ProjectName = b.ProjectName,
+ WorkItem = "鎶ュ悕",
+ }).ToList()
+ ;
+
+
+ var dt_Document = _db.Queryable<Document_ProjectExpand, Document_ProjectInfo, Document_ProjectDocumentInfo>((a, b,c) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.ProjectId == b.ProjectId && b.TenantID == aaa.TEID,
+ JoinType.Left, a.ProjectId == c.ProjectId
+ )
+ )
+ .Where((a, b, c) => a.DocumentStatus == 17)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkStartTime), (a, b, c) => c.LastUpdateTime >= txtWorkStartTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkEndTime), (a, b, c) => c.LastUpdateTime <= txtWorkEndTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtEmployeeId) && page.txtEmployeeId != "璇烽�夋嫨", (a, b) => a.DocumentManager == page.txtEmployeeId)
+ .WhereIF(!string.IsNullOrEmpty(page.projectName), (a, b, c) => b.ProjectName.Contains(page.projectName))
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkItem), (a, b, c) => "鏍囦功鍒朵綔" == page.txtWorkItem)
+ .Select((a, b, c) => new Document_PerformanceInfo
+ {
+ WorkTime = c.LastUpdateTime,
+ EmployeeName = a.DocumentManager,
+ Price = a.DocumentPrice,
+ ProjectName = b.ProjectName,
+ WorkItem = "鏍囦功鍒朵綔",
+ }).ToList()
+ ;
+
+ var dt_Tender = _db.Queryable<Document_ProjectExpand, Document_ProjectInfo>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Inner, a.ProjectId == b.ProjectId && b.TenantID == aaa.TEID
+ )
+ )
+ .Where((a, b) => a.TenderStatus == 1)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkStartTime), (a, b) => b.TenderTime >= txtWorkStartTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkEndTime), (a, b) => b.TenderTime <= txtWorkEndTime)
+ .WhereIF(!string.IsNullOrEmpty(page.txtEmployeeId) && page.txtEmployeeId != "璇烽�夋嫨", (a, b) => a.TenderPerson == page.txtEmployeeId)
+ .WhereIF(!string.IsNullOrEmpty(page.projectName), (a, b) => b.ProjectName.Contains(page.projectName))
+ .WhereIF(!string.IsNullOrEmpty(page.txtWorkItem), (a, b) => "鎶曟爣" == page.txtWorkItem)
+ .Select((a, b) => new Document_PerformanceInfo
+ {
+ WorkTime = b.TenderTime,
+ EmployeeName = a.DocumentManager,
+ Price = a.DocumentPrice,
+ ProjectName = b.ProjectName,
+ WorkItem = "鎶曟爣",
+ }).ToList();
+ var newDataTable = new List<Document_PerformanceInfo>();
+ object[] obj = new object[newDataTable.Count];
+
+ for (int i = 0; i < dt_Signup.Count; i++)
+ {
+
+ newDataTable.Add(dt_Signup[i]);
+ }
+ for (int i = 0; i < dt_Document.Count; i++)
+ {
+
+ newDataTable.Add(dt_Document[i]);
+ }
+
+ for (int i = 0; i < dt_Tender.Count; i++)
+ {
+
+ newDataTable.Add(dt_Tender[i]);
+ }
+
+ for (int i = 0; i < newDataTable.Count; i++)
+ {
+ Document_PerformanceInfo m_Document_PerformanceInfo = new Document_PerformanceInfo();
+ m_Document_PerformanceInfo.EmployeeId = 0;
+ m_Document_PerformanceInfo.Id = 0;
+ m_Document_PerformanceInfo.ProjectName = newDataTable[i].ProjectName;
+ m_Document_PerformanceInfo.WorkItem = newDataTable[i].WorkItem;
+ if (newDataTable[i].Price.HasValue)
+ {
+ m_Document_PerformanceInfo.Price = newDataTable[i].Price;
+ }
+ else
+ {
+ m_Document_PerformanceInfo.Price = 0;
+ }
+ m_Document_PerformanceInfo.EmployeeName = newDataTable[i].EmployeeName;
+ m_Document_PerformanceInfo.WorkTime = newDataTable[i].WorkTime;
+
+
+
+ if (m_Document_PerformanceInfo.Price.HasValue && m_Document_PerformanceInfo.Price.Value>0)
+ {
+ m_Document_PerformanceInfoList.Add(m_Document_PerformanceInfo);
+ result.AllPageMoney += m_Document_PerformanceInfo.Price.Value;
+ }
+ }
+ ;
+
+
+
+
+
+
+
+ //.ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+
+
+ var document_PerformanceInfos = m_Document_PerformanceInfoList.Skip(page.PageIndex - 1).Take(page.PageSize).ToList();
+
+ foreach (var item in document_PerformanceInfos)
+ {
+ result.NowPageMoney += item.Price.Value;
+ }
+
+
+ result.Items = document_PerformanceInfos;
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+
+ return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇Jwt鐩稿叧淇℃伅
+ /// </summary>
+ public Model.JwtInfo GetJwtInfo()
+ {
+ Model.JwtInfo jwtInfo = new Model.JwtInfo();
+ jwtInfo.LogInSource = (Model.LogInFrom)(App.User?.FindFirstValue("loginfrom")?.ObjToInt() ?? 0);
+ jwtInfo.EID = App.User?.FindFirstValue("eid")?.ObjToInt();
+ jwtInfo.UID = App.User?.FindFirstValue("uid")?.ObjToInt();
+ jwtInfo.TEID = App.User?.FindFirstValue("teid")?.ObjToInt();
+ var guid = App.User?.FindFirstValue("jid");
+ jwtInfo.JID = string.IsNullOrEmpty(guid) ? null : new Guid(guid);
+ return jwtInfo;
+ }
+
+ }
+}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs b/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs
new file mode 100644
index 0000000..dd31fd1
--- /dev/null
+++ b/DocumentServiceAPI.Application/ProjectInfo/SheZhiController.cs
@@ -0,0 +1,176 @@
+锘縰sing DocumentServiceAPI.Application.ProjectInfo.Services;
+using DocumentServiceAPI.Application.ProjectInfo.Services.Interfaces;
+using DocumentServiceAPI.Application.ProjectInfo.ViewMode;
+using DocumentServiceAPI.Model.cyDocumentModel;
+using DocumentServiceAPI.Utility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Intrinsics.Arm;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Application.ProjectInfo
+{
+ /// <summary>
+ /// 鐧诲綍鎺у埗鍣�
+ /// </summary>
+ [ApiDescriptionSettings("SheZhi")]
+ [DynamicApiController]
+ [Authorize]
+ public class SheZhiController
+ {
+ private readonly ISheZhiService _sheZhiService;
+ public SheZhiController(ISheZhiService sheZhiService)
+ {
+ _sheZhiService = sheZhiService;
+ }
+
+
+
+ // <summary>
+ /// 鑾峰彇浠ｇ悊鍒楄〃postDelegatePersonList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_DelegatePersonInfo> postDelegatePersonList(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.postDelegatePersonList(page);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎椤圭洰GetDelDocumentDelegatePersonInfo
+ /// </summary>
+ /// <param name="Id"></param>
+ /// <returns></returns>
+ public bool GetDelDocumentDelegatePersonInfo(int ID)
+ {
+ return _sheZhiService.GetDelDocumentDelegatePersonInfo(ID);
+ }
+
+ /// <summary>
+ /// 淇敼椤圭洰SaveDocumentDelegatePersonInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentDelegatePersonInfo(Document_DelegatePersonInfo dp)
+ {
+ return _sheZhiService.SaveDocumentDelegatePersonInfo(dp);
+ }
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰GetDocumentDelegatePersonInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_DelegatePersonInfo GetDocumentDelegatePersonInfo(int ID)
+ {
+ return _sheZhiService.GetDocumentDelegatePersonInfo(ID);
+ }
+
+
+
+
+ // <summary>
+ /// 鑾峰彇鍏徃postDocumentTenderUnitList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_TenderUnit> postDocumentTenderUnitList(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.postDocumentTenderUnitList(page);
+ }
+
+
+ /// <summary>
+ /// 淇敼鍏徃SaveDocumentTenderUnitInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentTenderUnitInfo(Document_TenderUnit dp)
+ {
+ return _sheZhiService.SaveDocumentTenderUnitInfo(dp);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏徃GetDocumentTenderUnitInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public Document_TenderUnit GetDocumentTenderUnitInfo(int ID)
+ {
+ return _sheZhiService.GetDocumentTenderUnitInfo(ID);
+ }
+
+
+
+
+ // <summary>
+ /// 鑾峰彇鍛樺伐鍒楄〃postDocumentEmployeeInfoList
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<DocumentEmployeeInfoDTO> postDocumentEmployeeInfoList(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.postDocumentEmployeeInfoList(page);
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鍛樺伐GetDelDocumentEmployeeInfoInfo
+ /// </summary>
+ /// <param name="ID"></param>
+ /// <returns></returns>
+ public bool GetDelDocumentEmployeeInfoInfo(int ID)
+ {
+ return _sheZhiService.GetDelDocumentEmployeeInfoInfo(ID);
+ }
+
+ /// <summary>
+ /// 淇敼鍛樺伐SaveDocumentEmployeeInfoInfo
+ /// </summary>
+ /// <param name="dp"></param>
+ /// <returns></returns>
+ public bool SaveDocumentEmployeeInfoInfo(DocumentEmployeeInfoDTO dp)
+ {
+ return _sheZhiService.SaveDocumentEmployeeInfoInfo(dp);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍛樺伐GetDocumentEmployeeInfoInfo
+ /// <param name="ID"></param>
+ /// </summary>
+ public DocumentEmployeeInfoDTO GetDocumentEmployeeInfoInfo(int ID)
+ {
+ return _sheZhiService.GetDocumentEmployeeInfoInfo(ID);
+ }
+
+ // <summary>
+ /// 鑾峰彇鍛樺伐GetDocumentEmployeeInfoByName
+ /// <param name="EmployeeName"></param>
+ /// </summary>
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByName(string EmployeeName)
+ {
+ return _sheZhiService.GetDocumentEmployeeInfoByName(EmployeeName);
+ }
+
+ // <summary>
+ /// 鑾峰彇椤圭洰GetDocumentEmployeeInfoInfo
+ /// <param name="textUserName"></param>
+ /// </summary>
+ public Document_EmployeeInfo GetDocumentEmployeeInfoByLoginName(string textUserName)
+ {
+ return _sheZhiService.GetDocumentEmployeeInfoByLoginName(textUserName);
+ }
+
+ // <summary>
+ /// 鑾峰彇缁╂晥鑰冩牳GetDocumentPerformanceInfoListByPaper
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ public PageResult<Document_PerformanceInfo> postDocumentPerformanceInfoListByPaper(DocumentProjectInfoPageSearch page)
+ {
+ return _sheZhiService.GetDocumentPerformanceInfoListByPaper(page);
+ }
+ }
+
+}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentEmployeeInfoDTO.cs b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentEmployeeInfoDTO.cs
new file mode 100644
index 0000000..e8b94e1
--- /dev/null
+++ b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentEmployeeInfoDTO.cs
@@ -0,0 +1,92 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Application.ProjectInfo.ViewMode
+{
+ public class DocumentEmployeeInfoDTO
+ {
+ /// <summary>
+ /// 鍛樺伐ID
+ /// </summary>
+ public int EmployeeId { get; set; }
+ /// <summary>
+ /// 鍛樺伐鍚嶇О
+ /// </summary>
+ public string EmployeeName { get; set; }
+ /// <summary>
+ /// 宸ヤ綔鑱屼綅
+ /// </summary>
+ public string Job { get; set; }
+ /// <summary>
+ /// 鐢佃瘽
+ /// </summary>
+ public string Phone { get; set; }
+ /// <summary>
+ /// 鏄惁鍦ㄥ伐浣�
+ /// </summary>
+ public int? IsWork { get; set; }
+ /// <summary>
+ /// 绂诲紑鏃堕棿
+ /// </summary>
+ public DateTime? LeaveTime { get; set; }
+ /// <summary>
+ /// 璇佷欢姝ｉ潰
+ /// </summary>
+ public string CardPositive { get; set; }
+ /// <summary>
+ /// 璇佷欢姝ｉ潰鐗堟湰鍙�
+ /// </summary>
+ public string CardPositiveVersionNo { get; set; }
+ /// <summary>
+ /// 璇佷欢姝ｉ潰澶у皬
+ /// </summary>
+ public int? CardPositiveSize { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ public DateTime? LastUpdateTime { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ public string LastUpdateName { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛鍚�
+ /// </summary>
+ public string UserName { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛瀵嗙爜
+ /// </summary>
+ public string UserPassWord { get; set; }
+ /// <summary>
+ /// 鐧诲綍鏃堕棿
+ /// </summary>
+ public DateTime? LoginTime { get; set; }
+ /// <summary>
+ /// 鏄惁鐧诲綍
+ /// </summary>
+ public bool? IsLogin { get; set; }
+ /// <summary>
+ /// 寤鸿鏍囧織
+ /// </summary>
+ public int? AdviseFlag { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛ID
+ /// </summary>
+ public int? UserId { get; set; }
+
+ public string IsWorkName { get; set; }
+
+ public string LeaveTimeName { get; set; }
+
+ public string BMRID { get; set; }
+
+ public string BSZZRID { get; set; }
+
+ public string TBRID { get; set; }
+
+
+ }
+}
diff --git a/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
index 7f54305..4725daa 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/ViewMode/DocumentProjectInfoDTO.cs
@@ -38,6 +38,26 @@
public int ddlLitigationStatus { get; set; }
public int UnitId { get; set; }
public string Experts { get; set; }
+
+ public string FileName { get; set; }
+
+ public int ProjectId { get; set; }
+
+ public string delegateName { get; set; }
+
+ public int isUse { get; set; }
+
+ public string UnitName { get; set; }
+ public int IsUsed { get; set; }
+
+ public string txtName { get; set; }
+
+ public string txtWorkStartTime { get; set; }
+ public string txtWorkEndTime { get; set; }
+ public string txtEmployeeId { get; set; }
+ public string projectName { get; set; }
+ public string txtWorkItem { get; set; }
+
}
public class DocumentProjectInfoDTO
{
diff --git a/DocumentServiceAPI.Application/ProjectInfo/dto/Mapper.cs b/DocumentServiceAPI.Application/ProjectInfo/dto/Mapper.cs
index 2a463ee..b488ede 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/dto/Mapper.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/dto/Mapper.cs
@@ -1,11 +1,13 @@
锘縰sing DocumentServiceAPI.Application.ProjectInfo.ViewMode;
using DocumentServiceAPI.Application.UserAndLogin.ViewMode;
+using DocumentServiceAPI.Application.WorkRemind.ViewMode;
using DocumentServiceAPI.Model.cyDocumentModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using DocumentEmployeeInfoDTO = DocumentServiceAPI.Application.ProjectInfo.ViewMode.DocumentEmployeeInfoDTO;
namespace DocumentServiceAPI.Application.ProjectInfo.dto
{
@@ -15,6 +17,9 @@
{
config.ForType<Document_ProjectInfo, DocumentProjectInfoDTO>();
config.ForType<DocumentProjectInfoDTO, Document_ProjectInfo>();
+
+ config.ForType<Document_EmployeeInfo, DocumentEmployeeInfoDTO>();
+ config.ForType<DocumentEmployeeInfoDTO, Document_EmployeeInfo>();
}
}
}
diff --git a/DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs b/DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs
index 280ff00..adfec1b 100644
--- a/DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs
+++ b/DocumentServiceAPI.Application/WorkRemind/Services/WorkRemindService.cs
@@ -243,7 +243,7 @@
new JoinQueryInfos
(
- JoinType.Left, ei.EmployeeId == et.EmployeeID,
+ JoinType.Inner, ei.EmployeeId == et.EmployeeID && et.TenantID == a.TEID,
JoinType.Left, ei.EmployeeId == er.EmployeeId
)
)
diff --git a/DocumentServiceAPI.Model/cyDocumentModel/Document_DelegatePersonInfo.cs b/DocumentServiceAPI.Model/cyDocumentModel/Document_DelegatePersonInfo.cs
index c4fc73b..37f1137 100644
--- a/DocumentServiceAPI.Model/cyDocumentModel/Document_DelegatePersonInfo.cs
+++ b/DocumentServiceAPI.Model/cyDocumentModel/Document_DelegatePersonInfo.cs
@@ -107,5 +107,12 @@
/// </summary>
public int? UserId {get;set;}
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? TenantID { get; set; }
+
}
}
diff --git a/DocumentServiceAPI.Model/cyDocumentModel/Document_TBXYFile.cs b/DocumentServiceAPI.Model/cyDocumentModel/Document_TBXYFile.cs
new file mode 100644
index 0000000..3c7feb3
--- /dev/null
+++ b/DocumentServiceAPI.Model/cyDocumentModel/Document_TBXYFile.cs
@@ -0,0 +1,132 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Model.cyDocumentModel
+{
+
+ ///<summary>
+ ///
+ ///</summary>
+ [SugarTable("Document_TBXYFile")]
+ public partial class Document_TBXYFile
+ {
+
+ public Document_TBXYFile()
+ {
+
+
+ }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string FileName { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string FilePath { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string FileVersionNo { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? FileSize { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public int UnitId { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? LastUpdateTime { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string LastUpdateName { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? AdviseFlag { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? UserId { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? ProjectId { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string FileContent { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? Sort { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string FileContentRTF { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? SaveFlag { get; set; }
+
+
+
+ }
+}
diff --git a/DocumentServiceAPI.Model/cyDocumentModel/Document_WinInfo.cs b/DocumentServiceAPI.Model/cyDocumentModel/Document_WinInfo.cs
index 375d9b2..b00c28b 100644
--- a/DocumentServiceAPI.Model/cyDocumentModel/Document_WinInfo.cs
+++ b/DocumentServiceAPI.Model/cyDocumentModel/Document_WinInfo.cs
@@ -93,5 +93,26 @@
/// </summary>
public int UnitId { get; set; }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string FirstWinDefen { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string SecondWinDefen { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string ThirdWinDefen { get; set; }
+
}
}
diff --git a/DocumentServiceAPI.Model/cyDocumentModel/Document_ZhaobiaoFile.cs b/DocumentServiceAPI.Model/cyDocumentModel/Document_ZhaobiaoFile.cs
new file mode 100644
index 0000000..b55a429
--- /dev/null
+++ b/DocumentServiceAPI.Model/cyDocumentModel/Document_ZhaobiaoFile.cs
@@ -0,0 +1,99 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DocumentServiceAPI.Model.cyDocumentModel
+{
+ ///<summary>
+ ///
+ ///</summary>
+ [SugarTable("Document_ZhaobiaoFile")]
+ public partial class Document_ZhaobiaoFile
+ {
+ public Document_ZhaobiaoFile()
+ {
+
+
+ }
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string FileName { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public string FilePath { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string FileVersionNo { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? FileSize { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:False
+ /// </summary>
+ public int UnitId { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public DateTime? LastUpdateTime { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string LastUpdateName { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? AdviseFlag { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? UserId { get; set; }
+
+ /// <summary>
+ /// Desc:
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public int? ProjectId { get; set; }
+ }
+}
diff --git a/DocumentServiceAPI.Utility/PageBaseSearch.cs b/DocumentServiceAPI.Utility/PageBaseSearch.cs
index 598b1dd..ae710f1 100644
--- a/DocumentServiceAPI.Utility/PageBaseSearch.cs
+++ b/DocumentServiceAPI.Utility/PageBaseSearch.cs
@@ -74,6 +74,14 @@
/// 鎬婚〉鏁�
/// </summary>
public int TotalPage { get; set; }
+ /// <summary>
+ /// 褰撳墠椤电粺璁�
+ /// </summary>
+ public decimal NowPageMoney { get; set; }
+ /// <summary>
+ /// 鎵�鏈夐〉缁熻
+ /// </summary>
+ public decimal AllPageMoney { get; set; }
}
}
diff --git a/DocumentServiceAPI.Web.Entry/appsettings.json b/DocumentServiceAPI.Web.Entry/appsettings.json
index 550e6de..c4b4845 100644
--- a/DocumentServiceAPI.Web.Entry/appsettings.json
+++ b/DocumentServiceAPI.Web.Entry/appsettings.json
@@ -12,7 +12,16 @@
{
"ConfigId": "default", //澶氬簱閰嶇疆ID
- "ConnectionString": "Server=.;Database=doc_new;User ID=sa;Password=123456;",
+ "ConnectionString": "Server=.;Database=CY_DocumentSystemOnline;User ID=sa;Password=123456;",
+ "DbType": "SqlServer",
+ "IsAutoCloseConnection": true
+
+
+ },
+ {
+
+ "ConfigId": "zhengcaioa", //澶氬簱閰嶇疆ID
+ "ConnectionString": "Server=.;Database=zhengcaioa55;User ID=sa;Password=123456;",
"DbType": "SqlServer",
"IsAutoCloseConnection": true
@@ -39,7 +48,7 @@
"ValidateAudience": true, // 鏄惁楠岃瘉绛炬敹鏂癸紝bool 绫诲瀷锛岄粯璁rue
"ValidAudience": "www.51zhengcai.com", // 绛炬敹鏂癸紝string 绫诲瀷
"ValidateLifetime": true, // 鏄惁楠岃瘉杩囨湡鏃堕棿锛宐ool 绫诲瀷锛岄粯璁rue锛屽缓璁畉rue
- "ExpiredTime": 20, // 杩囨湡鏃堕棿锛宭ong 绫诲瀷锛屽崟浣嶅垎閽燂紝榛樿20鍒嗛挓
+ "ExpiredTime": 1440, // 杩囨湡鏃堕棿锛宭ong 绫诲瀷锛屽崟浣嶅垎閽燂紝榛樿20鍒嗛挓
"ClockSkew": 5, // 杩囨湡鏃堕棿瀹归敊鍊硷紝long 绫诲瀷锛屽崟浣嶇锛岄粯璁� 5绉�
"Algorithm": "HS256" // 鍔犲瘑绠楁硶锛宻tring 绫诲瀷锛岄粯璁� HS256
}
--
Gitblit v1.9.1