From 90858c80d9921b555119f41060c1f883f6e6ffc5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 十二月 2024 12:49:35 +0800
Subject: [PATCH] 提交
---
DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs | 768 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 747 insertions(+), 21 deletions(-)
diff --git a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
index f54364c..b54d682 100644
--- a/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
+++ b/DocumentServiceAPI.Application/ProjectInfo/Services/ProjectInfoService.cs
@@ -1,5 +1,6 @@
锘縰sing AngleSharp.Dom;
using AngleSharp.Html.Parser;
+using DocumentServiceAPI.Application.DocManage.Dtos;
using DocumentServiceAPI.Application.ProjectInfo.Services.Interfaces;
using DocumentServiceAPI.Application.ProjectInfo.ViewMode;
using DocumentServiceAPI.Application.Repository;
@@ -27,6 +28,7 @@
using System.Data;
using System.Diagnostics.Metrics;
using System.Linq;
+using System.Reflection.Emit;
using System.Reflection.Metadata;
using System.Runtime.Intrinsics.Arm;
using System.Runtime.Intrinsics.X86;
@@ -116,7 +118,7 @@
document_ProjectInfo.ProjectUrl = dp.ProjectUrl;
var parser = new HtmlParser();
var list11 = new List<AngleSharp.Dom.IElement>();
- if (url.StartsWith("http://www.ccgp.gov.cn"))
+ if (url.StartsWith("http://www.ccgp.gov.cn")|| url.StartsWith("https://www.ccgp.gov.cn"))
{
using (HttpClient client = new HttpClient())
{
@@ -142,29 +144,49 @@
}
}
document_ProjectInfo.PurchaseMethod = 0;
- if (document_ProjectInfo.ProjectName.IndexOf("鍏紑鎷涙爣")>=0)
+ if (document_ProjectInfo.ProjectName.IndexOf("鍏紑鎷涙爣") >= 0)
{
document_ProjectInfo.PurchaseMethod = 3;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍏紑鎷涙爣", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬ц皥鍒�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 4;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬ц皥鍒�", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("鍗曚竴鏉ユ簮") >= 0)
{
document_ProjectInfo.PurchaseMethod = 5;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍗曚竴鏉ユ簮", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("璇环") >= 0)
{
document_ProjectInfo.PurchaseMethod = 6;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("璇环", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("閭�璇�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 31;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("閭�璇锋嫑鏍�", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬х鍟�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 37;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬х鍟�", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("妗嗘灦鍗忚") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 38;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("妗嗘灦鍗忚", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("姣旈��") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 39;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("姣旈��", "").Replace("鍏憡", "");
}
-
+
var vF_detail_content = document.All.Where(m => m.ClassName == "vF_detail_content").FirstOrDefault();
var td = vF_detail_content.QuerySelectorAll("p");
@@ -336,9 +358,35 @@
if (DateTime.TryParse(TenderTimes, out b))
{
document_ProjectInfo.TenderTime = b;
- document_ProjectInfo.SignupStartTime = b;
- document_ProjectInfo.SignupEndTime = b;
+
}
+
+
+ var jiezhishijian = document.All.Where(m => m.HasAttribute("id") &&
+ m.GetAttribute("id").StartsWith("_notice_content_noticePurchaseTime-noticePurchaseTime")).FirstOrDefault();
+
+ var jiezhishijians = jiezhishijian.QuerySelectorAll("span");
+ if (jiezhishijians != null && jiezhishijians.Length > 0)
+ {
+ //for (int i = 0; i < jiezhishijians.Length; i++)
+ //{
+ // if (jiezhishijians[i].TextContent.IndexOf("骞�") >= 0 && jiezhishijians[i].TextContent.IndexOf("銆�") < 0)
+ // {
+
+ // }
+ //}
+ if (DateTime.TryParse(jiezhishijians[0].TextContent.Trim(), out b))
+ {
+ document_ProjectInfo.SignupStartTime = b;
+
+ }
+
+ if (DateTime.TryParse(jiezhishijians[1].TextContent.Trim(), out b))
+ {
+ document_ProjectInfo.SignupEndTime = b;
+ }
+ }
+
@@ -346,25 +394,43 @@
if (document_ProjectInfo.ProjectName.IndexOf("鍏紑鎷涙爣") >= 0)
{
document_ProjectInfo.PurchaseMethod = 3;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍏紑鎷涙爣", "").Replace("鍏憡","");
}
else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬ц皥鍒�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 4;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬ц皥鍒�", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("鍗曚竴鏉ユ簮") >= 0)
{
document_ProjectInfo.PurchaseMethod = 5;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍗曚竴鏉ユ簮", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("璇环") >= 0)
{
document_ProjectInfo.PurchaseMethod = 6;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("璇环", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("閭�璇�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 31;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("閭�璇锋嫑鏍�", "").Replace("鍏憡", "");
}
-
-
+ else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬х鍟�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 37;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬х鍟�", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("妗嗘灦鍗忚") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 38;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("妗嗘灦鍗忚", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("姣旈��") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 39;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("姣旈��", "").Replace("鍏憡", "");
+ }
var vF_detail_content = document.All.Where(m => m.LocalName == "div" &&
@@ -387,9 +453,77 @@
}
-
+
+ if (td[i].TextContent.IndexOf("椤圭洰鍚嶇О锛�") >= 0 && td[i].TextContent.IndexOf("銆�") < 0)
+ {
+ if (string.IsNullOrEmpty(document_ProjectInfo.ProjectName))
+ {
+ document_ProjectInfo.ProjectName = td[i].TextContent.Replace("椤圭洰鍚嶇О锛�", "").Replace("1锛�", "").Replace("/", "").Trim();
+ }
+
+
+
+ }
+
+ if (td[i].TextContent.IndexOf("閲囪喘鏂瑰紡锛�") >= 0 && td[i].TextContent.IndexOf("銆�") < 0)
+ {
+ if (td[i].TextContent.IndexOf("鍏紑鎷涙爣") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 3;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍏紑鎷涙爣", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("绔炰簤鎬ц皥鍒�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 4;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬ц皥鍒�", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("鍗曚竴鏉ユ簮") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 5;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍗曚竴鏉ユ簮", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("璇环") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 6;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("璇环", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("閭�璇�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 31;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("閭�璇锋嫑鏍�", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("绔炰簤鎬х鍟�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 37;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬х鍟�", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("妗嗘灦鍗忚") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 38;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("妗嗘灦鍗忚", "").Replace("鍏憡", "");
+ }
+ else if (td[i].TextContent.IndexOf("姣旈��") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 39;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("姣旈��", "").Replace("鍏憡", "");
+ }
+
+
+
+ }
+
}
}
+
+ var txtAgencyManager = document.All.Where(m => m.LocalName == "span" &&
+ m.HasAttribute("id") &&
+ m.GetAttribute("id").StartsWith("_notice_content_projectContact-managerName")).FirstOrDefault();
+ if (txtAgencyManager != null)
+ {
+ document_ProjectInfo.AgencyManager = txtAgencyManager.TextContent;
+ }
+
+
var lianxiren = document.All.Where(m => m.LocalName == "div" && m.ClassName == "innercontent").ToList();
foreach (var element in lianxiren)
{
@@ -474,22 +608,42 @@
if (document_ProjectInfo.ProjectName.IndexOf("鍏紑鎷涙爣") >= 0)
{
document_ProjectInfo.PurchaseMethod = 3;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍏紑鎷涙爣", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬ц皥鍒�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 4;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬ц皥鍒�", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("鍗曚竴鏉ユ簮") >= 0)
{
document_ProjectInfo.PurchaseMethod = 5;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("鍗曚竴鏉ユ簮", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("璇环") >= 0)
{
document_ProjectInfo.PurchaseMethod = 6;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("璇环", "").Replace("鍏憡", "");
}
else if (document_ProjectInfo.ProjectName.IndexOf("閭�璇�") >= 0)
{
document_ProjectInfo.PurchaseMethod = 31;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("閭�璇锋嫑鏍�", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("绔炰簤鎬х鍟�") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 37;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("绔炰簤鎬х鍟�", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("妗嗘灦鍗忚") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 38;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("妗嗘灦鍗忚", "").Replace("鍏憡", "");
+ }
+ else if (document_ProjectInfo.ProjectName.IndexOf("姣旈��") >= 0)
+ {
+ document_ProjectInfo.PurchaseMethod = 39;
+ document_ProjectInfo.ProjectName = document_ProjectInfo.ProjectName.Replace("姣旈��", "").Replace("鍏憡", "");
}
@@ -614,8 +768,8 @@
//page.ToEmployeeId = a.EID;
int total = 0;
PageResult<DocumentProjectInfoDTO> result = new PageResult<DocumentProjectInfoDTO>();
-
+ //var document_OtherCompanyTenderInfos = _db.Queryable<Document_OtherCompanyTenderInfo>().Where(x => x.TenantID == aaa.TEID).ToList();
result.Items = _db.Queryable<Document_ProjectInfo, Document_ProjectExpand, Document_ProjectOppugnInfo, Document_ProjectComplainInfo, Document_ProjectReviewInfo, Document_ProjectLitigationInfo, Document_AdviseInfo, Document_ProjectComplainInfo, Document_ProjectOppugnInfo, Document_ProjectLitigationInfo, Document_ProjectReviewInfo, Document_WinInfo>((a, d, e,f,g,h,i,j,k,l,m,n) =>
new JoinQueryInfos
@@ -665,11 +819,11 @@
.WhereIF(page.ddlSignUp > 0 && page.ddlSignUp == 1, (a, d, e, f, g, h, i, j, k, l, m, n) => (d.IsSignup == 0 || d.IsSignup == null))
.WhereIF(page.ddlSignUp > 0 && page.ddlSignUp != 1, (a, d, e, f, g, h, i, j, k, l, m, n) => d.IsSignup == 1 )
//淇濊瘉閲戠姸鎬�
- .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 12, (a, d, e, f, g, h, i, j, k, l, m, n) => d.TenderDepositStatus == null)
+ .WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 12, (a, d, e, f, g, h, i, j, k, l, m, n) => a.TenderDeposit != null && a.TenderDeposit > 0 && d.TenderDepositStatus == null)
.WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit == 36, (a, d, e, f, g, h, i, j, k, l, m, n) => a.TenderTime < DateTime.Now.AddDays(15) && d.TenderDepositStatus == 13 )
.WhereIF(page.ddlTenderDeposit > 0 && page.ddlTenderDeposit != 12 && page.ddlTenderDeposit != 36, (a, d, e, f, g, h, i, j, k, l, m, n) => d.TenderDepositStatus == page.ddlTenderDeposit)
//灞ョ害閲戠姸鎬�
- .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond == 32, (a, d, e, f, g, h, i, j, k, l, m, n) => (d.BidbondStatus == null))
+ .WhereIF(page.ddlBidbond > 0 && page.ddlBidbond == 32, (a, d, e, f, g, h, i, j, k, l, m, n) => (a.Bidbond!=null && a.Bidbond >0 && d.BidbondStatus == null))
.WhereIF(page.ddlBidbond > 0 && page.ddlBidbond != 32, (a, d, e, f, g, h, i, j, k, l, m, n) => d.BidbondStatus == page.ddlBidbond )
//鏍囦功鐘舵��
.WhereIF(page.ddlDocumentStatus > 0 && page.ddlDocumentStatus == 15, (a, d, e, f, g, h, i, j, k, l, m, n) => (d.DocumentStatus == null || d.DocumentStatus == 0 || d.DocumentStatus == 15))
@@ -692,6 +846,9 @@
//璇夎鎯呭喌
.WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus == 1, (a, d, e, f, g, h, i, j, k, l, m, n) => (h.FilePath == null || h.FilePath == ""))
.WhereIF(page.ddlLitigationStatus > 0 && page.ddlLitigationStatus != 1, (a, d, e, f, g, h, i, j, k, l, m, n) => (h.FilePath != null && h.FilePath != ""))
+
+ .WhereIF(!string.IsNullOrEmpty(page.txtCompanyName), (a, d, e, f, g, h, i, j, k, l, m, n) => (n.FirstWinCompany.Contains(page.txtCompanyName) || n.SecondWinCompany.Contains(page.txtCompanyName) || n.ThirdCompany.Contains(page.txtCompanyName) || SqlFunc.Subqueryable<Document_OtherCompanyTenderInfo>().Where(s => s.TenantID == a.TenantID && s.ProjectId == a.ProjectId && s.CompanyName.Contains(page.txtCompanyName)).Any()))
+
.Select((a, d, e, f, g, h, i, j, k, l, m, n) => new DocumentProjectInfoDTO
{
ProjectId = a.ProjectId,
@@ -719,7 +876,9 @@
NoticeTypeName = "鎷涙爣鍏憡",
NoticeType = a.NoticeType,
PurchaseMethod = a.PurchaseMethod,
- DocumentStatus = d.DocumentStatus
+ DocumentStatus = d.DocumentStatus,
+ SignupMethod = a.SignupMethod,
+
}
)
.OrderByDescending(a => a.ProjectId).ToPageList(page.PageIndex, page.PageSize, ref total);
@@ -746,7 +905,7 @@
documentProjectInfoDTO.xmqy = documentProjectInfoDTO.City+ documentProjectInfoDTO.County;
}
- if(documentProjectInfoDTO.IsSignup == 1)
+ if(documentProjectInfoDTO.IsSignup == 1 || documentProjectInfoDTO.SignupMethod == 9 )
{
documentProjectInfoDTO.bm = "鈭�";
}
@@ -871,7 +1030,18 @@
documentProjectInfoDTO.PurchaseMethodName = document_Dictionary.Name;
}
}
-
+
+ var sss = _db.Queryable<Document_ZhaobiaoFile>().Count(x => x.ProjectId == documentProjectInfoDTO.ProjectId && x.UnitId == page.UnitId);
+ if (sss > 0)
+ {
+ documentProjectInfoDTO.zbwj = "鈭�";
+ }
+ else
+ {
+ documentProjectInfoDTO.zbwj = "鎷涙爣鏂囦欢";
+ }
+
+
}
}
@@ -1265,16 +1435,16 @@
public List<Document_AptitudeInfo> GetAptitudeInfoByUnitId(int UnitId)
{
- var result = _db.Queryable<Doc_Info>().Where( x=>x.is_del == false && x.org_id == UnitId).ToList() ;//鎵ц鏌ヨ
+ var result = _db.Queryable<Doc_Info>().Where( x=>x.is_del == false && x.org_id == UnitId && x.zige_code > 0).OrderBy(x=>x.doc_code).OrderBy(x=>x.sort).ToList() ;//鎵ц鏌ヨ
var ids = result.Select(x => x.id).ToArray();
- var file = _db.Queryable<File_Info>().Where(x => ids.Contains(x.doc_id)).ToList();//鎵ц鏌ヨ
+ var file = _db.Queryable<File_Info>().Where(x => ids.Contains(x.doc_id) && x.status ==1 ).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();
+ var filesss = file.Where(x => x.doc_id == doc_Info.id).OrderBy(x => x.sort).ToList();
if(filesss!=null && filesss.Count > 0)
{
@@ -1305,8 +1475,174 @@
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.AdviseFlag = doc_Info.zige_code; ;
document_AptitudeInfo.UserId = doc_Info.tenant_code;
+
+ document_AptitudeInfos.Add(document_AptitudeInfo);
+ }
+
+ //var resultAchievement = _db.Queryable<Doc_Achievement>().Where(x => x.status == 1 && x.tenant_code == UnitId).OrderBy(x=>x.sort).ToList();//鎵ц鏌ヨ
+
+
+ //foreach (var achievement in resultAchievement)
+ //{
+ // var document_AptitudeInfo = new Document_AptitudeInfo();
+ // document_AptitudeInfo.FilePath = "";
+ // document_AptitudeInfo.FileName = "";
+ // document_AptitudeInfo.FileSize = 0;
+ // if (!string.IsNullOrEmpty(achievement.zbtzs_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.zbtzs_url;
+ // document_AptitudeInfo.FileName += "涓爣閫氱煡涔�";
+ // document_AptitudeInfo.FileSize += 0 ;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+ // if (!string.IsNullOrEmpty(achievement.ht_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.ht_url;
+ // document_AptitudeInfo.FileName += "鍚堝悓";
+ // document_AptitudeInfo.FileSize += 0;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+ // if (!string.IsNullOrEmpty(achievement.ysbg_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.ysbg_url;
+ // document_AptitudeInfo.FileName += "楠屾敹鎶ュ憡";
+ // document_AptitudeInfo.FileSize += 0;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+ // if (!string.IsNullOrEmpty(achievement.fkpz_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.fkpz_url;
+ // document_AptitudeInfo.FileName += "浠樻鍑瘉";
+ // document_AptitudeInfo.FileSize += 0;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+ // if (!string.IsNullOrEmpty(achievement.yhpj_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.yhpj_url;
+ // document_AptitudeInfo.FileName += "鐢ㄦ埛璇勪环";
+ // document_AptitudeInfo.FileSize += 0;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+ // if (!string.IsNullOrEmpty(achievement.hjzs_url))
+ // {
+ // document_AptitudeInfo.FilePath += achievement.hjzs_url;
+ // document_AptitudeInfo.FileName += "鑾峰璇佷功";
+ // document_AptitudeInfo.FileSize += 0;
+ // document_AptitudeInfo.FilePath += ";";
+ // document_AptitudeInfo.FileName += ";";
+ // }
+
+ // if (document_AptitudeInfo.FilePath.EndsWith(";"))
+ // {
+ // document_AptitudeInfo.FilePath = document_AptitudeInfo.FilePath.Substring(0, document_AptitudeInfo.FilePath.Length - 1);
+ // }
+
+ // if (document_AptitudeInfo.FileName.EndsWith(";"))
+ // {
+ // document_AptitudeInfo.FileName = document_AptitudeInfo.FileName.Substring(0, document_AptitudeInfo.FileName.Length - 1);
+ // }
+
+
+ // document_AptitudeInfo.AptitudeId = achievement.id;
+ // document_AptitudeInfo.AptitudeName = achievement.achievement_name;
+ // document_AptitudeInfo.AptitudeType = achievement.classification_id;
+ // document_AptitudeInfo.IsUsed = achievement.status;
+
+
+ // document_AptitudeInfo.FileVersionNo = "";
+ // document_AptitudeInfo.SendTime = achievement.add_time.ToShortDateString();
+ // document_AptitudeInfo.UnitId = achievement.tenant_code ;
+ // document_AptitudeInfo.LastUpdateTime = achievement.add_time;
+ // document_AptitudeInfo.LastUpdateName = "";
+ // document_AptitudeInfo.AdviseFlag = 1;
+ // document_AptitudeInfo.UserId = achievement.tenant_code;
+
+ // document_AptitudeInfos.Add(document_AptitudeInfo);
+ //}
+
+
+ var resultShebeinengli = _db.Queryable<Doc_Shebeinengli>().Where(x => x.status == 1 && x.tenant_code == UnitId && (x.sbzp_zige > 0 || x.gmht_zige > 0 || x.fp_zige > 0 || x.fkpz_zige > 0 || x.csmp_zige > 0)).OrderBy(x => x.sort).ToList();//鎵ц鏌ヨ
+
+
+ foreach (var achievement in resultShebeinengli)
+ {
+ var document_AptitudeInfo = new Document_AptitudeInfo();
+ document_AptitudeInfo.FilePath = "";
+ document_AptitudeInfo.FileName = "";
+ document_AptitudeInfo.FileSize = 0;
+ if (!string.IsNullOrEmpty(achievement.sbzp_url) && achievement.sbzp_zige > 0)
+ {
+ document_AptitudeInfo.FilePath += achievement.sbzp_url;
+ document_AptitudeInfo.FileName += "璁惧鐓х墖";
+ document_AptitudeInfo.FileSize += 0;
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+ if (!string.IsNullOrEmpty(achievement.gmht_url) && achievement.gmht_zige > 0)
+ {
+ document_AptitudeInfo.FilePath += achievement.gmht_url;
+ document_AptitudeInfo.FileName += "璐拱鍚堝悓";
+ document_AptitudeInfo.FileSize += 0;
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+ if (!string.IsNullOrEmpty(achievement.fp_url) && achievement.fp_zige > 0)
+ {
+ document_AptitudeInfo.FilePath += achievement.fp_url;
+ document_AptitudeInfo.FileName += "鍙戠エ";
+ document_AptitudeInfo.FileSize += 0;
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+ if (!string.IsNullOrEmpty(achievement.fkpz_url) && achievement.fkpz_zige > 0)
+ {
+ document_AptitudeInfo.FilePath += achievement.fkpz_url;
+ document_AptitudeInfo.FileName += "浠樻鍑瘉";
+ document_AptitudeInfo.FileSize += 0;
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+ if (!string.IsNullOrEmpty(achievement.csmp_url) && achievement.csmp_zige > 0)
+ {
+ document_AptitudeInfo.FilePath += achievement.csmp_url;
+ document_AptitudeInfo.FileName += "鍙傛暟锛堥摥鐗岋級";
+ document_AptitudeInfo.FileSize += 0;
+ document_AptitudeInfo.FilePath += ";";
+ document_AptitudeInfo.FileName += ";";
+ }
+
+
+ if (document_AptitudeInfo.FilePath.EndsWith(";"))
+ {
+ document_AptitudeInfo.FilePath = document_AptitudeInfo.FilePath.Substring(0, document_AptitudeInfo.FilePath.Length - 1);
+ }
+
+ if (document_AptitudeInfo.FileName.EndsWith(";"))
+ {
+ document_AptitudeInfo.FileName = document_AptitudeInfo.FileName.Substring(0, document_AptitudeInfo.FileName.Length - 1);
+ }
+
+
+ document_AptitudeInfo.AptitudeId = achievement.id;
+ document_AptitudeInfo.AptitudeName = achievement.shebeinengli_name;
+ document_AptitudeInfo.AptitudeType = achievement.classification_id;
+ document_AptitudeInfo.IsUsed = achievement.status;
+
+
+ document_AptitudeInfo.FileVersionNo = "";
+ document_AptitudeInfo.SendTime = achievement.add_time.ToShortDateString();
+ document_AptitudeInfo.UnitId = achievement.tenant_code;
+ document_AptitudeInfo.LastUpdateTime = achievement.add_time;
+ document_AptitudeInfo.LastUpdateName = "";
+ document_AptitudeInfo.AdviseFlag = achievement.zige_code;
+ document_AptitudeInfo.UserId = achievement.tenant_code;
document_AptitudeInfos.Add(document_AptitudeInfo);
}
@@ -1560,7 +1896,8 @@
public List<Document_DocumentTempletInfo> GetDocumentTempletList()
{
- var result = _db.Queryable<Document_DocumentTempletInfo>().Where(x => x.IsUsed == 1).ToList();//鎵ц鏌ヨ
+ var aaa = GetJwtInfo();
+ var result = _db.Queryable<Document_DocumentTempletInfo>().Where(x => x.IsUsed == 1 && x.UnitId == aaa.UID).OrderByDescending(x=>x.LastUpdateTime).ToList();//鎵ц鏌ヨ
return result;
}
@@ -1683,7 +2020,7 @@
if(result.Items !=null&& result.Items.Count > 0)
{
- var doc_Classifications = _db.Queryable<Doc_Classification>().Where(x => x.parent_code == "003").ToList();//鎵ц鏌ヨ
+ var doc_Classifications = _db.Queryable<Doc_Classification>().Where(x => x.parent_code == "000").ToList();//鎵ц鏌ヨ
foreach (var item in result.Items)
{
var doc_Classification = doc_Classifications.Where(x => x.id == item.Classification).FirstOrDefault();
@@ -1803,9 +2140,398 @@
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 =="000" && 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;
+ }
+
+
+
+
+
+
+
+ public PageResult<DocClassificationDTO> postDocClassificationList(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<DocClassificationDTO> result = new PageResult<DocClassificationDTO>();
+
+
+
+ result.Items = _db.Queryable<Doc_Classification, Doc_ClassDel>((a, b) =>
+ new JoinQueryInfos
+ (
+ JoinType.Left, a.id == b.doc_classification_id && b.tenant_code == page.TenantID
+ ))
+ .Where((a, b) => ( a.tenant_code == page.TenantID || a.is_system == true) )
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.FileName), (a, b) => a.doc_classification.Contains(page.FileName))
+ .WhereIF(!string.IsNullOrEmpty(page.parentcode), (a, b) => a.parent_code == page.parentcode )
+ .WhereIF(page.Status.HasValue, (a, b) => (a.is_system == false && a.status == page.Status.Value ) || (page.Status.Value == 1 && a.is_system == true && b.tenant_code == null ) || (page.Status.Value == 0 && a.is_system == true && b.tenant_code != null))
+
+ .Select((a, b) => new DocClassificationDTO
+ {
+ id = a.id,
+ doc_classification_code = a.doc_classification_code,
+ doc_classification = a.doc_classification,
+ parent_code = a.parent_code,
+ is_system = a.is_system,
+ sort_id = a.sort_id,
+ tenant_code = a.tenant_code,
+ add_time = a.add_time,
+ status = a.status,
+
+ }
+ )
+ .OrderBy(a => a.sort_id).ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+ if (result.Items != null && result.Items.Count > 0)
+ {
+
+ foreach (var item in result.Items)
+ {
+ if (item.is_system)
+ {
+ var doc_ClassDel = _db.Queryable<Doc_ClassDel>().Where(x => x.doc_classification_id == item.id && x.tenant_code == page.TenantID ).First();//鎵ц鏌ヨ
+
+ if (doc_ClassDel != null)
+ {
+ item.status = 0;
+ item.statusName = "鍋滅敤";
+ }
+ else
+ {
+ item.statusName = "鍚敤";
+ }
+ }
+ else
+ {
+ if(item.status == 1)
+ {
+ item.statusName = "鍚敤";
+ }
+ else
+ {
+ item.statusName = "鍋滅敤";
+ }
+
+ }
+
+ }
+ }
+
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+
+
+ return result;
+ }
+
+
+ public Doc_Classification GetDocClassificationInfo(int ID)
+ {
+ var aaa = GetJwtInfo();
+ var result = _db.Queryable<Doc_Classification>().Where(x => x.id == ID).First();//鎵ц鏌ヨ
+ if (result!=null && result.is_system)
+ {
+ var doc_ClassDel = _db.Queryable<Doc_ClassDel>().Where(x => x.doc_classification_id == result.id && x.tenant_code == aaa.TEID).First();//鎵ц鏌ヨ
+
+ if (doc_ClassDel != null)
+ {
+ result.status = 0;
+ }
+ else
+ {
+ result.status = 1;
+ }
+ }
+
+
+ return result;
+ }
+
+
+ public bool GetDeleteDocClassDel(int ID , int tenantId)
+ {
+
+ _db.Deleteable<Doc_ClassDel>().Where(x => x.doc_classification_id == ID && x.tenant_code == tenantId ).ExecuteCommand();
+
+ return true;
+ }
+
+
+ public bool GetDeleteDocClassification(int ID )
+ {
+ var result = _db.Queryable<Doc_Classification>().Where(x => x.id == ID).First();//鎵ц鏌ヨ
+ if (result != null)
+ {
+ _db.Deleteable<Doc_Classification>().Where(x => x.parent_code == result.doc_classification_code).ExecuteCommand();
+ }
+
+ _db.Deleteable<Doc_Classification>().Where(x => x.id == ID ).ExecuteCommand();
+
+ return true;
+ }
+
+ public bool SaveDocClassificationInfo(Doc_Classification dp)
+ {
+
+
+
+
+
+ if (dp.id > 0)
+ {
+ _db.Updateable<Doc_Classification>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Doc_Classification>(dp).ExecuteCommand();
+ }
+
+ return true;
+ }
+
+ public bool SaveDocClassDelInfo(Doc_ClassDel dp)
+ {
+
+ if (dp.id > 0)
+ {
+ _db.Updateable<Doc_ClassDel>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Doc_ClassDel>(dp).ExecuteCommand();
+ }
+ return true;
+ }
+
+
+ public List<Doc_Classification> GetDocClassificationList(int tenantId)
+ {
+ var ret = _db.Queryable<Doc_Classification>()
+ .Where(x => ((x.tenant_code == tenantId && x.status == 1) || x.is_system == true) && x.parent_code == "00" )
+ //.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,
+ // Classification = a.Classification,
+ //})
+ .OrderBy(a => a.sort_id).ToList();
+
+
+ if (ret != null && ret.Count > 0)
+ {
+
+ foreach (var item in ret)
+ {
+ if (item.is_system)
+ {
+ var doc_ClassDel = _db.Queryable<Doc_ClassDel>().Where(x => x.doc_classification_id == item.id && x.tenant_code == tenantId).First();//鎵ц鏌ヨ
+
+ if (doc_ClassDel != null)
+ {
+ item.status = 0;
+
+ }
+
+ }
+
+ }
+ }
+
+ ret = ret.Where(x => x.status == 1).ToList();
+
+ return ret;
+ }
+
+ public Doc_Classification GetDocClassificationByFileName(int tenantId , string FileName, string parent_code)
+ {
+ var ret = _db.Queryable<Doc_Classification>().Where(x => ( x.tenant_code == tenantId || x.is_system == true ) && x.doc_classification == FileName && x.parent_code == parent_code).First();
+ return ret;
+ }
+
+
+ public Doc_Classification GetDocClassificationcode(int tenantId,string parent_code)
+ {
+ var ret = _db.Queryable<Doc_Classification>().Where(x => (x.tenant_code == tenantId || x.is_system == true) && x.parent_code == parent_code).OrderByDescending(x=>x.doc_classification_code).First();
+ string doc_classification_code = (int.Parse(ret.doc_classification_code) + 1).ToString().PadLeft(3, '0');
+ Doc_Classification doc_Classification = new Doc_Classification();
+ doc_Classification.doc_classification_code = doc_classification_code;
+ return doc_Classification;
+ }
+
+ public Doc_Classification GetDocClassificationInfoMaxSortId(int tenantId ,string docclassificationcode)
+ {
+ var ret = _db.Queryable<Doc_Classification>()
+ .Where(x => (x.tenant_code == tenantId || x.is_system == true))
+ .WhereIF(!string.IsNullOrEmpty(docclassificationcode), x => x.parent_code == docclassificationcode)
+ .Where(x => x.sort_id <= 99999)
+ .Max(x => x.sort_id);
+
+ Doc_Classification doc_Classification = new Doc_Classification();
+ doc_Classification.sort_id = ret;
+ return doc_Classification;
+ }
+
+ public Doc_Classification GetDocumentInfoMaxSortId(int unitId, string doccode)
+ {
+ var ret = _db.Queryable<Doc_Info>()
+ .Where(x => x.org_id == unitId )
+ .WhereIF(!string.IsNullOrEmpty(doccode), x => x.doc_code == doccode)
+ .Max(x => x.sort);
+
+ Doc_Classification doc_Classification = new Doc_Classification();
+ doc_Classification.sort_id = ret??0;
+ return doc_Classification;
+ }
+
+ public Doc_Classification GetAchievementInfoMaxSortId(int unitId)
+ {
+ var ret = _db.Queryable<Doc_Achievement>()
+ .Where(x => x.tenant_code == unitId)
+ //.WhereIF(!string.IsNullOrEmpty(doccode), x => x.doc_code == doccode)
+ .Max(x => x.sort);
+
+ Doc_Classification doc_Classification = new Doc_Classification();
+ doc_Classification.sort_id = ret ?? 0;
+ return doc_Classification;
+ }
+
+
+ public Doc_Classification GetShebeinengliInfoMaxSortId(int unitId)
+ {
+ var ret = _db.Queryable<Doc_Shebeinengli>()
+ .Where(x => x.tenant_code == unitId)
+ //.WhereIF(!string.IsNullOrEmpty(doccode), x => x.doc_code == doccode)
+ .Max(x => x.sort);
+
+ Doc_Classification doc_Classification = new Doc_Classification();
+ doc_Classification.sort_id = ret ?? 0;
+ return doc_Classification;
+ }
+
+
+ public PageResult<Document_DocumentTempletInfoDTO> postDocumentTempletList(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_DocumentTempletInfoDTO> result = new PageResult<Document_DocumentTempletInfoDTO>();
+
+
+
+ var document_DocumentTempletInfos = _db.Queryable<Document_DocumentTempletInfo> ()
+ .Where(x=>x.UnitId == aaa.UID)
+ //鏂囦欢鍚嶇О
+ .WhereIF(!string.IsNullOrEmpty(page.templetName), a => a.TempletName.Contains(page.templetName))
+ .WhereIF(page.purchaseMethod !=0, a => a.PurchaseMethod == page.purchaseMethod)
+ .WhereIF(page.IsUsed>0, a => (page.IsUsed == 1 && a.IsUsed == 1 ) || (page.IsUsed != 1 && a.IsUsed == 2))
+
+
+
+ .OrderByDescending(a => a.TempletId).ToPageList(page.PageIndex, page.PageSize, ref total);
+
+
+ result.Items = _mapper.Map<List<Document_DocumentTempletInfoDTO>>(document_DocumentTempletInfos);
+
+ if (result.Items != null && result.Items.Count > 0)
+ {
+
+ foreach (var item in result.Items)
+ {
+ if (item.IsUsed == 1)
+ {
+
+
+
+ item.isUseName = "鍚敤";
+
+ item.isUseOp = "鍋滅敤";
+
+ }
+ else
+ {
+ item.isUseName = "鍋滅敤";
+ item.isUseOp = "鍚敤";
+ }
+
+ }
+ }
+
+ result.TotalCount = total;
+ result.TotalPage = total % page.PageSize == 0 ? total / page.PageSize : total / page.PageSize + 1;
+
+
+
+ return result;
+ }
+
+
+ public bool GetDeleteDocumentTempletInfo(int ID)
+ {
+ _db.Deleteable<Document_DocumentTempletInfo>().Where(x => x.TempletId == ID ).ExecuteCommand();
+
+ return true;
+ }
+
+
+ public bool SaveDocumentTempletInfo(Document_DocumentTempletInfo dp)
+ {
+ if (dp.TempletId > 0)
+ {
+ _db.Updateable<Document_DocumentTempletInfo>(dp).ExecuteCommand();
+ }
+ else
+ {
+ _db.Insertable<Document_DocumentTempletInfo>(dp).ExecuteCommand();
+ }
+ return true;
+ }
+
+
+ public Document_DocumentTempletInfo GetTempletModelByProjectId(int projiectid)
+ {
+
+ var aaa = GetJwtInfo();
+ var ret = _db.Queryable<Document_DocumentTempletInfo>().Where(x => x.ProjectId == projiectid && x.UnitId == aaa.UID ).First();
+ return ret;
+ }
}
}
--
Gitblit v1.9.1