From fac0853dc9fa1c864baf91fe314609fddce85671 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 02 十二月 2022 15:55:31 +0800
Subject: [PATCH] 提交
---
zhengcaioa/DTO/FiAccountRecordDTO.cs | 2
zhengcaioa/Services/FiAccountRecordService.cs | 1
zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs | 85 +++++++++-----------
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs | 1
zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs | 30 +++---
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 35 ++++++++
zhengcaioa/Crawler/sichuan/sichuanoperation.cs | 30 +++---
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs | 1
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs | 1
9 files changed, 108 insertions(+), 78 deletions(-)
diff --git a/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs b/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs
index de5b64d..821f402 100644
--- a/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs
+++ b/zhengcaioa/Crawler/sichuan/CcgpSichuanoperation.cs
@@ -26,7 +26,7 @@
if (updatetime != null)
{
operationStartTime = updatetime.Updatetime1.ToString("yyyy-MM-dd");
- operationEndTime = updatetime.Updatetime1.AddDays(1).ToString("yyyy-MM-dd");
+ operationEndTime = DateTime.Now.ToString("yyyy-MM-dd");
//updatetime.Updatetime1 = DateTime.Now.AddDays(-1);
//_ccontext.SaveChanges();
}
@@ -174,7 +174,7 @@
var list11 = new List<AngleSharp.Dom.IElement>();
while (true)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷");
string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page);
using (HttpClient client = new HttpClient())
@@ -224,7 +224,7 @@
foreach (var sichuanjieshoudtl1 in lists)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
try
{
sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl();
@@ -253,8 +253,10 @@
}
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectcount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "02" && x.OpenTenderTime == DateTime.Parse(NoticeTime)));
+
+
+ if (zhengfuProjectcount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -381,14 +383,12 @@
}
}
- var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "02" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault();
- if (zhengfuProject1 != null)
- continue;
+
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "02";
string gglxName = "閲囪喘鍏憡";
@@ -485,7 +485,7 @@
_ccontext.SaveChanges();
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
}
}
}
@@ -525,7 +525,7 @@
var list11 = new List<AngleSharp.Dom.IElement>();
while (true)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷");
string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page);
using (HttpClient client = new HttpClient())
@@ -572,7 +572,7 @@
}
foreach (var sichuanjieshoudtl1 in lists)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
try
{
sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl();
@@ -601,8 +601,8 @@
}
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "01" && x.OpenTenderTime == DateTime.Parse(NoticeTime)));
+ if (zhengfuProjectCount <=0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -677,14 +677,12 @@
}
}
- var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "01" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault();
- if (zhengfuProject1 != null)
- continue;
+
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "01";
string gglxName = "鎰忓悜鍏紑";
@@ -781,7 +779,7 @@
_ccontext.SaveChanges();
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
}
}
}
@@ -821,7 +819,7 @@
var list11 = new List<AngleSharp.Dom.IElement>();
while (true)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷");
string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page);
using (HttpClient client = new HttpClient())
@@ -869,7 +867,7 @@
foreach (var sichuanjieshoudtl1 in lists)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
try
{
sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl();
@@ -898,8 +896,8 @@
}
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "03" && x.OpenTenderTime == DateTime.Parse(NoticeTime)));
+ if (zhengfuProjectCount <=0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -1027,14 +1025,12 @@
}
}
- var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "03" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault();
- if (zhengfuProject1 != null)
- continue;
+
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "03";
string gglxName = "缁撴灉鍏憡";
@@ -1131,7 +1127,7 @@
_ccontext.SaveChanges();
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
}
}
}
@@ -1170,7 +1166,7 @@
var list11 = new List<AngleSharp.Dom.IElement>();
while (true)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷");
string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page);
using (HttpClient client = new HttpClient())
@@ -1218,7 +1214,7 @@
foreach (var sichuanjieshoudtl1 in lists)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
try
{
sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl();
@@ -1247,8 +1243,8 @@
}
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "04" && x.OpenTenderTime == DateTime.Parse(NoticeTime)));
+ if (zhengfuProjectCount<=0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -1323,14 +1319,11 @@
}
}
- var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "04" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault();
- if (zhengfuProject1 != null)
- continue;
+
-
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "04";
string gglxName = "鏇存鍏憡";
@@ -1427,7 +1420,7 @@
_ccontext.SaveChanges();
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
}
}
}
@@ -1467,7 +1460,7 @@
var list11 = new List<AngleSharp.Dom.IElement>();
while (true)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
logg.WriteLog(page.ToString(), "涓浗鏀块噰缃戝洓宸濈渷");
string sichuanpageurl2 = sichuanpageurll.Replace("page_index=1", "page_index=" + page);
using (HttpClient client = new HttpClient())
@@ -1515,7 +1508,7 @@
foreach (var sichuanjieshoudtl1 in lists)
{
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
try
{
sichuanjieshoudtl aaaaaaaa = new sichuanjieshoudtl();
@@ -1544,8 +1537,8 @@
}
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => (x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl) || (x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "11" && x.OpenTenderTime == DateTime.Parse(NoticeTime)));
+ if (zhengfuProjectCount <=0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -1620,14 +1613,12 @@
}
}
- var zhengfuProject1 = _ccontext.ZhengfuProjects.Where(x => x.RecStatus == "A" && x.Title == aaaaaaaa.title && x.Gglx == "11" && x.OpenTenderCode == OpenTenderCode).FirstOrDefault();
- if (zhengfuProject1 != null)
- continue;
+
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "11";
string gglxName = "搴熸爣鍏憡";
@@ -1724,7 +1715,7 @@
_ccontext.SaveChanges();
- Thread.CurrentThread.Join(1000 * 4);//闃绘璁惧畾鏃堕棿
+ Thread.CurrentThread.Join(1000 * 5);//闃绘璁惧畾鏃堕棿
}
}
}
diff --git a/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs b/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
index 65dcd93..88ea545 100644
--- a/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
+++ b/zhengcaioa/Crawler/sichuan/OldSichuanoperation.cs
@@ -14925,8 +14925,8 @@
aaaaaaaa.shorttitle = aaaaaaaa.title;
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl);
+ if (zhengfuProjectCount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -14939,7 +14939,7 @@
var content = ps[1].OuterHtml + documentdtl.All.Where(m => m.Id == "myPrintArea").FirstOrDefault().OuterHtml.Replace("cellpadding=\"0\"", "cellpadding=\"0\" border=\"1\" bordercolor=\"#D3D3D3\"");
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "01";
string gglxName = "鎰忓悜鍏紑";
@@ -15105,8 +15105,8 @@
aaaaaaaa.shorttitle = aaaaaaaa.title;
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl);
+ if (zhengfuProjectCount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -15191,7 +15191,7 @@
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "02";
string gglxName = "閲囪喘鍏憡";
@@ -15361,8 +15361,8 @@
aaaaaaaa.shorttitle = aaaaaaaa.title;
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl);
+ if (zhengfuProjectCount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -15447,7 +15447,7 @@
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "03";
string gglxName = "缁撴灉鍏憡";
@@ -15875,8 +15875,8 @@
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl);
+ if (zhengfuProjectCount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -15960,7 +15960,7 @@
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "04";
string gglxName = "鏇存鍏憡";
@@ -16131,8 +16131,8 @@
aaaaaaaa.shorttitle = aaaaaaaa.title;
using (HttpClient clientdtl = new HttpClient())
{
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == aaaaaaaa.pageurl).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == aaaaaaaa.pageurl);
+ if (zhengfuProjectCount <= 0)
{
HttpResponseMessage responsedtl = clientdtl.GetAsync(aaaaaaaa.pageurl).Result;
var resdtl = responsedtl.Content.ReadAsStringAsync().Result;
@@ -16219,7 +16219,7 @@
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "11";
string gglxName = "搴熸爣鍏憡";
diff --git a/zhengcaioa/Crawler/sichuan/sichuanoperation.cs b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
index 55148bb..99dbf58 100644
--- a/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
+++ b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
@@ -63,10 +63,10 @@
foreach (var sichuanjieshoudtl in sichuan.data)
{
var pageurl1 = sichuanpageurll + sichuanjieshoudtl.pageurl;
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == pageurl1).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == pageurl1);
+ if (zhengfuProjectCount <=0)
{
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "02";
string gglxName = "閲囪喘鍏憡";
@@ -347,10 +347,10 @@
foreach (var sichuanjieshoudtl in sichuan.data)
{
var pageurl1 = sichuanpageurll + sichuanjieshoudtl.pageurl;
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == pageurl1).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == pageurl1);
+ if (zhengfuProjectCount <= 0)
{
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "03";
string gglxName = "缁撴灉鍏憡";
@@ -765,10 +765,10 @@
foreach (var sichuanjieshoudtl in sichuan.data)
{
var pageurl1 = sichuanpageurll + sichuanjieshoudtl.pageurl;
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == pageurl1).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == pageurl1);
+ if (zhengfuProjectCount <= 0)
{
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "04";
string gglxName = "鏇存鍏憡";
@@ -1050,10 +1050,10 @@
foreach (var sichuanjieshoudtl in sichuan.data)
{
var pageurl1 = sichuanpageurll + sichuanjieshoudtl.pageurl;
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == pageurl1).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == pageurl1);
+ if (zhengfuProjectCount <= 0)
{
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "11";
string gglxName = "搴熸爣鍏憡";
@@ -1390,10 +1390,10 @@
foreach (var sichuanjieshoudtl in sichuan.data)
{
var pageurl1 = sichuanpageurll + sichuanjieshoudtl.pageurl;
- ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.Pageurl == pageurl1).FirstOrDefault();
- if (zhengfuProject == null)
+ var zhengfuProjectCount = _ccontext.ZhengfuProjects.Count(x => x.RecStatus == "A" && x.Pageurl == pageurl1);
+ if (zhengfuProjectCount <= 0)
{
- zhengfuProject = new ZhengfuProject();
+ var zhengfuProject = new ZhengfuProject();
zhengfuProject.Id = Guid.NewGuid().ToString();
zhengfuProject.Gglx = "01";
string gglxName = "鎰忓悜鍏紑";
diff --git a/zhengcaioa/DTO/FiAccountRecordDTO.cs b/zhengcaioa/DTO/FiAccountRecordDTO.cs
index 10e48b1..5714390 100644
--- a/zhengcaioa/DTO/FiAccountRecordDTO.cs
+++ b/zhengcaioa/DTO/FiAccountRecordDTO.cs
@@ -58,5 +58,7 @@
public string RecordTypeId { get; set; }
public string Remark { get; set; }
+
+ public string Creater { get; set; }
}
}
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index 42a09c7..74402ef 100644
--- a/zhengcaioa/Services/FiAccountRecordService.cs
+++ b/zhengcaioa/Services/FiAccountRecordService.cs
@@ -150,6 +150,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Remark) || a.Remark.Contains(searchEntity.Remark.Trim()))
+ && (string.IsNullOrWhiteSpace(searchEntity.Creater) || (a.Creater != "ZCUserCentre" && a.Creater != "shop"))
select new FiAccountRecordDTO
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
index 0080aa9..dd9c6e8 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
@@ -230,6 +230,7 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
//search.RecordTypeId = "2";
+ search.Creater = "1111";
return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
index 71a6b48..bbd74e6 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
@@ -90,6 +90,7 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
search.RecordTypeId = "2";
+ search.Creater = "1111";
return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
index 110dcc4..891ddad 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
@@ -93,6 +93,7 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
search.RecordTypeId = "1";
+ search.Creater = "1111";
return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
}
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index 76e8649..87ba3f7 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -157,8 +157,9 @@
}
var _pageSearch = function () {
+
$("#jqGrid").jqGrid('setGridParam', {
- url: dataUrl = "/Project/GetLiaotianList"+"@(string.IsNullOrEmpty(Creater11) ?"":"?Creater="+ Creater11)", postData: jsons, page: 1
+ url: dataUrl = "/Project/GetLiaotianList" + "@(string.IsNullOrEmpty(Creater11) ?"":"?Creater="+ Creater11)", postData: jsons, page: 1
}); //閲嶆柊杞藉叆
var jsons = GetSearchEnd();
if (jsons == false) {
@@ -168,6 +169,38 @@
LoadGrid(jsons);
}
+
+ function LoadGrid(jdata) {
+
+ var pages = $('.ui-pg-input').val();
+ var paggg = parseInt(pages);
+
+ //alert(paggg);
+
+ if (paggg == NaN || paggg==0 ) {
+ paggg=1
+ }
+
+ var postData = $('#jqGrid').jqGrid("getGridParam", "postData");
+ $.each(lastSearch, function (k, v) {
+ delete postData[k];
+ });
+ lastSearch = jdata;
+ // alert(JSON.stringify(jdata));
+ // $('#jqGrid').jqGrid('clearGridData');
+
+ $.extend(jdata, { totalrows: 0 });
+
+ $("#jqGrid").jqGrid('setGridParam', {
+ postData: jdata, page: paggg
+ }); //閲嶆柊杞藉叆
+ $("#jqGrid").trigger("reloadGrid");
+ // $("#jqGrid").trigger("reloadGrid");
+
+ toSetTooBarVal();
+
+ }
+
var _afterSave = function (result) {
if (result) {
toastr.success("淇濆瓨鎴愬姛");
--
Gitblit v1.9.1