From 0e6d0e8975e92a6395d2d9f692edd5a7d0984c5a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 六月 2022 08:39:59 +0800
Subject: [PATCH] 爬虫
---
zhengcaioa/Model/WebCrawler/WebCrawlerContext.cs | 194 ++
zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml | 16
zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml | 6
zhengcaioa/DTO/ZxdsfxlDTO.cs | 22
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 1
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml | 6
zhengcaioa/Model/zhengcaioaContext.cs | 64
zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml | 2
zhengcaioa/Crawler/Crawler.csproj | 20
zhengcaioa/Crawler/sichuan/sichuanjieshou.cs | 71 +
zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs | 2
zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml | 4
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 781 ++++++++---
zhengcaioa/Crawler/logg.cs | 47
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml | 4
zhengcaioa/Services/FiOrderrecievemoneyService.cs | 2
zhengcaioa/Services/CooperatecustomCustomerService.cs | 2
zhengcaioa/Model/WebCrawler/ZhengfuProject.cs | 35
zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml | 12
zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs | 2
zhengcaioa/CommonToolsCore/AesClass.cs | 159 ++
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs | 10
zhengcaioa/Model/PltUser.cs | 1
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 30
zhengcaioa/DTO/WebCrawler/ZhengfuProjectDTO.cs | 33
zhengcaioa/DTO/CooperOrderDTO.cs | 7
zhengcaioa/DTO/WebCrawler/TProjectDictionaryDTO.cs | 17
zhengcaioa/Services/UserService.cs | 3
zhengcaioa/Model/WebCrawler/TProjectDictionary.cs | 18
zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml | 2
zhengcaioa/Crawler/Program.cs | 172 ++
zhengcaioa/Crawler/sichuan/sichuanoperation.cs | 1455 ++++++++++++++++++++++
zhengcaioa/Model/Zxdsfxl.cs | 22
.gitignore | 2
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 4
zhengcaioa/zhengcaioa/Views/User/Index.cshtml | 7
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | 2
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 89 +
zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 10
zhengcaioa/Crawler/Crawler.csproj.user | 6
zhengcaioa/DTO/WebCrawler/UpdatetimeDTO.cs | 13
zhengcaioa/zhengcaioa.sln | 13
zhengcaioa/Model/CooperatecustomCustomer.cs | 2
zhengcaioa/Services/ProjectService.cs | 115 +
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 67
zhengcaioa/Model/WebCrawler/Updatetime.cs | 14
zhengcaioa/DTO/PltUserDTO.cs | 2
zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml | 130 +
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml | 114 +
zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml.user | 9
zhengcaioa/IServices/IProjectService.cs | 6
zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml | 129 +
52 files changed, 3,524 insertions(+), 432 deletions(-)
diff --git a/.gitignore b/.gitignore
index 300c696..fd4bb87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
zhengcaioa/zhengcaioa/wwwroot/UploadingFiles/
zhengcaioa/zhengcaioa/wwwroot/UploadFile/
/zhengcaioa/.vs
+zhengcaioa/Crawler/bin/
+zhengcaioa/Crawler/obj/
diff --git a/zhengcaioa/CommonToolsCore/AesClass.cs b/zhengcaioa/CommonToolsCore/AesClass.cs
new file mode 100644
index 0000000..034d258
--- /dev/null
+++ b/zhengcaioa/CommonToolsCore/AesClass.cs
@@ -0,0 +1,159 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CommonToolsCore
+{
+ public class AesClass
+ {
+ const string Key = "dau&*5asda.;lk8L";
+ /// <summary>
+ /// AES 鍔犲瘑
+ /// </summary>
+ /// <param name="str">鏄庢枃锛堝緟鍔犲瘑锛�</param>
+ /// <param name="key">key</param>
+ /// <returns>瀵嗘枃</returns>
+ public string AesEncrypt(string str, string key = Key)
+ {
+ if (string.IsNullOrEmpty(str)) return null;
+ Byte[] toEncryptArray = Encoding.UTF8.GetBytes(str);
+
+ RijndaelManaged rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.ECB,
+ Padding = PaddingMode.PKCS7
+ };
+
+ ICryptoTransform cTransform = rm.CreateEncryptor();
+ Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+
+ return Convert.ToBase64String(resultArray, 0, resultArray.Length);
+ }
+ /// <summary>
+ /// AES 瑙ｅ瘑
+ /// </summary>
+ /// <param name="str">鏄庢枃锛堝緟瑙ｅ瘑锛�</param>
+ /// <param name="key">瀵嗘枃</param>
+ /// <returns></returns>
+ public string AesDecrypt(string str, string key = Key)
+ {
+ if (string.IsNullOrEmpty(str)) return null;
+ Byte[] toEncryptArray = Convert.FromBase64String(str);
+
+ RijndaelManaged rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.ECB,
+ Padding = PaddingMode.PKCS7
+ };
+
+ ICryptoTransform cTransform = rm.CreateDecryptor();
+ Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+
+ return Encoding.UTF8.GetString(resultArray);
+ }
+ /// <summary>
+ /// 鑾峰彇瑙勫垯鍔犲瘑瀛楃涓� 鐢ㄤ簬toke闄勫甫鍙傛暟
+ /// </summary>
+ /// <param name="rules"> 瑙勫垯闆嗗悎 </param>
+ /// <returns> 杩斿洖瑙勫垯鍔犲瘑瀛楃涓� </returns>
+ public string EncryptRules(RuleCollection rules)
+ {
+ string rs = JsonConvert.SerializeObject(rules);
+ return AesEncrypt(rs);
+
+
+ }
+
+ /// <summary>
+ /// 瑙ｅ瘑瀛楄鍒欐敮浠樼┛
+ /// </summary>
+ /// <param name="rules">鍔犲瘑鐨勫瓧绗︿覆</param>
+ /// <returns>瑙勫垯瀛楃涓茬被</returns>
+ public RuleCollection DecryptRules(string rules)
+ {
+
+ string str = AesDecrypt(rules);
+
+ return JsonConvert.DeserializeObject<RuleCollection>(str);
+ // return AesEncrypt(rs);
+
+
+ }
+ }
+
+
+
+
+ /// <summary>
+ /// 涓氬姟鏉冮檺闆嗗悎鍜屽叾浠栭泦鍚�
+ /// </summary>
+ public class RuleCollection
+ {
+ /// <summary>
+ /// 鐢ㄦ埛鍚嶏紝杩欎釜鍚嶅瓧鍙兘浼氳鏇存敼
+ /// </summary>
+ public string User { get; set; }
+ /// <summary>
+ /// 灏忛噰闂瓟鏉冮檺
+ /// </summary>
+ public bool XC { get; set; }
+ /// <summary>
+ /// 鍜ㄨ鏉冮檺
+ /// </summary>
+ public bool ZX { get; set; }
+
+ /// <summary>
+ /// 璧犻�佷功绫嶆潈闄�
+ /// </summary>
+ public bool SJ { get; set; }
+
+
+ /// <summary>
+ /// 鏀块噰璇惧爞
+ /// </summary>
+ public bool KT { get; set; }
+
+
+ /// <summary>
+ /// 鎶曡瘔妗堜緥澶勭悊 0鏃舵棤鏉冮檺
+ /// </summary>
+ public int TS { get; set; }
+
+ /// <summary>
+ /// 鏍囦功鍒朵綔0鏃舵棤鏉冮檺
+ /// </summary>
+ public int BS { get; set; }
+
+ /// <summary>
+ /// 绾犵悍 0鏃舵棤鏉冮檺
+ /// </summary>
+ public int JS { get; set; }
+
+ /// <summary>
+ /// 鎶樻墸 鎴栬��10鏃犳姌鎵� 鍙兘鏃�0-9涔嬮棿鐨勬暟瀛�
+ /// </summary>
+ public int DSoff { get; set; }
+
+
+ /// <summary>
+ /// 閲囪喘鍏憡
+ /// </summary>
+ public int CGGG { get; set; }
+
+ /// <summary>
+ /// 绔炰簤瀵规墜鍒嗘瀽
+ /// </summary>
+ public int ZXDSFX { get; set; }
+
+ /// <summary>
+ /// 涓存椂绔炰簤瀵规墜鍒嗘瀽
+ /// </summary>
+ public int ZXDSFXLS { get; set; }
+ }
+}
diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index 66cc5d7..f81db77 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -1,6 +1,7 @@
锘縰sing AutoMapper;
using DTO;
using DTO.Models;
+using DTO.WebCrawler;
using System;
using System.Collections.Generic;
using System.Text;
@@ -315,6 +316,15 @@
CreateMap<FiCustomerrecievemoney, FiCustomerrecievemoneyDTO>();
CreateMap<FiCustomerrecievemoneyDTO, FiCustomerrecievemoney>();
+ CreateMap<TProjectDictionary, TProjectDictionaryDTO>();
+ CreateMap<TProjectDictionaryDTO, TProjectDictionary>();
+
+ CreateMap<ZhengfuProject, ZhengfuProjectDTO>();
+ CreateMap<ZhengfuProjectDTO, ZhengfuProject>();
+
+ CreateMap<Zxdsfxl, ZxdsfxlDTO>();
+ CreateMap<ZxdsfxlDTO, Zxdsfxl>();
+
}
}
}
diff --git a/zhengcaioa/Crawler/Crawler.csproj b/zhengcaioa/Crawler/Crawler.csproj
new file mode 100644
index 0000000..d2dd00c
--- /dev/null
+++ b/zhengcaioa/Crawler/Crawler.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>netcoreapp3.1</TargetFramework>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Selenium.RC" Version="3.1.0" />
+ <PackageReference Include="Selenium.Support" Version="4.1.1" />
+ <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\CommonToolsCore\CommonToolsCore.csproj" />
+ <ProjectReference Include="..\DTO\DTO.csproj" />
+ <ProjectReference Include="..\Model\Model.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/zhengcaioa/Crawler/Crawler.csproj.user b/zhengcaioa/Crawler/Crawler.csproj.user
new file mode 100644
index 0000000..661cdde
--- /dev/null
+++ b/zhengcaioa/Crawler/Crawler.csproj.user
@@ -0,0 +1,6 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_LastSelectedProfileId>F:\zhengcaioa\zhengcaioa\Crawler\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/zhengcaioa/Crawler/Program.cs b/zhengcaioa/Crawler/Program.cs
new file mode 100644
index 0000000..aa22779
--- /dev/null
+++ b/zhengcaioa/Crawler/Program.cs
@@ -0,0 +1,172 @@
+锘縰sing Crawler.sichuan;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Chrome;
+using System;
+using System.Net.Http;
+using System.Threading;
+using zhengcaioa.Models;
+
+namespace Crawler
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+
+
+
+
+
+
+ ////FiBook fiBook = new FiBook();
+ ////fiBook.Id = Guid.NewGuid().ToString();
+ ////fiBook.RecStatus = "A";
+ ////fiBook.Creater = "sdfdsfdsf";
+ ////fiBook.Createtime = DateTime.Now;
+ ////fiBook.Modifier = "sdfdsfdsf";
+ ////fiBook.Modifytime = DateTime.Now;
+ ////cccontext.FiBooks.Add(fiBook);
+ ////cccontext.SaveChanges();
+
+ //ZhengfuProject zhengfuProject = new ZhengfuProject();
+
+ //logg.WriteLog("娴嬭瘯鍐欐棩蹇�");
+
+ //ChromeOptions options = new ChromeOptions();
+ //options.BinaryLocation = "C:\\Users\\Administrator\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe";
+ ////options.AddArgument("--headless");
+ ////options.AddArgument("blink-settings=imagesEnabled=false");
+ ////_logger.LogInformation(address + " 寮�濮嬭В鏋�");
+ ////string chromeDriverDirectory = Microsoft.DotNet.PlatformAbstractions.ApplicationEnvironment.ApplicationBasePath;
+ ////_logger.LogInformation(chromeDriverDirectory + " 褰撳墠椤圭洰璺緞");
+ //try
+ //{
+ // var driver = new ChromeDriver("C:\\Users\\Administrator\\AppData\\Local\\Google\\Chrome\\Application\\", options);
+ // driver.Navigate().GoToUrl("http://www.mof.gov.cn/gkml/xinxi/zhongyangbiaoxun/zhongyangzhaobiaogonggao/index_21.htm");
+ // //_logger.LogInformation(address + " 鎺ョ潃寮�濮�");
+ // while (true)
+ // {
+ // var content = driver.FindElement(By.ClassName("xwbd_lianbolistfrcon")).FindElements(By.TagName("li"));//FindElements(By.XPath("/html/body/section/div/div/div[2]/div/ul/li"));
+
+
+ // foreach (var item in content)
+ // {
+ // var link = item.FindElement(By.XPath("child::a")).GetAttribute("href");
+ // var title = item.Text;
+ // //if (!dic.ContainsKey(link))
+ // // dic.Add(link, title);
+ // }
+ // //_logger.LogInformation(" 寮�濮嬬炕椤�");
+ // //var nextPage = driver.FindElements(By.XPath("//*[@id='pagination']/ul/li"));
+ // var nextPage = driver.FindElement(By.ClassName("pagerji")).FindElements(By.TagName("span"));
+ // var boolll = false;
+ // foreach (var nextPagea in nextPage)
+ // {
+ // var linkk = nextPagea.FindElement(By.XPath("child::a")).GetAttribute("href");
+ // if (">".Equals(nextPagea.Text))
+ // {
+ // if (linkk.IndexOf("#") < 0)
+ // {
+ // nextPagea.Click();
+
+
+ // System.Threading.Thread.Sleep(1000); // 寤舵椂锛岄伩鍏嶆壘涓嶅埌鍏冪礌
+ // }
+ // else
+ // {
+ // boolll = true;
+ // }
+ // break;
+ // }
+
+ // //var sss1 = nextPagea.ToString();
+ // //var sss2 = nextPagea.Text;
+ // //var sss = nextPagea.GetAttribute("class");
+ // //if (">".Equals(nextPagea.Text))
+ // //{
+ // // if (!"disabled".Equals(nextPagea.GetAttribute("class")))
+ // // {
+ // // nextPagea.Click();
+
+
+ // // System.Threading.Thread.Sleep(1000); // 寤舵椂锛岄伩鍏嶆壘涓嶅埌鍏冪礌
+ // // }
+ // // else
+ // // {
+ // // boolll = true;
+ // // }
+ // // break;
+ // //}
+ // }
+ // if (boolll)
+ // {
+ // break;
+ // }
+
+ // }
+
+ // driver.Quit();
+ //}
+ //catch (Exception ex)
+ //{
+ // //_logger.LogInformation(ex.Message);
+
+ // //_logger.LogInformation(ex.StackTrace);
+
+ // //_logger.LogInformation(ex.ToString());
+ //}
+ //finally
+ //{
+
+ //}
+
+
+
+
+ Program obj = new Program();
+ //鏂规硶涓�锛氳皟鐢ㄧ嚎绋嬫墽琛屾柟娉曪紝鍦ㄦ柟娉曚腑瀹炵幇姝诲惊鐜紝姣忎釜寰幆Sleep璁惧畾鏃堕棿
+ Thread thread = new Thread(new ThreadStart(obj.Method1));
+ thread.Start();
+
+
+ Thread thread1 = new Thread(new ThreadStart(obj.Method2));
+ thread1.Start();
+
+ Console.WriteLine("Hello World!");
+ }
+
+ void Method1()
+ {
+ while (true)
+ {
+ string connection = @"server=.;database=WebCrawler;uid=sa;pwd=123456;";
+ var dbContextOptionBuilder = new DbContextOptionsBuilder<WebCrawlerContext>();
+ var cccontext = new WebCrawlerContext(dbContextOptionBuilder.UseSqlServer(connection).Options);
+ //鑾峰彇鍥涘窛鐨勬斂閲囨暟鎹�
+ sichuanoperation.operations(cccontext);
+ Thread.CurrentThread.Join(1000*60*60*2);//闃绘璁惧畾鏃堕棿
+ }
+ }
+
+ void Method2()
+ {
+ while (true)
+ {
+ Console.WriteLine(DateTime.Now.ToString() + "Method2_" + Thread.CurrentThread.ManagedThreadId.ToString());
+ Thread.CurrentThread.Join(1000);//闃绘璁惧畾鏃堕棿
+ }
+ }
+
+
+
+
+
+
+
+
+
+ }
+}
diff --git a/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml b/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..ed3755a
--- /dev/null
+++ b/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,12 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration>Release</Configuration>
+ <Platform>Any CPU</Platform>
+ <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
+ <PublishProtocol>FileSystem</PublishProtocol>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml.user b/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..c2390f1
--- /dev/null
+++ b/zhengcaioa/Crawler/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,9 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <History>True|2022-05-12T04:59:35.8636698Z;True|2022-05-12T12:54:41.5970038+08:00;</History>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/zhengcaioa/Crawler/logg.cs b/zhengcaioa/Crawler/logg.cs
new file mode 100644
index 0000000..14d7f98
--- /dev/null
+++ b/zhengcaioa/Crawler/logg.cs
@@ -0,0 +1,47 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Crawler
+{
+ public class logg
+ {
+ //鏃ュ織鍐欐硶
+ public static void WriteLog(string msg)
+ {
+ string filePath = AppDomain.CurrentDomain.BaseDirectory + "Log"; //璺緞
+ if (!Directory.Exists(filePath)) //涓嶅瓨鍦ㄥ垯鍒涘缓
+ {
+ Directory.CreateDirectory(filePath);
+ }
+ string logPath = AppDomain.CurrentDomain.BaseDirectory + "Log\\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt"; //鏂囨。璺緞
+ try
+ {
+ using (StreamWriter sw = File.AppendText(logPath))
+ {
+ sw.WriteLine("娑堟伅锛�" + msg);
+ sw.WriteLine("鏃堕棿锛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+ sw.WriteLine("**************************************************");
+ sw.WriteLine();
+ sw.Flush();
+ sw.Close();
+ sw.Dispose();
+ }
+ }
+ catch (IOException e)
+ {
+ using (StreamWriter sw = File.AppendText(logPath))
+ {
+ sw.WriteLine("寮傚父锛�" + e.Message);
+ sw.WriteLine("鏃堕棿锛�" + DateTime.Now.ToString("yyy-MM-dd HH:mm:ss"));
+ sw.WriteLine("**************************************************");
+ sw.WriteLine();
+ sw.Flush();
+ sw.Close();
+ sw.Dispose();
+ }
+ }
+ }
+ }
+}
diff --git a/zhengcaioa/Crawler/sichuan/sichuanjieshou.cs b/zhengcaioa/Crawler/sichuan/sichuanjieshou.cs
new file mode 100644
index 0000000..9486367
--- /dev/null
+++ b/zhengcaioa/Crawler/sichuan/sichuanjieshou.cs
@@ -0,0 +1,71 @@
+锘縰sing DTO.WebCrawler;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Crawler
+{
+ public class sichuanjieshou
+ {
+ public string msg { get; set; }
+ public int total { get; set; }
+ public string code { get; set; }
+
+ public List<sichuanjieshoudtl> data;
+ }
+
+ public class sichuanjieshoudtl
+ {
+ public DateTime noticeTime { get; set; }
+
+ public string regionCode { get; set; }
+
+ public string regionName { get; set; }
+
+ public string purchaseManner { get; set; }
+ public string openTenderCode { get; set; }
+ public string title { get; set; }
+ public string shorttitle { get; set; }
+ public string pageurl { get; set; }
+
+ public string content { get; set; }
+ public string purchaser { get; set; }
+ public string budget { get; set; }
+ public string agency { get; set; }
+ public string agencyCode { get; set; }
+ public DateTime? openTenderTime { get; set; }
+ }
+
+ public class eswebcrawler
+ {
+ public string Id { get; set; }
+
+ public string noticeTime { get; set; }
+ public string sheng { get; set; }
+ public string shengName { get; set; }
+ public string city { get; set; }
+ public string cityName { get; set; }
+
+ public string regionCode { get; set; }
+
+ public string regionName { get; set; }
+
+ public string cgfs { get; set; }
+ public string cgfsName { get; set; }
+ public string gglx { get; set; }
+ public string gglxName { get; set; }
+ public string openTenderCode { get; set; }
+
+ public string title { get; set; }
+ public string shorttitle { get; set; }
+ public string pageurl { get; set; }
+ public string pingmu { get; set; }
+ public string pingmuName { get; set; }
+ public string purchaser { get; set; }
+ public string budget { get; set; }
+ public string agency { get; set; }
+ public string agencyCode { get; set; }
+ public string modifyTime { get; set; }
+ public string openTenderTime { get; set; }
+ }
+}
diff --git a/zhengcaioa/Crawler/sichuan/sichuanoperation.cs b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
new file mode 100644
index 0000000..b8008f6
--- /dev/null
+++ b/zhengcaioa/Crawler/sichuan/sichuanoperation.cs
@@ -0,0 +1,1455 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using zhengcaioa.Models;
+
+namespace Crawler.sichuan
+{
+ public class sichuanoperation
+ {
+ public static void operations(WebCrawlerContext _ccontext)
+ {
+ try
+ {
+ string api_domain = "http://192.168.0.116:9200";
+ string pageurll = "https://zfcg.scsczt.cn";
+ //鑾峰彇鏇存柊鏃堕棿
+ string operationStartTime = "";
+ Updatetime updatetime = _ccontext.Updatetimes.Where(x=>x.Sheng=="鍥涘窛鐪�").FirstOrDefault();
+ if (updatetime != null)
+ {
+ operationStartTime = updatetime.Updatetime1.ToString("yyyy-MM-dd")+ "%2000:00:00";
+ //updatetime.Updatetime1 = DateTime.Now.AddDays(-1);
+ //_ccontext.SaveChanges();
+ }
+ //else
+ //{
+ // updatetime = new Updatetime();
+ // updatetime.Id = Guid.NewGuid().ToString();
+ // updatetime.Sheng = "鍥涘窛鐪�";
+ // updatetime.Updatetime1 = DateTime.Now.AddDays(-1);
+ // _ccontext.Updatetimes.Add(updatetime);
+ // _ccontext.SaveChanges();
+ //}
+
+ //缈婚〉淇℃伅
+ int currPage = 1;
+ int pageSize = 10;
+ //寮�濮嬭闂� 閲囪喘鍏憡
+ logg.WriteLog("鍥涘窛鐪侀噰璐叕鍛� 寮�濮嬭幏鍙�");
+ while (true)
+ {
+ string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "¬iceType=00101®ionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
+ using (HttpClient client = new HttpClient())
+ {
+ client.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage response = client.GetAsync(address).Result;
+ var res = response.Content.ReadAsStringAsync().Result;
+
+ sichuanjieshou sichuan = JsonConvert.DeserializeObject<sichuanjieshou>(res);
+
+ //淇濆瓨椤圭洰鍒皊qlserveer鍜宔lasticsearch
+ if (sichuan.data != null && sichuan.data.Count > 0)
+ {
+ foreach (var sichuanjieshoudtl in sichuan.data)
+ {
+ ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.OpenTenderCode == sichuanjieshoudtl.openTenderCode && x.Gglx == "02" && x.NoticeTime == sichuanjieshoudtl.noticeTime).FirstOrDefault();
+ if (zhengfuProject == null)
+ {
+ zhengfuProject = new ZhengfuProject();
+ zhengfuProject.Id = Guid.NewGuid().ToString();
+ zhengfuProject.Gglx = "02";
+ string gglxName = "閲囪喘鍏憡";
+ zhengfuProject.NoticeTime = sichuanjieshoudtl.noticeTime;
+ zhengfuProject.OpenTenderTime = sichuanjieshoudtl.openTenderTime;
+ zhengfuProject.RegionCode = sichuanjieshoudtl.regionCode;
+ string regionName = sichuanjieshoudtl.regionName;
+ zhengfuProject.Sheng = "510000";
+ string ShengName = "鍥涘窛鐪�";
+ string CityName = "";
+ if ("510001" == sichuanjieshoudtl.regionCode)
+ {
+ zhengfuProject.RegionCode = "";
+ regionName = "";
+ zhengfuProject.City = "510001";
+ CityName = "鐪佹湰绾�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5101"))
+ {
+ zhengfuProject.City = "510100";
+ CityName = "鎴愰兘甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5103"))
+ {
+ zhengfuProject.City = "510300";
+ CityName = "鑷础甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5104"))
+ {
+ zhengfuProject.City = "510400";
+ CityName = "鏀�鏋濊姳甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5105"))
+ {
+ zhengfuProject.City = "510500";
+ CityName = "娉稿窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5106"))
+ {
+ zhengfuProject.City = "510600";
+ CityName = "寰烽槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5107"))
+ {
+ zhengfuProject.City = "510700";
+ CityName = "缁甸槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5108"))
+ {
+ zhengfuProject.City = "510800";
+ CityName = "骞垮厓甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5109"))
+ {
+ zhengfuProject.City = "510900";
+ CityName = "閬傚畞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5110"))
+ {
+ zhengfuProject.City = "511000";
+ CityName = "鍐呮睙甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5111"))
+ {
+ zhengfuProject.City = "511100";
+ CityName = "涔愬北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5113"))
+ {
+ zhengfuProject.City = "511300";
+ CityName = "鍗楀厖甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5114"))
+ {
+ zhengfuProject.City = "5114";
+ CityName = "鐪夊北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5115"))
+ {
+ zhengfuProject.City = "511500";
+ CityName = "瀹滃甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5116"))
+ {
+ zhengfuProject.City = "511600";
+ CityName = "骞垮畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5117"))
+ {
+ zhengfuProject.City = "511700";
+ CityName = "杈惧窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5118"))
+ {
+ zhengfuProject.City = "511800";
+ CityName = "闆呭畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5119"))
+ {
+ zhengfuProject.City = "511900";
+ CityName = "宸翠腑甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5120"))
+ {
+ zhengfuProject.City = "512000";
+ CityName = "璧勯槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5132"))
+ {
+ zhengfuProject.City = "513200";
+ CityName = "闃垮潩宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5133"))
+ {
+ zhengfuProject.City = "513300";
+ CityName = "鐢樺瓬宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5134"))
+ {
+ zhengfuProject.City = "513400";
+ CityName = "鍑夊北宸�";
+ }
+
+
+ string cgfsName = "";
+ switch (sichuanjieshoudtl.purchaseManner)
+ {
+ case "1":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏紑鎷涙爣";
+ break;
+ case "2":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "閭�璇锋嫑鏍�";
+ break;
+ case "3":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬ц皥鍒�";
+ break;
+ case "4":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "璇环";
+ break;
+ case "5":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍗曚竴鏉ユ簮";
+ break;
+ case "6":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬х鍟�";
+ break;
+ case "9":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏朵粬";
+ break;
+ }
+ zhengfuProject.OpenTenderCode = sichuanjieshoudtl.openTenderCode;
+ zhengfuProject.Title = sichuanjieshoudtl.title;
+ zhengfuProject.Shorttitle = sichuanjieshoudtl.shorttitle;
+ zhengfuProject.Pageurl = pageurll + sichuanjieshoudtl.pageurl;
+ zhengfuProject.Purchaser = sichuanjieshoudtl.purchaser;
+
+ if (!string.IsNullOrWhiteSpace(sichuanjieshoudtl.budget))
+ {
+ zhengfuProject.Budget = decimal.Parse(sichuanjieshoudtl.budget);
+ }
+ zhengfuProject.Agency = sichuanjieshoudtl.agency;
+ zhengfuProject.AgencyCode = sichuanjieshoudtl.agencyCode;
+ zhengfuProject.Content = sichuanjieshoudtl.content.Replace("\r", string.Empty).Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(@"\", string.Empty);
+ zhengfuProject.RecStatus = "A";
+ zhengfuProject.Creater = "1";
+ zhengfuProject.Createtime = DateTime.Now;
+ zhengfuProject.Modifier = "1";
+ zhengfuProject.Modifytime = zhengfuProject.Createtime;
+ _ccontext.ZhengfuProjects.Add(zhengfuProject);
+
+
+ string url = $"{api_domain}/webcrawler/_doc/" + zhengfuProject.Id;
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+ eswebcrawler eswebcrawler1 = new eswebcrawler();
+ eswebcrawler1.Id = zhengfuProject.Id;
+ eswebcrawler1.noticeTime = zhengfuProject.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss");
+ eswebcrawler1.openTenderTime = zhengfuProject.OpenTenderTime.HasValue ? zhengfuProject.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
+ eswebcrawler1.sheng = zhengfuProject.Sheng;
+ eswebcrawler1.shengName = ShengName;
+ eswebcrawler1.city = zhengfuProject.City;
+ eswebcrawler1.cityName = CityName;
+ eswebcrawler1.regionCode = zhengfuProject.RegionCode;
+ eswebcrawler1.regionName = regionName;
+ eswebcrawler1.cgfs = zhengfuProject.Cgfs;
+ eswebcrawler1.cgfsName = cgfsName;
+ eswebcrawler1.gglx = zhengfuProject.Gglx;
+ eswebcrawler1.gglxName = gglxName;
+ eswebcrawler1.openTenderCode = zhengfuProject.OpenTenderCode;
+ eswebcrawler1.title = zhengfuProject.Title;
+ eswebcrawler1.shorttitle = zhengfuProject.Shorttitle;
+ eswebcrawler1.pageurl = zhengfuProject.Pageurl;
+ eswebcrawler1.pingmu = zhengfuProject.Pingmu;
+ eswebcrawler1.pingmuName = "";
+ eswebcrawler1.purchaser = zhengfuProject.Purchaser;
+ eswebcrawler1.budget = zhengfuProject.Budget.HasValue ? zhengfuProject.Budget.Value.ToString() : "";
+ eswebcrawler1.agency = zhengfuProject.Agency;
+ eswebcrawler1.agencyCode = zhengfuProject.AgencyCode;
+ eswebcrawler1.modifyTime = zhengfuProject.Modifytime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ string requestJson = JsonConvert.SerializeObject(eswebcrawler1);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage responseMessage = httpClient.PutAsync(postUrl, httpContent).Result;
+ result = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+
+ }
+ else
+ {
+ throw new Exception("淇濆瓨鏁版嵁搴撳嚭閿欙紒");
+ }
+
+
+ _ccontext.SaveChanges();
+ }
+ }
+ }
+
+
+ if (currPage * pageSize >= sichuan.total)
+ {
+ break;
+ }
+ else
+ {
+ currPage += 1;
+ }
+ }
+
+
+ }
+ logg.WriteLog("鍥涘窛鐪侀噰璐叕鍛� 鑾峰彇瀹屾垚");
+
+ //缈婚〉淇℃伅
+ currPage = 1;
+ pageSize = 10;
+ //寮�濮嬭闂� 閲囪喘鍏憡
+ logg.WriteLog("鍥涘窛鐪佷腑鏍囧叕鍛� 寮�濮嬭幏鍙�");
+ while (true)
+ {
+ string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "¬iceType=00102®ionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
+ using (HttpClient client = new HttpClient())
+ {
+ client.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage response = client.GetAsync(address).Result;
+ var res = response.Content.ReadAsStringAsync().Result;
+
+ sichuanjieshou sichuan = JsonConvert.DeserializeObject<sichuanjieshou>(res);
+
+ //淇濆瓨椤圭洰鍒皊qlserveer鍜宔lasticsearch
+ if (sichuan.data != null && sichuan.data.Count > 0)
+ {
+ foreach (var sichuanjieshoudtl in sichuan.data)
+ {
+ ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.OpenTenderCode == sichuanjieshoudtl.openTenderCode && x.Gglx == "03" && x.NoticeTime == sichuanjieshoudtl.noticeTime).FirstOrDefault();
+ if (zhengfuProject == null)
+ {
+ zhengfuProject = new ZhengfuProject();
+ zhengfuProject.Id = Guid.NewGuid().ToString();
+ zhengfuProject.Gglx = "03";
+ string gglxName = "缁撴灉鍏憡";
+ zhengfuProject.NoticeTime = sichuanjieshoudtl.noticeTime;
+ zhengfuProject.OpenTenderTime = sichuanjieshoudtl.openTenderTime;
+ zhengfuProject.RegionCode = sichuanjieshoudtl.regionCode;
+ string regionName = sichuanjieshoudtl.regionName;
+ zhengfuProject.Sheng = "510000";
+ string ShengName = "鍥涘窛鐪�";
+ string CityName = "";
+ if ("510001" == sichuanjieshoudtl.regionCode)
+ {
+ zhengfuProject.RegionCode = "";
+ regionName = "";
+ zhengfuProject.City = "510001";
+ CityName = "鐪佹湰绾�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5101"))
+ {
+ zhengfuProject.City = "510100";
+ CityName = "鎴愰兘甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5103"))
+ {
+ zhengfuProject.City = "510300";
+ CityName = "鑷础甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5104"))
+ {
+ zhengfuProject.City = "510400";
+ CityName = "鏀�鏋濊姳甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5105"))
+ {
+ zhengfuProject.City = "510500";
+ CityName = "娉稿窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5106"))
+ {
+ zhengfuProject.City = "510600";
+ CityName = "寰烽槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5107"))
+ {
+ zhengfuProject.City = "510700";
+ CityName = "缁甸槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5108"))
+ {
+ zhengfuProject.City = "510800";
+ CityName = "骞垮厓甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5109"))
+ {
+ zhengfuProject.City = "510900";
+ CityName = "閬傚畞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5110"))
+ {
+ zhengfuProject.City = "511000";
+ CityName = "鍐呮睙甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5111"))
+ {
+ zhengfuProject.City = "511100";
+ CityName = "涔愬北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5113"))
+ {
+ zhengfuProject.City = "511300";
+ CityName = "鍗楀厖甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5114"))
+ {
+ zhengfuProject.City = "5114";
+ CityName = "鐪夊北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5115"))
+ {
+ zhengfuProject.City = "511500";
+ CityName = "瀹滃甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5116"))
+ {
+ zhengfuProject.City = "511600";
+ CityName = "骞垮畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5117"))
+ {
+ zhengfuProject.City = "511700";
+ CityName = "杈惧窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5118"))
+ {
+ zhengfuProject.City = "511800";
+ CityName = "闆呭畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5119"))
+ {
+ zhengfuProject.City = "511900";
+ CityName = "宸翠腑甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5120"))
+ {
+ zhengfuProject.City = "512000";
+ CityName = "璧勯槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5132"))
+ {
+ zhengfuProject.City = "513200";
+ CityName = "闃垮潩宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5133"))
+ {
+ zhengfuProject.City = "513300";
+ CityName = "鐢樺瓬宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5134"))
+ {
+ zhengfuProject.City = "513400";
+ CityName = "鍑夊北宸�";
+ }
+
+
+ string cgfsName = "";
+ switch (sichuanjieshoudtl.purchaseManner)
+ {
+ case "1":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏紑鎷涙爣";
+ break;
+ case "2":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "閭�璇锋嫑鏍�";
+ break;
+ case "3":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬ц皥鍒�";
+ break;
+ case "4":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "璇环";
+ break;
+ case "5":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍗曚竴鏉ユ簮";
+ break;
+ case "6":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬х鍟�";
+ break;
+ case "9":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏朵粬";
+ break;
+ }
+ zhengfuProject.OpenTenderCode = sichuanjieshoudtl.openTenderCode;
+ zhengfuProject.Title = sichuanjieshoudtl.title;
+ zhengfuProject.Shorttitle = sichuanjieshoudtl.shorttitle;
+ zhengfuProject.Pageurl = pageurll + sichuanjieshoudtl.pageurl;
+ zhengfuProject.Purchaser = sichuanjieshoudtl.purchaser;
+
+ if (!string.IsNullOrWhiteSpace(sichuanjieshoudtl.budget))
+ {
+ zhengfuProject.Budget = decimal.Parse(sichuanjieshoudtl.budget);
+ }
+ zhengfuProject.Agency = sichuanjieshoudtl.agency;
+ zhengfuProject.AgencyCode = sichuanjieshoudtl.agencyCode;
+ zhengfuProject.Content = sichuanjieshoudtl.content.Replace("\r", string.Empty).Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(@"\", string.Empty);
+ zhengfuProject.RecStatus = "A";
+ zhengfuProject.Creater = "1";
+ zhengfuProject.Createtime = DateTime.Now;
+ zhengfuProject.Modifier = "1";
+ zhengfuProject.Modifytime = zhengfuProject.Createtime;
+ _ccontext.ZhengfuProjects.Add(zhengfuProject);
+
+
+ string url = $"{api_domain}/webcrawler/_doc/" + zhengfuProject.Id;
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+ eswebcrawler eswebcrawler1 = new eswebcrawler();
+ eswebcrawler1.Id = zhengfuProject.Id;
+ eswebcrawler1.noticeTime = zhengfuProject.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss");
+ eswebcrawler1.openTenderTime = zhengfuProject.OpenTenderTime.HasValue? zhengfuProject.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):null;
+ eswebcrawler1.sheng = zhengfuProject.Sheng;
+ eswebcrawler1.shengName = ShengName;
+ eswebcrawler1.city = zhengfuProject.City;
+ eswebcrawler1.cityName = CityName;
+ eswebcrawler1.regionCode = zhengfuProject.RegionCode;
+ eswebcrawler1.regionName = regionName;
+ eswebcrawler1.cgfs = zhengfuProject.Cgfs;
+ eswebcrawler1.cgfsName = cgfsName;
+ eswebcrawler1.gglx = zhengfuProject.Gglx;
+ eswebcrawler1.gglxName = gglxName;
+ eswebcrawler1.openTenderCode = zhengfuProject.OpenTenderCode;
+ eswebcrawler1.title = zhengfuProject.Title;
+ eswebcrawler1.shorttitle = zhengfuProject.Shorttitle;
+ eswebcrawler1.pageurl = zhengfuProject.Pageurl;
+ eswebcrawler1.pingmu = zhengfuProject.Pingmu;
+ eswebcrawler1.pingmuName = "";
+ eswebcrawler1.purchaser = zhengfuProject.Purchaser;
+ eswebcrawler1.budget = zhengfuProject.Budget.HasValue ? zhengfuProject.Budget.Value.ToString() : "";
+ eswebcrawler1.agency = zhengfuProject.Agency;
+ eswebcrawler1.agencyCode = zhengfuProject.AgencyCode;
+ eswebcrawler1.modifyTime = zhengfuProject.Modifytime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ string requestJson = JsonConvert.SerializeObject(eswebcrawler1);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage responseMessage = httpClient.PutAsync(postUrl, httpContent).Result;
+ result = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+
+ }
+ else
+ {
+ throw new Exception("淇濆瓨鏁版嵁搴撳嚭閿欙紒");
+ }
+
+
+ _ccontext.SaveChanges();
+ }
+ }
+ }
+
+
+ if (currPage * pageSize >= sichuan.total)
+ {
+ break;
+ }
+ else
+ {
+ currPage += 1;
+ }
+ }
+
+
+ }
+ logg.WriteLog("鍥涘窛鐪佷腑鏍囧叕鍛� 鑾峰彇瀹屾垚");
+
+ //缈婚〉淇℃伅
+ currPage = 1;
+ pageSize = 10;
+ //寮�濮嬭闂� 閲囪喘鍏憡
+ logg.WriteLog("鍥涘窛鐪佹洿姝ｅ叕鍛� 寮�濮嬭幏鍙�");
+ while (true)
+ {
+ string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "¬iceType=00103®ionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
+ using (HttpClient client = new HttpClient())
+ {
+ client.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage response = client.GetAsync(address).Result;
+ var res = response.Content.ReadAsStringAsync().Result;
+
+ sichuanjieshou sichuan = JsonConvert.DeserializeObject<sichuanjieshou>(res);
+
+ //淇濆瓨椤圭洰鍒皊qlserveer鍜宔lasticsearch
+ if (sichuan.data != null && sichuan.data.Count > 0)
+ {
+ foreach (var sichuanjieshoudtl in sichuan.data)
+ {
+ ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.OpenTenderCode == sichuanjieshoudtl.openTenderCode && x.Gglx == "04" && x.NoticeTime == sichuanjieshoudtl.noticeTime).FirstOrDefault();
+ if (zhengfuProject == null)
+ {
+ zhengfuProject = new ZhengfuProject();
+ zhengfuProject.Id = Guid.NewGuid().ToString();
+ zhengfuProject.Gglx = "04";
+ string gglxName = "鏇存鍏憡";
+ zhengfuProject.NoticeTime = sichuanjieshoudtl.noticeTime;
+ zhengfuProject.OpenTenderTime = sichuanjieshoudtl.openTenderTime;
+ zhengfuProject.RegionCode = sichuanjieshoudtl.regionCode;
+ string regionName = sichuanjieshoudtl.regionName;
+ zhengfuProject.Sheng = "510000";
+ string ShengName = "鍥涘窛鐪�";
+ string CityName = "";
+ if ("510001" == sichuanjieshoudtl.regionCode)
+ {
+ zhengfuProject.RegionCode = "";
+ regionName = "";
+ zhengfuProject.City = "510001";
+ CityName = "鐪佹湰绾�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5101"))
+ {
+ zhengfuProject.City = "510100";
+ CityName = "鎴愰兘甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5103"))
+ {
+ zhengfuProject.City = "510300";
+ CityName = "鑷础甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5104"))
+ {
+ zhengfuProject.City = "510400";
+ CityName = "鏀�鏋濊姳甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5105"))
+ {
+ zhengfuProject.City = "510500";
+ CityName = "娉稿窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5106"))
+ {
+ zhengfuProject.City = "510600";
+ CityName = "寰烽槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5107"))
+ {
+ zhengfuProject.City = "510700";
+ CityName = "缁甸槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5108"))
+ {
+ zhengfuProject.City = "510800";
+ CityName = "骞垮厓甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5109"))
+ {
+ zhengfuProject.City = "510900";
+ CityName = "閬傚畞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5110"))
+ {
+ zhengfuProject.City = "511000";
+ CityName = "鍐呮睙甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5111"))
+ {
+ zhengfuProject.City = "511100";
+ CityName = "涔愬北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5113"))
+ {
+ zhengfuProject.City = "511300";
+ CityName = "鍗楀厖甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5114"))
+ {
+ zhengfuProject.City = "5114";
+ CityName = "鐪夊北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5115"))
+ {
+ zhengfuProject.City = "511500";
+ CityName = "瀹滃甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5116"))
+ {
+ zhengfuProject.City = "511600";
+ CityName = "骞垮畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5117"))
+ {
+ zhengfuProject.City = "511700";
+ CityName = "杈惧窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5118"))
+ {
+ zhengfuProject.City = "511800";
+ CityName = "闆呭畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5119"))
+ {
+ zhengfuProject.City = "511900";
+ CityName = "宸翠腑甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5120"))
+ {
+ zhengfuProject.City = "512000";
+ CityName = "璧勯槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5132"))
+ {
+ zhengfuProject.City = "513200";
+ CityName = "闃垮潩宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5133"))
+ {
+ zhengfuProject.City = "513300";
+ CityName = "鐢樺瓬宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5134"))
+ {
+ zhengfuProject.City = "513400";
+ CityName = "鍑夊北宸�";
+ }
+
+
+ string cgfsName = "";
+ switch (sichuanjieshoudtl.purchaseManner)
+ {
+ case "1":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏紑鎷涙爣";
+ break;
+ case "2":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "閭�璇锋嫑鏍�";
+ break;
+ case "3":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬ц皥鍒�";
+ break;
+ case "4":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "璇环";
+ break;
+ case "5":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍗曚竴鏉ユ簮";
+ break;
+ case "6":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬х鍟�";
+ break;
+ case "9":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏朵粬";
+ break;
+ }
+ zhengfuProject.OpenTenderCode = sichuanjieshoudtl.openTenderCode;
+ zhengfuProject.Title = sichuanjieshoudtl.title;
+ zhengfuProject.Shorttitle = sichuanjieshoudtl.shorttitle;
+ zhengfuProject.Pageurl = pageurll + sichuanjieshoudtl.pageurl;
+ zhengfuProject.Purchaser = sichuanjieshoudtl.purchaser;
+
+ if (!string.IsNullOrWhiteSpace(sichuanjieshoudtl.budget))
+ {
+ zhengfuProject.Budget = decimal.Parse(sichuanjieshoudtl.budget);
+ }
+ zhengfuProject.Agency = sichuanjieshoudtl.agency;
+ zhengfuProject.AgencyCode = sichuanjieshoudtl.agencyCode;
+ zhengfuProject.Content = sichuanjieshoudtl.content.Replace("\r", string.Empty).Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(@"\", string.Empty);
+ zhengfuProject.RecStatus = "A";
+ zhengfuProject.Creater = "1";
+ zhengfuProject.Createtime = DateTime.Now;
+ zhengfuProject.Modifier = "1";
+ zhengfuProject.Modifytime = zhengfuProject.Createtime;
+ _ccontext.ZhengfuProjects.Add(zhengfuProject);
+
+
+ string url = $"{api_domain}/webcrawler/_doc/" + zhengfuProject.Id;
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+ eswebcrawler eswebcrawler1 = new eswebcrawler();
+ eswebcrawler1.Id = zhengfuProject.Id;
+ eswebcrawler1.noticeTime = zhengfuProject.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss");
+ eswebcrawler1.openTenderTime = zhengfuProject.OpenTenderTime.HasValue ? zhengfuProject.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
+ eswebcrawler1.sheng = zhengfuProject.Sheng;
+ eswebcrawler1.shengName = ShengName;
+ eswebcrawler1.city = zhengfuProject.City;
+ eswebcrawler1.cityName = CityName;
+ eswebcrawler1.regionCode = zhengfuProject.RegionCode;
+ eswebcrawler1.regionName = regionName;
+ eswebcrawler1.cgfs = zhengfuProject.Cgfs;
+ eswebcrawler1.cgfsName = cgfsName;
+ eswebcrawler1.gglx = zhengfuProject.Gglx;
+ eswebcrawler1.gglxName = gglxName;
+ eswebcrawler1.openTenderCode = zhengfuProject.OpenTenderCode;
+ eswebcrawler1.title = zhengfuProject.Title;
+ eswebcrawler1.shorttitle = zhengfuProject.Shorttitle;
+ eswebcrawler1.pageurl = zhengfuProject.Pageurl;
+ eswebcrawler1.pingmu = zhengfuProject.Pingmu;
+ eswebcrawler1.pingmuName = "";
+ eswebcrawler1.purchaser = zhengfuProject.Purchaser;
+ eswebcrawler1.budget = zhengfuProject.Budget.HasValue ? zhengfuProject.Budget.Value.ToString() : "";
+ eswebcrawler1.agency = zhengfuProject.Agency;
+ eswebcrawler1.agencyCode = zhengfuProject.AgencyCode;
+ eswebcrawler1.modifyTime = zhengfuProject.Modifytime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ string requestJson = JsonConvert.SerializeObject(eswebcrawler1);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage responseMessage = httpClient.PutAsync(postUrl, httpContent).Result;
+ result = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+
+ }
+ else
+ {
+ throw new Exception("淇濆瓨鏁版嵁搴撳嚭閿欙紒");
+ }
+
+
+ _ccontext.SaveChanges();
+ }
+ }
+ }
+
+
+ if (currPage * pageSize >= sichuan.total)
+ {
+ break;
+ }
+ else
+ {
+ currPage += 1;
+ }
+ }
+
+
+ }
+ logg.WriteLog("鍥涘窛鐪佹洿姝ｅ叕鍛� 鑾峰彇瀹屾垚");
+
+
+ //缈婚〉淇℃伅
+ currPage = 1;
+ pageSize = 10;
+ //寮�濮嬭闂� 閲囪喘鍏憡
+ logg.WriteLog("鍥涘窛鐪佸簾鏍囧叕鍛� 寮�濮嬭幏鍙�");
+ while (true)
+ {
+ string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage=" + currPage + "&pageSize=" + pageSize + "¬iceType=001004,001006®ionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime=" + operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
+ using (HttpClient client = new HttpClient())
+ {
+ client.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage response = client.GetAsync(address).Result;
+ var res = response.Content.ReadAsStringAsync().Result;
+
+ sichuanjieshou sichuan = JsonConvert.DeserializeObject<sichuanjieshou>(res);
+
+ //淇濆瓨椤圭洰鍒皊qlserveer鍜宔lasticsearch
+ if (sichuan.data != null && sichuan.data.Count > 0)
+ {
+ foreach (var sichuanjieshoudtl in sichuan.data)
+ {
+ ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.OpenTenderCode == sichuanjieshoudtl.openTenderCode && x.Gglx == "11" && x.NoticeTime == sichuanjieshoudtl.noticeTime).FirstOrDefault();
+ if (zhengfuProject == null)
+ {
+ zhengfuProject = new ZhengfuProject();
+ zhengfuProject.Id = Guid.NewGuid().ToString();
+ zhengfuProject.Gglx = "11";
+ string gglxName = "搴熸爣鍏憡";
+ zhengfuProject.NoticeTime = sichuanjieshoudtl.noticeTime;
+ zhengfuProject.OpenTenderTime = sichuanjieshoudtl.openTenderTime;
+ zhengfuProject.RegionCode = sichuanjieshoudtl.regionCode;
+ string regionName = sichuanjieshoudtl.regionName;
+ zhengfuProject.Sheng = "510000";
+ string ShengName = "鍥涘窛鐪�";
+ string CityName = "";
+ if ("510001" == sichuanjieshoudtl.regionCode)
+ {
+ zhengfuProject.RegionCode = "";
+ regionName = "";
+ zhengfuProject.City = "510001";
+ CityName = "鐪佹湰绾�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5101"))
+ {
+ zhengfuProject.City = "510100";
+ CityName = "鎴愰兘甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5103"))
+ {
+ zhengfuProject.City = "510300";
+ CityName = "鑷础甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5104"))
+ {
+ zhengfuProject.City = "510400";
+ CityName = "鏀�鏋濊姳甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5105"))
+ {
+ zhengfuProject.City = "510500";
+ CityName = "娉稿窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5106"))
+ {
+ zhengfuProject.City = "510600";
+ CityName = "寰烽槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5107"))
+ {
+ zhengfuProject.City = "510700";
+ CityName = "缁甸槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5108"))
+ {
+ zhengfuProject.City = "510800";
+ CityName = "骞垮厓甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5109"))
+ {
+ zhengfuProject.City = "510900";
+ CityName = "閬傚畞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5110"))
+ {
+ zhengfuProject.City = "511000";
+ CityName = "鍐呮睙甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5111"))
+ {
+ zhengfuProject.City = "511100";
+ CityName = "涔愬北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5113"))
+ {
+ zhengfuProject.City = "511300";
+ CityName = "鍗楀厖甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5114"))
+ {
+ zhengfuProject.City = "5114";
+ CityName = "鐪夊北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5115"))
+ {
+ zhengfuProject.City = "511500";
+ CityName = "瀹滃甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5116"))
+ {
+ zhengfuProject.City = "511600";
+ CityName = "骞垮畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5117"))
+ {
+ zhengfuProject.City = "511700";
+ CityName = "杈惧窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5118"))
+ {
+ zhengfuProject.City = "511800";
+ CityName = "闆呭畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5119"))
+ {
+ zhengfuProject.City = "511900";
+ CityName = "宸翠腑甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5120"))
+ {
+ zhengfuProject.City = "512000";
+ CityName = "璧勯槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5132"))
+ {
+ zhengfuProject.City = "513200";
+ CityName = "闃垮潩宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5133"))
+ {
+ zhengfuProject.City = "513300";
+ CityName = "鐢樺瓬宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5134"))
+ {
+ zhengfuProject.City = "513400";
+ CityName = "鍑夊北宸�";
+ }
+
+
+ string cgfsName = "";
+ switch (sichuanjieshoudtl.purchaseManner)
+ {
+ case "1":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏紑鎷涙爣";
+ break;
+ case "2":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "閭�璇锋嫑鏍�";
+ break;
+ case "3":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬ц皥鍒�";
+ break;
+ case "4":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "璇环";
+ break;
+ case "5":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍗曚竴鏉ユ簮";
+ break;
+ case "6":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬х鍟�";
+ break;
+ case "9":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏朵粬";
+ break;
+ }
+ zhengfuProject.OpenTenderCode = sichuanjieshoudtl.openTenderCode;
+ zhengfuProject.Title = sichuanjieshoudtl.title;
+ zhengfuProject.Shorttitle = sichuanjieshoudtl.shorttitle;
+ zhengfuProject.Pageurl = pageurll + sichuanjieshoudtl.pageurl;
+ zhengfuProject.Purchaser = sichuanjieshoudtl.purchaser;
+
+ if (!string.IsNullOrWhiteSpace(sichuanjieshoudtl.budget))
+ {
+ zhengfuProject.Budget = decimal.Parse(sichuanjieshoudtl.budget);
+ }
+ zhengfuProject.Agency = sichuanjieshoudtl.agency;
+ zhengfuProject.AgencyCode = sichuanjieshoudtl.agencyCode;
+ zhengfuProject.Content = sichuanjieshoudtl.content.Replace("\r", string.Empty).Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(@"\", string.Empty);
+ zhengfuProject.RecStatus = "A";
+ zhengfuProject.Creater = "1";
+ zhengfuProject.Createtime = DateTime.Now;
+ zhengfuProject.Modifier = "1";
+ zhengfuProject.Modifytime = zhengfuProject.Createtime;
+ _ccontext.ZhengfuProjects.Add(zhengfuProject);
+
+
+ string url = $"{api_domain}/webcrawler/_doc/" + zhengfuProject.Id;
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+ eswebcrawler eswebcrawler1 = new eswebcrawler();
+ eswebcrawler1.Id = zhengfuProject.Id;
+ eswebcrawler1.noticeTime = zhengfuProject.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss");
+ eswebcrawler1.openTenderTime = zhengfuProject.OpenTenderTime.HasValue ? zhengfuProject.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
+ eswebcrawler1.sheng = zhengfuProject.Sheng;
+ eswebcrawler1.shengName = ShengName;
+ eswebcrawler1.city = zhengfuProject.City;
+ eswebcrawler1.cityName = CityName;
+ eswebcrawler1.regionCode = zhengfuProject.RegionCode;
+ eswebcrawler1.regionName = regionName;
+ eswebcrawler1.cgfs = zhengfuProject.Cgfs;
+ eswebcrawler1.cgfsName = cgfsName;
+ eswebcrawler1.gglx = zhengfuProject.Gglx;
+ eswebcrawler1.gglxName = gglxName;
+ eswebcrawler1.openTenderCode = zhengfuProject.OpenTenderCode;
+ eswebcrawler1.title = zhengfuProject.Title;
+ eswebcrawler1.shorttitle = zhengfuProject.Shorttitle;
+ eswebcrawler1.pageurl = zhengfuProject.Pageurl;
+ eswebcrawler1.pingmu = zhengfuProject.Pingmu;
+ eswebcrawler1.pingmuName = "";
+ eswebcrawler1.purchaser = zhengfuProject.Purchaser;
+ eswebcrawler1.budget = zhengfuProject.Budget.HasValue ? zhengfuProject.Budget.Value.ToString() : "";
+ eswebcrawler1.agency = zhengfuProject.Agency;
+ eswebcrawler1.agencyCode = zhengfuProject.AgencyCode;
+ eswebcrawler1.modifyTime = zhengfuProject.Modifytime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ string requestJson = JsonConvert.SerializeObject(eswebcrawler1);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage responseMessage = httpClient.PutAsync(postUrl, httpContent).Result;
+ result = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+
+ }
+ else
+ {
+ throw new Exception("淇濆瓨鏁版嵁搴撳嚭閿欙紒");
+ }
+
+
+ _ccontext.SaveChanges();
+ }
+ }
+ }
+
+
+ if (currPage * pageSize >= sichuan.total)
+ {
+ break;
+ }
+ else
+ {
+ currPage += 1;
+ }
+ }
+
+
+ }
+ logg.WriteLog("鍥涘窛鐪佸簾鏍囧叕鍛� 鑾峰彇瀹屾垚");
+
+ //缈婚〉淇℃伅
+ currPage = 1;
+ pageSize = 10;
+ //寮�濮嬭闂� 閲囪喘鍏憡
+ logg.WriteLog("鍥涘窛鐪佹剰鍚戝叕寮� 寮�濮嬭幏鍙�");
+ while (true)
+ {
+ string address = "https://zfcg.scsczt.cn/freecms/rest/v1/notice/selectInfoMoreChannel.do?&siteId=94c965cc-c55d-4f92-8469-d5875c68bd04&channel=c5bff13f-21ca-4dac-b158-cb40accd3035&currPage="+ currPage + "&pageSize="+ pageSize + "¬iceType=59®ionCode=&purchaseManner=&title=&openTenderCode=&purchaser=&agency=&purchaseNature=&operationStartTime="+ operationStartTime + "&operationEndTime=&selectTimeName=noticeTime&cityOrArea=";
+ using (HttpClient client = new HttpClient())
+ {
+ client.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage response = client.GetAsync(address).Result;
+ var res = response.Content.ReadAsStringAsync().Result;
+
+ sichuanjieshou sichuan = JsonConvert.DeserializeObject<sichuanjieshou>(res);
+
+ //淇濆瓨椤圭洰鍒皊qlserveer鍜宔lasticsearch
+ if (sichuan.data != null && sichuan.data.Count > 0)
+ {
+ foreach (var sichuanjieshoudtl in sichuan.data)
+ {
+ ZhengfuProject zhengfuProject = _ccontext.ZhengfuProjects.Where(x => x.OpenTenderCode == sichuanjieshoudtl.openTenderCode && x.Gglx == "01" && x.NoticeTime == sichuanjieshoudtl.noticeTime).FirstOrDefault();
+ if (zhengfuProject == null)
+ {
+ zhengfuProject = new ZhengfuProject();
+ zhengfuProject.Id = Guid.NewGuid().ToString();
+ zhengfuProject.Gglx = "01";
+ string gglxName = "鎰忓悜鍏紑";
+ zhengfuProject.NoticeTime = sichuanjieshoudtl.noticeTime;
+ zhengfuProject.OpenTenderTime = sichuanjieshoudtl.openTenderTime;
+ zhengfuProject.RegionCode = sichuanjieshoudtl.regionCode;
+ string regionName = sichuanjieshoudtl.regionName;
+ zhengfuProject.Sheng = "510000";
+ string ShengName = "鍥涘窛鐪�";
+ string CityName = "";
+ if ("510001" == sichuanjieshoudtl.regionCode)
+ {
+ zhengfuProject.RegionCode = "";
+ regionName = "";
+ zhengfuProject.City = "510001";
+ CityName = "鐪佹湰绾�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5101"))
+ {
+ zhengfuProject.City = "510100";
+ CityName = "鎴愰兘甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5103"))
+ {
+ zhengfuProject.City = "510300";
+ CityName = "鑷础甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5104"))
+ {
+ zhengfuProject.City = "510400";
+ CityName = "鏀�鏋濊姳甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5105"))
+ {
+ zhengfuProject.City = "510500";
+ CityName = "娉稿窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5106"))
+ {
+ zhengfuProject.City = "510600";
+ CityName = "寰烽槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5107"))
+ {
+ zhengfuProject.City = "510700";
+ CityName = "缁甸槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5108"))
+ {
+ zhengfuProject.City = "510800";
+ CityName = "骞垮厓甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5109"))
+ {
+ zhengfuProject.City = "510900";
+ CityName = "閬傚畞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5110"))
+ {
+ zhengfuProject.City = "511000";
+ CityName = "鍐呮睙甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5111"))
+ {
+ zhengfuProject.City = "511100";
+ CityName = "涔愬北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5113"))
+ {
+ zhengfuProject.City = "511300";
+ CityName = "鍗楀厖甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5114"))
+ {
+ zhengfuProject.City = "5114";
+ CityName = "鐪夊北甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5115"))
+ {
+ zhengfuProject.City = "511500";
+ CityName = "瀹滃甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5116"))
+ {
+ zhengfuProject.City = "511600";
+ CityName = "骞垮畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5117"))
+ {
+ zhengfuProject.City = "511700";
+ CityName = "杈惧窞甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5118"))
+ {
+ zhengfuProject.City = "511800";
+ CityName = "闆呭畨甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5119"))
+ {
+ zhengfuProject.City = "511900";
+ CityName = "宸翠腑甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5120"))
+ {
+ zhengfuProject.City = "512000";
+ CityName = "璧勯槼甯�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5132"))
+ {
+ zhengfuProject.City = "513200";
+ CityName = "闃垮潩宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5133"))
+ {
+ zhengfuProject.City = "513300";
+ CityName = "鐢樺瓬宸�";
+ }
+ else if (sichuanjieshoudtl.regionCode.StartsWith("5134"))
+ {
+ zhengfuProject.City = "513400";
+ CityName = "鍑夊北宸�";
+ }
+
+
+ string cgfsName = "";
+ switch (sichuanjieshoudtl.purchaseManner)
+ {
+ case "1":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏紑鎷涙爣";
+ break;
+ case "2":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "閭�璇锋嫑鏍�";
+ break;
+ case "3":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬ц皥鍒�";
+ break;
+ case "4":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "璇环";
+ break;
+ case "5":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍗曚竴鏉ユ簮";
+ break;
+ case "6":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "绔炰簤鎬х鍟�";
+ break;
+ case "9":
+ zhengfuProject.Cgfs = "1";
+ cgfsName = "鍏朵粬";
+ break;
+ }
+ zhengfuProject.OpenTenderCode = sichuanjieshoudtl.openTenderCode;
+ zhengfuProject.Title = sichuanjieshoudtl.title;
+ zhengfuProject.Shorttitle = sichuanjieshoudtl.shorttitle;
+ zhengfuProject.Pageurl = pageurll + sichuanjieshoudtl.pageurl;
+ zhengfuProject.Purchaser = sichuanjieshoudtl.purchaser;
+
+ if (!string.IsNullOrWhiteSpace(sichuanjieshoudtl.budget))
+ {
+ zhengfuProject.Budget = decimal.Parse(sichuanjieshoudtl.budget);
+ }
+ zhengfuProject.Agency = sichuanjieshoudtl.agency;
+ zhengfuProject.AgencyCode = sichuanjieshoudtl.agencyCode;
+ zhengfuProject.Content = sichuanjieshoudtl.content.Replace("\r", string.Empty).Replace("\n", string.Empty).Replace("\t", string.Empty).Replace(@"\", string.Empty);
+ zhengfuProject.RecStatus = "A";
+ zhengfuProject.Creater = "1";
+ zhengfuProject.Createtime = DateTime.Now;
+ zhengfuProject.Modifier = "1";
+ zhengfuProject.Modifytime = zhengfuProject.Createtime;
+ _ccontext.ZhengfuProjects.Add(zhengfuProject);
+
+
+ string url = $"{api_domain}/webcrawler/_doc/" + zhengfuProject.Id;
+ string result = string.Empty;
+ Uri postUrl = new Uri(url);
+ eswebcrawler eswebcrawler1 = new eswebcrawler();
+ eswebcrawler1.Id = zhengfuProject.Id;
+ eswebcrawler1.noticeTime = zhengfuProject.NoticeTime.ToString("yyyy-MM-dd HH:mm:ss");
+ eswebcrawler1.openTenderTime = zhengfuProject.OpenTenderTime.HasValue ? zhengfuProject.OpenTenderTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : null;
+ eswebcrawler1.sheng = zhengfuProject.Sheng;
+ eswebcrawler1.shengName = ShengName;
+ eswebcrawler1.city = zhengfuProject.City;
+ eswebcrawler1.cityName = CityName;
+ eswebcrawler1.regionCode = zhengfuProject.RegionCode;
+ eswebcrawler1.regionName = regionName;
+ eswebcrawler1.cgfs = zhengfuProject.Cgfs;
+ eswebcrawler1.cgfsName = cgfsName;
+ eswebcrawler1.gglx = zhengfuProject.Gglx;
+ eswebcrawler1.gglxName = gglxName;
+ eswebcrawler1.openTenderCode = zhengfuProject.OpenTenderCode;
+ eswebcrawler1.title = zhengfuProject.Title;
+ eswebcrawler1.shorttitle = zhengfuProject.Shorttitle;
+ eswebcrawler1.pageurl = zhengfuProject.Pageurl;
+ eswebcrawler1.pingmu = zhengfuProject.Pingmu;
+ eswebcrawler1.pingmuName = "";
+ eswebcrawler1.purchaser = zhengfuProject.Purchaser;
+ eswebcrawler1.budget = zhengfuProject.Budget.HasValue ? zhengfuProject.Budget.Value.ToString() : "";
+ eswebcrawler1.agency = zhengfuProject.Agency;
+ eswebcrawler1.agencyCode = zhengfuProject.AgencyCode;
+ eswebcrawler1.modifyTime = zhengfuProject.Modifytime.ToString("yyyy-MM-dd HH:mm:ss");
+
+ string requestJson = JsonConvert.SerializeObject(eswebcrawler1);
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = TimeSpan.FromSeconds(60);
+ HttpResponseMessage responseMessage = httpClient.PutAsync(postUrl, httpContent).Result;
+ result = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+
+ }
+
+ Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);
+
+ if (jobject["error"] == null && jobject["_shards"]["successful"].ToString() == "1")
+ {
+
+ }
+ else
+ {
+ throw new Exception("淇濆瓨鏁版嵁搴撳嚭閿欙紒");
+ }
+
+
+ _ccontext.SaveChanges();
+ }
+ }
+ }
+
+
+ if (currPage * pageSize >= sichuan.total)
+ {
+ break;
+ }
+ else
+ {
+ currPage += 1;
+ }
+ }
+
+
+ }
+ logg.WriteLog("鍥涘窛鐪佹剰鍚戝叕寮� 鑾峰彇瀹屾垚");
+
+ //淇濆瓨鏈�鍚庢洿鏂版椂闂�
+ if (updatetime != null)
+ {
+ updatetime.Updatetime1 = DateTime.Now.AddDays(-1);
+ _ccontext.SaveChanges();
+ }
+ else
+ {
+ updatetime = new Updatetime();
+ updatetime.Id = Guid.NewGuid().ToString();
+ updatetime.Sheng = "鍥涘窛鐪�";
+ updatetime.Updatetime1 = DateTime.Now.AddDays(-1);
+ _ccontext.Updatetimes.Add(updatetime);
+ _ccontext.SaveChanges();
+ }
+ }
+ catch (Exception ex)
+ {
+ logg.WriteLog(ex.Message);
+
+ logg.WriteLog(ex.StackTrace);
+
+ logg.WriteLog(ex.ToString());
+ }
+ finally
+ {
+
+ }
+ }
+ }
+}
diff --git a/zhengcaioa/DTO/CooperOrderDTO.cs b/zhengcaioa/DTO/CooperOrderDTO.cs
index ca150cd..9881df8 100644
--- a/zhengcaioa/DTO/CooperOrderDTO.cs
+++ b/zhengcaioa/DTO/CooperOrderDTO.cs
@@ -65,6 +65,7 @@
public string OrderType1Name { get; set; }
public string OrderType2 { get; set; }
+ public string OrderType3 { get; set; }
public string SonghuoGongsi { get; set; }
public string SonghuoDanhao { get; set; }
@@ -142,6 +143,12 @@
public string[] Law { get; set; }
public string[] Lawcoment { get; set; }
+ public string[] challengeItemId { get; set; }
+ public string[] challengeItemIdlaw { get; set; }
+
+ public string[] complaintItemId { get; set; }
+ public string[] complaintItemIdlaw { get; set; }
+
public string OrderId { get; set; }
public int PrintNum { get; set; }
diff --git a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
index 2a8da12..4548989 100644
--- a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
+++ b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -67,6 +67,8 @@
public decimal? Shenyushouxin { get; set; }
public string ShenyushouxinName { get; set; }
public decimal? Moneycountde { get; set; }
+
+ public int? Taocanjianshu { get; set; }
}
public class CooperatecustomCustomerDTOSearch : SearchEntity
diff --git a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
index 9c8fcbd..3a86a77 100644
--- a/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
+++ b/zhengcaioa/DTO/FiOrderrecievemoneyDTO.cs
@@ -53,6 +53,8 @@
public string[] OrderTypes { get; set; }
+ public string OrderType1 { get; set; }
+
}
}
diff --git a/zhengcaioa/DTO/PltUserDTO.cs b/zhengcaioa/DTO/PltUserDTO.cs
index 84bb8d7..8d70e03 100644
--- a/zhengcaioa/DTO/PltUserDTO.cs
+++ b/zhengcaioa/DTO/PltUserDTO.cs
@@ -65,6 +65,8 @@
public DateTime? ShiyongDate { get; set; }
public string ShiyongDateName { get; set; }
public DateTime? ShiyongDateEnd { get; set; }
+ public DateTime? HetongDateEnd { get; set; }
+ public string HetongDateEndName { get; set; }
public string ShiyongDateEndName { get; set; }
public decimal? ShiyongPrice { get; set; }
public string ShiyongPriceName { get; set; }
diff --git a/zhengcaioa/DTO/WebCrawler/TProjectDictionaryDTO.cs b/zhengcaioa/DTO/WebCrawler/TProjectDictionaryDTO.cs
new file mode 100644
index 0000000..c7a7ecb
--- /dev/null
+++ b/zhengcaioa/DTO/WebCrawler/TProjectDictionaryDTO.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO.WebCrawler
+{
+ public class TProjectDictionaryDTO
+ {
+ public int Id { get; set; }
+ public string Title { get; set; }
+ public string Code { get; set; }
+ public int? SiteId { get; set; }
+ public int? SortId { get; set; }
+ public int? Status { get; set; }
+ public int? Typecode { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/WebCrawler/UpdatetimeDTO.cs b/zhengcaioa/DTO/WebCrawler/UpdatetimeDTO.cs
new file mode 100644
index 0000000..b14ed85
--- /dev/null
+++ b/zhengcaioa/DTO/WebCrawler/UpdatetimeDTO.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO.WebCrawler
+{
+ public class UpdatetimeDTO
+ {
+ public string Id { get; set; }
+ public DateTime Updatetime1 { get; set; }
+ public string Sheng { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/WebCrawler/ZhengfuProjectDTO.cs b/zhengcaioa/DTO/WebCrawler/ZhengfuProjectDTO.cs
new file mode 100644
index 0000000..a096f5a
--- /dev/null
+++ b/zhengcaioa/DTO/WebCrawler/ZhengfuProjectDTO.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO.WebCrawler
+{
+ public class ZhengfuProjectDTO
+ {
+ public string Id { get; set; }
+ public DateTime NoticeTime { get; set; }
+ public string Sheng { get; set; }
+ public string City { get; set; }
+ public string RegionCode { get; set; }
+ public string Cgfs { get; set; }
+ public string Gglx { get; set; }
+ public string OpenTenderCode { get; set; }
+ public string Title { get; set; }
+ public string Shorttitle { get; set; }
+ public string Pageurl { get; set; }
+ public string Remark { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ public string Content { get; set; }
+ public string Pingmu { get; set; }
+ public string Purchaser { get; set; }
+ public decimal? Budget { get; set; }
+ public string Agency { get; set; }
+ public string AgencyCode { get; set; }
+ }
+}
diff --git a/zhengcaioa/DTO/ZxdsfxlDTO.cs b/zhengcaioa/DTO/ZxdsfxlDTO.cs
new file mode 100644
index 0000000..0e2fe5d
--- /dev/null
+++ b/zhengcaioa/DTO/ZxdsfxlDTO.cs
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class ZxdsfxlDTO
+ {
+
+ public string Id { get; set; }
+ public string Huiyuanid { get; set; }
+ public string Huiyuanname { get; set; }
+ public DateTime? Visittime { get; set; }
+ public string Token { get; set; }
+ public string Leixing { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ }
+}
diff --git a/zhengcaioa/IServices/IProjectService.cs b/zhengcaioa/IServices/IProjectService.cs
index c486381..c20d2cf 100644
--- a/zhengcaioa/IServices/IProjectService.cs
+++ b/zhengcaioa/IServices/IProjectService.cs
@@ -39,5 +39,11 @@
List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
+
+
+ ResultEntity saveZxdsfxl(ZxdsfxlDTO zxdsfxl);
+
+ List<ZxdsfxlDTO> GetListZxdsfxl(string userid, DateTime datemin, DateTime datemax,string leixing);
+
}
}
diff --git a/zhengcaioa/Model/CooperatecustomCustomer.cs b/zhengcaioa/Model/CooperatecustomCustomer.cs
index aabdd4c..3f69236 100644
--- a/zhengcaioa/Model/CooperatecustomCustomer.cs
+++ b/zhengcaioa/Model/CooperatecustomCustomer.cs
@@ -49,5 +49,7 @@
public decimal? Yufukuan { get; set; }
public decimal? Shouxinedu { get; set; }
public decimal? Shenyushouxin { get; set; }
+ public int? Taocanjianshu { get; set; }
+
}
}
diff --git a/zhengcaioa/Model/PltUser.cs b/zhengcaioa/Model/PltUser.cs
index e31d284..106bb33 100644
--- a/zhengcaioa/Model/PltUser.cs
+++ b/zhengcaioa/Model/PltUser.cs
@@ -73,5 +73,6 @@
public decimal? jintiesalary { get; set; }
public decimal? geshuiqizheng { get; set; }
public string Yaoqingma { get; set; }
+ public DateTime? HetongDateEnd { get; set; }
}
}
diff --git a/zhengcaioa/Model/WebCrawler/TProjectDictionary.cs b/zhengcaioa/Model/WebCrawler/TProjectDictionary.cs
new file mode 100644
index 0000000..8c8cbc7
--- /dev/null
+++ b/zhengcaioa/Model/WebCrawler/TProjectDictionary.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class TProjectDictionary
+ {
+ public int Id { get; set; }
+ public string Title { get; set; }
+ public string Code { get; set; }
+ public int? SiteId { get; set; }
+ public int? SortId { get; set; }
+ public int? Status { get; set; }
+ public int? Typecode { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/WebCrawler/Updatetime.cs b/zhengcaioa/Model/WebCrawler/Updatetime.cs
new file mode 100644
index 0000000..98337d5
--- /dev/null
+++ b/zhengcaioa/Model/WebCrawler/Updatetime.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class Updatetime
+ {
+ public string Id { get; set; }
+ public DateTime Updatetime1 { get; set; }
+ public string Sheng { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/WebCrawler/WebCrawlerContext.cs b/zhengcaioa/Model/WebCrawler/WebCrawlerContext.cs
new file mode 100644
index 0000000..6699e51
--- /dev/null
+++ b/zhengcaioa/Model/WebCrawler/WebCrawlerContext.cs
@@ -0,0 +1,194 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class WebCrawlerContext : DbContext
+ {
+ public WebCrawlerContext()
+ {
+ }
+
+ public WebCrawlerContext(DbContextOptions<WebCrawlerContext> options)
+ : base(options)
+ {
+ }
+
+ public virtual DbSet<TProjectDictionary> TProjectDictionaries { get; set; }
+ public virtual DbSet<Updatetime> Updatetimes { get; set; }
+ public virtual DbSet<ZhengfuProject> ZhengfuProjects { get; set; }
+
+ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+ {
+ if (!optionsBuilder.IsConfigured)
+ {
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
+ optionsBuilder.UseSqlServer("Data Source=.;Initial Catalog=WebCrawler;User ID=sa;Password=123456");
+ }
+ }
+
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
+ {
+ modelBuilder.HasAnnotation("Relational:Collation", "Chinese_PRC_CI_AS");
+
+ modelBuilder.Entity<TProjectDictionary>(entity =>
+ {
+ entity.ToTable("t_project_dictionary");
+
+ entity.Property(e => e.Id).HasColumnName("id");
+
+ entity.Property(e => e.Code)
+ .HasMaxLength(10)
+ .HasColumnName("code");
+
+ entity.Property(e => e.SiteId).HasColumnName("site_id");
+
+ entity.Property(e => e.SortId).HasColumnName("sort_id");
+
+ entity.Property(e => e.Status).HasColumnName("status");
+
+ entity.Property(e => e.Title)
+ .HasMaxLength(20)
+ .HasColumnName("title");
+
+ entity.Property(e => e.Typecode).HasColumnName("typecode");
+ });
+
+ modelBuilder.Entity<Updatetime>(entity =>
+ {
+ entity.ToTable("updatetime");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Sheng)
+ .HasMaxLength(50)
+ .HasColumnName("sheng");
+
+ entity.Property(e => e.Updatetime1)
+ .HasColumnType("datetime")
+ .HasColumnName("updatetime");
+ });
+
+ modelBuilder.Entity<ZhengfuProject>(entity =>
+ {
+ entity.ToTable("zhengfu_Project");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Agency)
+ .HasMaxLength(500)
+ .HasColumnName("agency");
+
+ entity.Property(e => e.AgencyCode)
+ .HasMaxLength(100)
+ .HasColumnName("agencyCode");
+
+ entity.Property(e => e.Budget)
+ .HasColumnType("money")
+ .HasColumnName("budget");
+
+ entity.Property(e => e.Cgfs)
+ .HasMaxLength(20)
+ .HasColumnName("cgfs")
+ .HasComment("閲囪喘鏂瑰紡");
+
+ entity.Property(e => e.City)
+ .HasMaxLength(50)
+ .HasColumnName("city");
+
+ entity.Property(e => e.Content)
+ .HasColumnName("content")
+ .HasComment("鍏憡鍐呭");
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Gglx)
+ .HasMaxLength(20)
+ .HasColumnName("gglx")
+ .HasComment("鍏憡绫诲瀷");
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.NoticeTime)
+ .HasColumnType("datetime")
+ .HasColumnName("noticeTime")
+ .HasComment("鍏憡鏃ユ湡");
+
+ entity.Property(e => e.OpenTenderCode)
+ .HasMaxLength(100)
+ .HasColumnName("openTenderCode")
+ .HasComment("鍏憡缂栧彿");
+
+ entity.Property(e => e.OpenTenderTime)
+ .HasColumnType("datetime")
+ .HasColumnName("openTenderTime");
+
+ entity.Property(e => e.Pageurl)
+ .HasMaxLength(500)
+ .HasColumnName("pageurl")
+ .HasComment("鎻愬彇閾炬帴");
+
+ entity.Property(e => e.Pingmu)
+ .HasMaxLength(20)
+ .HasColumnName("pingmu");
+
+ entity.Property(e => e.Purchaser)
+ .HasMaxLength(500)
+ .HasColumnName("purchaser");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.RegionCode)
+ .HasMaxLength(50)
+ .HasColumnName("regionCode");
+
+ entity.Property(e => e.Remark)
+ .HasMaxLength(4000)
+ .HasColumnName("remark");
+
+ entity.Property(e => e.Sheng)
+ .HasMaxLength(50)
+ .HasColumnName("sheng");
+
+ entity.Property(e => e.Shorttitle)
+ .HasMaxLength(500)
+ .HasColumnName("shorttitle")
+ .HasComment("鍏憡娈垫爣棰�");
+
+ entity.Property(e => e.Title)
+ .HasMaxLength(500)
+ .HasColumnName("title")
+ .HasComment("鍏憡鏍囬");
+ });
+
+ OnModelCreatingPartial(modelBuilder);
+ }
+
+ partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
+ }
+}
diff --git a/zhengcaioa/Model/WebCrawler/ZhengfuProject.cs b/zhengcaioa/Model/WebCrawler/ZhengfuProject.cs
new file mode 100644
index 0000000..2df6bd7
--- /dev/null
+++ b/zhengcaioa/Model/WebCrawler/ZhengfuProject.cs
@@ -0,0 +1,35 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class ZhengfuProject
+ {
+ public string Id { get; set; }
+ public DateTime NoticeTime { get; set; }
+ public string Sheng { get; set; }
+ public string City { get; set; }
+ public string RegionCode { get; set; }
+ public string Cgfs { get; set; }
+ public string Gglx { get; set; }
+ public string OpenTenderCode { get; set; }
+ public string Title { get; set; }
+ public string Shorttitle { get; set; }
+ public string Pageurl { get; set; }
+ public string Remark { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ public string Content { get; set; }
+ public string Pingmu { get; set; }
+ public string Purchaser { get; set; }
+ public decimal? Budget { get; set; }
+ public string Agency { get; set; }
+ public string AgencyCode { get; set; }
+ public DateTime? OpenTenderTime { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/Zxdsfxl.cs b/zhengcaioa/Model/Zxdsfxl.cs
new file mode 100644
index 0000000..6b30e9b
--- /dev/null
+++ b/zhengcaioa/Model/Zxdsfxl.cs
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class Zxdsfxl
+ {
+ public string Id { get; set; }
+ public string Huiyuanid { get; set; }
+ public string Huiyuanname { get; set; }
+ public DateTime? Visittime { get; set; }
+ public string Token { get; set; }
+ public string Leixing { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 4c8e020..c6bf6f2 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -138,6 +138,9 @@
public virtual DbSet<TComplaintShouquandaibiao> TComplaintShouquandaibiaos { get; set; }
+ public virtual DbSet<Zxdsfxl> Zxdsfxls { get; set; }
+
+
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if (!optionsBuilder.IsConfigured)
@@ -2641,6 +2644,9 @@
entity.Property(e => e.Shenyushouxin)
.HasColumnType("money")
.HasColumnName("shenyushouxin");
+ entity.Property(e => e.Taocanjianshu)
+ .HasColumnType("int")
+ .HasColumnName("taocanjianshu");
});
modelBuilder.Entity<CusFangwenjilu>(entity =>
@@ -5200,6 +5206,8 @@
entity.Property(e => e.ShiyongDateEnd).HasColumnType("datetime");
+ entity.Property(e => e.HetongDateEnd).HasColumnType("datetime");
+
entity.Property(e => e.ShiyongPrice).HasColumnType("numeric(18, 2)");
entity.Property(e => e.Tel)
@@ -7454,6 +7462,62 @@
.HasColumnName("youbian");
});
+
+ modelBuilder.Entity<Zxdsfxl>(entity =>
+ {
+ entity.ToTable("zxdsfxls");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Huiyuanid)
+ .HasMaxLength(50)
+ .HasColumnName("huiyuanid");
+
+ entity.Property(e => e.Huiyuanname)
+ .HasMaxLength(100)
+ .HasColumnName("huiyuanname");
+
+ entity.Property(e => e.Leixing)
+ .HasMaxLength(1)
+ .HasColumnName("leixing");
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Token)
+ .HasMaxLength(500)
+ .HasColumnName("token");
+
+ entity.Property(e => e.Visittime)
+ .HasColumnType("datetime")
+ .HasColumnName("visittime");
+ });
+
OnModelCreatingPartial(modelBuilder);
}
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index d28864a..fe95ca7 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -99,6 +99,7 @@
updateproject.Weixintime = cooperatecustomCustomer.Weixintime;
updateproject.Weixiner = cooperatecustomCustomer.Weixiner;
updateproject.Shouxinedu = cooperatecustomCustomer.Shouxinedu;
+ updateproject.Taocanjianshu = cooperatecustomCustomer.Taocanjianshu;
}
_context.SaveChanges();
@@ -327,6 +328,7 @@
YufukuanName = a.Yufukuan.HasValue ? a.Yufukuan.Value.ToString("f2") : "",
ShouxineduName = a.Shouxinedu.HasValue ? a.Shouxinedu.Value.ToString("f2") : "",
ShenyushouxinName = a.Shenyushouxin.HasValue ? a.Shenyushouxin.Value.ToString("f2") : "",
+ Taocanjianshu = a.Taocanjianshu ?? 0,
}
).OrderByDescending(x => x.Modifytime).ToList();
diff --git a/zhengcaioa/Services/FiOrderrecievemoneyService.cs b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
index 6241691..4932909 100644
--- a/zhengcaioa/Services/FiOrderrecievemoneyService.cs
+++ b/zhengcaioa/Services/FiOrderrecievemoneyService.cs
@@ -202,7 +202,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.EndTime) || a.XdTime <= DateTime.Parse(searchEntity.EndTime).AddSeconds(1))
&& ((searchEntity.HuiyuanIds == null || searchEntity.HuiyuanIds.Length == 0) || searchEntity.HuiyuanIds.Contains(ggg.HuiyuanId))
&& ((searchEntity.OrderTypes == null || searchEntity.OrderTypes.Length == 0) || searchEntity.OrderTypes.Contains(a.OrderType))
-
+ && (string.IsNullOrWhiteSpace(searchEntity.OrderType1) || a.OrderType1 == searchEntity.OrderType1.Trim())
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 0c22304..8c304df 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -297,11 +297,11 @@
List<ProjectDTO> list = new List<ProjectDTO>();
//绛涢��
StringBuilder sql = new StringBuilder();
- sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,b.[name] +'-'+c.[name]+'-'+d.[name] Sheng ,a.city ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia] , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,toubiaocishu = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] for xml path('')), 1,1, '') "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '')
+ sql.Append("SELECT distinct a.[Id],a.[start_time],a.[drhx_defen],a.[caigouyusuan],a.[dshx_defen] ,a.sheng ,a.city ,a.[area_id],a.cgfs, a.[name] ,a.[number],a.creater,a.createtime,a.modifier,a.modifytime ,a.[drhx],a.[drhx_price],a.[dshx],a.[dshx_price],a.[Fencha],a.[Shuliang],a.[remark],a.[rec_status] ,a.[question] ,a.[zhongbiaocishu],a.[feibiaocishu],a.[zhongbiaojine],a.[Fblx],a.[Fbyy] , a.[zhuanjia] , a.[caigourenname], a.[caigourenaddress], a.[caigourencontact], a.[dailiname], a.[dailiaddress], a.[dailicontact] ,'' toubiaocishu "); //zhuanjia = stuff((select ','+name from [Zhuanjia] f where CHARINDEX(f.id,a.[zhuanjia]) >0 for xml path('')), 1,1, '') = stuff((select '銆�'+ f.[names] from [Projectzhongbiao] f where f.[ProjectId] = a.[Id] for xml path('')), 1,1, '')
sql.Append("FROM [Project] a ");
- sql.Append("left join [Area] b on a.[sheng] = b.[codeID] ");
- sql.Append("left join [Area] c on a.[city] = c.[codeID] ");
- sql.Append("left join [Area] d on a.[area_id] = d.[codeID] ");
+ //sql.Append("left join [Area] b on a.[sheng] = b.[codeID] ");
+ //sql.Append("left join [Area] c on a.[city] = c.[codeID] ");
+ //sql.Append("left join [Area] d on a.[area_id] = d.[codeID] ");
//sql.Append("left join [Zhuanjia] e on CHARINDEX(e.id,a.[zhuanjia]) >0 ");
sql.Append(" where a.rec_status='A' ");
@@ -592,8 +592,52 @@
}
}
-
+ var areas = _context.Areas.ToList();
+ foreach (var projectDTO in list)
+ {
+ var sheng = areas.Where(x => x.CodeId == projectDTO.Sheng).FirstOrDefault();
+ if (sheng != null)
+ {
+ projectDTO.Sheng = sheng.Name ;
+ }
+ var City = areas.Where(x => x.CodeId == projectDTO.City).FirstOrDefault();
+ if (City != null)
+ {
+ projectDTO.Sheng += "-" + City.Name;
+ }
+ var AreaId = areas.Where(x => x.CodeId == projectDTO.AreaId).FirstOrDefault();
+ if (AreaId != null)
+ {
+ projectDTO.Sheng += "-" + AreaId.Name;
+ }
+
+ }
+
+ List<string> projiectid = new List<string>();
+ foreach (var projectDTO in list)
+ {
+ projiectid.Add(projectDTO.Id);
+ }
+ var projectzhongbiaos = _context.Projectzhongbiaos.Where(x => projiectid.Contains(x.ProjectId)).ToList();
+ foreach (var projectDTO in list)
+ {
+ var ProjectIds = projectzhongbiaos.Where(x => x.ProjectId == projectDTO.Id).ToList();
+ projectDTO.Toubiaocishu = "";
+ for (int i=0;i< ProjectIds.Count; i++)
+ {
+ if(i== ProjectIds.Count - 1)
+ {
+ projectDTO.Toubiaocishu += ProjectIds[i].Names ;
+ }
+ else
+ {
+ projectDTO.Toubiaocishu += ProjectIds[i].Names + "銆�";
+ }
+
+
+ }
+ }
data.LoadData(searchEntity, list);
return data;
@@ -700,5 +744,66 @@
var list = _mapper.Map<List<ProjectDTO>>(listPosition);
return list;
}
+
+
+
+
+ public ResultEntity saveZxdsfxl(ZxdsfxlDTO zxdsfxlDTO)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+ var zxdsfxl = _mapper.Map<Zxdsfxl>(zxdsfxlDTO);
+
+
+
+
+ if (String.IsNullOrEmpty(zxdsfxl.Id))
+ {
+ zxdsfxl.Id = Guid.NewGuid().ToString();
+ _context.Zxdsfxls.Add(zxdsfxl);
+ }
+ else
+ {
+ var updatezxdsfxl = _context.Zxdsfxls.Find(zxdsfxl.Id);
+ updatezxdsfxl.Huiyuanid = zxdsfxl.Huiyuanid;
+ updatezxdsfxl.Huiyuanname = zxdsfxl.Huiyuanname;
+ updatezxdsfxl.Visittime = zxdsfxl.Visittime;
+ updatezxdsfxl.Token = zxdsfxl.Token;
+ updatezxdsfxl.Leixing = zxdsfxl.Leixing;
+
+
+
+ updatezxdsfxl.RecStatus = zxdsfxl.RecStatus;
+ updatezxdsfxl.Modifier = zxdsfxl.Modifier;
+ updatezxdsfxl.Modifytime = zxdsfxl.Modifytime;
+
+ }
+
+
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = zxdsfxl.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public List<ZxdsfxlDTO> GetListZxdsfxl(string userid, DateTime datemin, DateTime datemax, string leixing)
+ {
+
+
+ var listPosition = _context.Zxdsfxls.Where(r => r.RecStatus == "A" && r.Leixing == leixing && r.Huiyuanid == userid && r.Visittime >= datemin && r.Visittime < datemax).ToList();
+
+ var list = _mapper.Map<List<ZxdsfxlDTO>>(listPosition);
+ return list;
+ }
}
}
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index e28f32d..32f4736 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -190,6 +190,7 @@
updatepltUser.jintiesalary = pltUser.jintiesalary;
updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
updatepltUser.Yaoqingma = pltUser.Yaoqingma;
+ updatepltUser.HetongDateEnd = pltUser.HetongDateEnd;
}
_context.SaveChanges();
@@ -304,6 +305,8 @@
BasicPrice = a.BasicPrice,
ShiyongPrice = a.ShiyongPrice,
ShiyongPriceName = a.ShiyongPrice.HasValue ? a.ShiyongPrice.Value.ToString("F2") : "",
+ HetongDateEnd = a.HetongDateEnd,
+ HetongDateEndName = a.HetongDateEnd.HasValue ? a.HetongDateEnd.Value.ToString("yyyy-MM-dd") : "",
ShebaodateName = a.Shebaodate.HasValue ? a.Shebaodate.Value.ToString("yyyy-MM-dd") : "",
diff --git a/zhengcaioa/zhengcaioa.sln b/zhengcaioa/zhengcaioa.sln
index 22e04e8..d3ef3fc 100644
--- a/zhengcaioa/zhengcaioa.sln
+++ b/zhengcaioa/zhengcaioa.sln
@@ -22,6 +22,15 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services", "Services\Services.csproj", "{A65002DC-5C50-4E04-B16D-F7B544E73E8B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crawler", "Crawler\Crawler.csproj", "{65478E33-23C2-4BE4-B0A2-A6719377B58A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {962B8A0A-EE9E-43A6-8076-A1DA911F9452} = {962B8A0A-EE9E-43A6-8076-A1DA911F9452}
+ {1FD6C355-60DC-4A03-94DE-48E3D611DBBD} = {1FD6C355-60DC-4A03-94DE-48E3D611DBBD}
+ {62698286-951E-4717-AC05-55EF511A6DB1} = {62698286-951E-4717-AC05-55EF511A6DB1}
+ {A346F0C3-8EA1-45BA-8403-5640AA746257} = {A346F0C3-8EA1-45BA-8403-5640AA746257}
+ {A65002DC-5C50-4E04-B16D-F7B544E73E8B} = {A65002DC-5C50-4E04-B16D-F7B544E73E8B}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -52,6 +61,10 @@
{A65002DC-5C50-4E04-B16D-F7B544E73E8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A65002DC-5C50-4E04-B16D-F7B544E73E8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A65002DC-5C50-4E04-B16D-F7B544E73E8B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {65478E33-23C2-4BE4-B0A2-A6719377B58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {65478E33-23C2-4BE4-B0A2-A6719377B58A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {65478E33-23C2-4BE4-B0A2-A6719377B58A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {65478E33-23C2-4BE4-B0A2-A6719377B58A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 6747a39..ff08a23 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -687,6 +687,12 @@
}
+
+ if(data.OrderType1 == "姘戜簨绾犵悍" || data.OrderType1 == "鍏朵粬绾犵悍")
+ {
+ data.OrderType2 = data.OrderType3;
+ }
+
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
{
@@ -1693,12 +1699,18 @@
foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+ if (!string.IsNullOrEmpty(challengeItemDTO.Law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ }
challengeItemDTO.sysCodeDtls = sysCodeDtls2;
}
}
else
{
- challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ var challengeItemDTO = new TChallengeItemDTO();
+ challengeItemDTO.Id = 1;
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { challengeItemDTO };
challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
}
@@ -1711,7 +1723,9 @@
}
else
{
- challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { new TChallengeItemDTO() };
+ var challengeItemDTO = new TChallengeItemDTO();
+ challengeItemDTO.Id = 1;
+ challengeletterDTO.challengeItemDTOs = new List<TChallengeItemDTO>() { challengeItemDTO };
challengeletterDTO.challengeItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
challengeletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
}
@@ -1753,7 +1767,7 @@
return new JsonResult(resultEntity);
}
- public IActionResult getQuestionLaw(string id, string no)
+ public IActionResult getQuestionLaw(string id, string no,string challengeItemId = "")
{
ResultEntity<SysCodeDtl> resultEntity = new ResultEntity<SysCodeDtl>();
resultEntity.Result = true;
@@ -1774,6 +1788,7 @@
// resultEntity.Message = sysCodeDtl.Contents;
//}
resultEntity.Message = no;
+ resultEntity.Remark = challengeItemId;
resultEntity.DataList = sysCodeDtls;
return new JsonResult(resultEntity);
@@ -2009,7 +2024,7 @@
challengeletterDTO.DocumentsDate = data.zhiyiDocumentsDate;
challengeletterDTO.Modifier = curentuser.Id;
challengeletterDTO.Modifytime = DateTime.Now;
- challengeletterDTO.Status = 2;
+ challengeletterDTO.Status = int.Parse(data.Status);
challengeletterDTO.RequestInfo = data.RequestInfo;
challengeletterDTO.PrintNum = data.PrintNum;
resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
@@ -2033,7 +2048,7 @@
challengeletterDTO.Modifytime = DateTime.Now;
challengeletterDTO.Creater = curentuser.Id;
challengeletterDTO.Createtime = challengeletterDTO.Modifytime;
- challengeletterDTO.Status = 2;
+ challengeletterDTO.Status = int.Parse(data.Status); ;
challengeletterDTO.RequestInfo = data.RequestInfo;
challengeletterDTO.PrintNum = data.PrintNum;
resultEntity = _cooperOrderService.saveChallengeletter(challengeletterDTO);
@@ -2072,11 +2087,29 @@
&& string.IsNullOrEmpty(data.Evidential[i])
))
{
+ string Law = "";
+ var challengeItemId = data.challengeItemId[i];
+ var Laws = data.Law;
+ var challengeItemIdlaw = data.challengeItemIdlaw;
+ if(Laws != null&& Laws.Length > 0)
+ {
+ for (int j = 0; j < Laws.Length; j++)
+ {
+ if(challengeItemId == challengeItemIdlaw[j])
+ {
+ Law += Laws[j] + ",";
+ }
+
+ }
+ if(!string.IsNullOrEmpty(Law))
+ Law = Law.TrimEnd(','); //绉婚櫎鏈�鍚庣殑閫楀彿
+ }
+
var challengeItemDTO = new TChallengeItemDTO();
challengeItemDTO.ChallengeId = challengeletterDTO.Id;
challengeItemDTO.Question = data.Question[i];
challengeItemDTO.Evidential = data.Evidential[i];
- //challengeItemDTO.Law = data.Law[i];
+ challengeItemDTO.Law = Law;
//challengeItemDTO.Lawcoment = data.Lawcoment[i];
challengeItemDTO.Sort = i;
resultEntity = _cooperOrderService.saveChallengeItem(challengeItemDTO);
@@ -2121,6 +2154,10 @@
foreach (var challengeItemDTO in challengeletterDTO.challengeItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == challengeItemDTO.Question).ToList();
+ if (!string.IsNullOrEmpty(challengeItemDTO.Law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => challengeItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ }
challengeItemDTO.sysCodeDtls = sysCodeDtls2;
}
}
@@ -2218,12 +2255,18 @@
foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
+ if (!string.IsNullOrEmpty(complaintItemDTO.Law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ }
complaintItemDTO.sysCodeDtls = sysCodeDtls2;
}
}
else
{
- complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ var complaintItemDTO = new TComplaintItemDTO();
+ complaintItemDTO.Id = 1;
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { complaintItemDTO };
complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
}
@@ -2249,7 +2292,9 @@
}
else
{
- complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { new TComplaintItemDTO() };
+ var complaintItemDTO = new TComplaintItemDTO();
+ complaintItemDTO.Id = 1;
+ complaintletterDTO.complaintItemDTOs = new List<TComplaintItemDTO>() { complaintItemDTO };
complaintletterDTO.complaintItemDTOs[0].sysCodeDtls = new List<SysCodeDtl>() { new SysCodeDtl() };
complaintletterDTO.complaintRespondentDTOs = new List<TComplaintRespondentDTO>() { new TComplaintRespondentDTO() };
complaintletterDTO.complaintShouquandaibiaoDTOs = new List<TComplaintShouquandaibiaoDTO>() { new TComplaintShouquandaibiaoDTO() };
@@ -2384,7 +2429,7 @@
complaintletterDTO.Modifier = curentuser.Id;
complaintletterDTO.Modifytime = DateTime.Now;
- complaintletterDTO.Status = 2;
+ complaintletterDTO.Status = int.Parse(data.Status);
complaintletterDTO.RequestInfo = data.RequestInfo;
complaintletterDTO.PrintNum = data.PrintNum;
complaintletterDTO.TsrId = data.TsrId;
@@ -2423,7 +2468,7 @@
complaintletterDTO.Modifytime = DateTime.Now;
complaintletterDTO.Creater = curentuser.Id;
complaintletterDTO.Createtime = complaintletterDTO.Modifytime;
- complaintletterDTO.Status = 2;
+ complaintletterDTO.Status = int.Parse(data.Status);
complaintletterDTO.RequestInfo = data.RequestInfo;
complaintletterDTO.PrintNum = data.PrintNum;
complaintletterDTO.TsrId = data.TsrId;
@@ -2517,11 +2562,29 @@
&& string.IsNullOrEmpty(data.Evidential[i])
))
{
+ string Law = "";
+ var complaintItemId = data.complaintItemId[i];
+ var Laws = data.Law;
+ var complaintItemIdlaw = data.complaintItemIdlaw;
+ if (Laws != null && Laws.Length > 0)
+ {
+ for (int j = 0; j < Laws.Length; j++)
+ {
+ if (complaintItemId == complaintItemIdlaw[j])
+ {
+ Law += Laws[j] + ",";
+ }
+
+ }
+ if (!string.IsNullOrEmpty(Law))
+ Law = Law.TrimEnd(','); //绉婚櫎鏈�鍚庣殑閫楀彿
+ }
+
var complaintItemDTO = new TComplaintItemDTO();
complaintItemDTO.ComplaintId = complaintletterDTO.Id;
complaintItemDTO.Question = data.Question[i];
complaintItemDTO.Evidential = data.Evidential[i];
- //complaintItemDTO.Law = data.Law[i];
+ complaintItemDTO.Law = Law;
//complaintItemDTO.Lawcoment = data.Lawcoment[i];
complaintItemDTO.Sort = i;
resultEntity = _cooperOrderService.saveComplaintItem(complaintItemDTO);
@@ -2584,6 +2647,10 @@
foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
{
var sysCodeDtls2 = sysCodeDtls1.Where(x => x.Classify1 == complaintItemDTO.Question).ToList();
+ if (!string.IsNullOrEmpty(complaintItemDTO.Law))
+ {
+ sysCodeDtls2 = sysCodeDtls2.Where(x => complaintItemDTO.Law.Split(',').Contains(x.Comments)).ToList();
+ }
complaintItemDTO.sysCodeDtls = sysCodeDtls2;
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 9962972..cf5f8ef 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -797,6 +797,36 @@
expertTestTopicpeizhiDTO.zongFenshu = aaaa.HasValue? aaaa.Value.ToString("0.##"):"";
expertTestTopicpeizhiDTO.zongFenzhi = expertTestTopicpeizhiDTO.Fenzhi.HasValue ? expertTestTopicpeizhiDTO.Fenzhi.Value.ToString("0.##") : "";
}
+ foreach (var zhishitype in zhishitypes)
+ {
+ var bbbb = expertTestTopicpeizhiDTOs.Where(x => x.Zhishitype == zhishitype.CodeSn).ToList();
+ if (bbbb.Count <= 0)
+ {
+ foreach (var topictype in topictypes)
+ {
+ ExpertTestTopicpeizhiDTO expertTestTopicpeizhiDTO = new ExpertTestTopicpeizhiDTO();
+ expertTestTopicpeizhiDTO.ShijianId = "01";
+ expertTestTopicpeizhiDTO.Topictype = topictype.CodeSn;
+ expertTestTopicpeizhiDTO.TopictypeName = topictype.Comments;
+
+ expertTestTopicpeizhiDTO.Zhishitype = zhishitype.CodeSn;
+ expertTestTopicpeizhiDTO.ZhishitypeName = zhishitype.Comments;
+
+ expertTestTopicpeizhiDTO.Fenshu = 0;
+ expertTestTopicpeizhiDTO.Fenzhi = 0;
+ expertTestTopicpeizhiDTO.FenshuName = "0";
+ expertTestTopicpeizhiDTO.FenzhiName = "0";
+ expertTestTopicpeizhiDTO.zongFenshu = "0";
+ expertTestTopicpeizhiDTO.zongFenzhi = "0";
+ expertTestTopicpeizhiDTOs.Add(expertTestTopicpeizhiDTO);
+ }
+
+ expertTestTopicpeizhiDTOs = expertTestTopicpeizhiDTOs.OrderBy(x => x.Topictype).ThenBy(x => x.Zhishitype).ToList();
+ }
+ }
+
+
+
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 800b4cb..b24828f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -14,6 +14,8 @@
using System.Threading.Tasks;
using zhengcaioa.IService;
using zhengcaioa.Models;
+using System.IdentityModel.Tokens.Jwt;
+using CommonToolsCore;
namespace zhengcaioa.Controllers
{
@@ -26,10 +28,12 @@
private readonly IUserService _userService;
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly ISysBaimingdanService _sysBaimingdanService;
+ private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
, ICooperatecustomCustomerService cooperatecustomCustomerService
- , ISysBaimingdanService sysBaimingdanService)
+ , ISysBaimingdanService sysBaimingdanService
+ , IFiOrderrecievemoneyService fiOrderrecievemoneyService)
{
_logger = logger;
_projectService = projectService;
@@ -38,6 +42,7 @@
_userService = userService;
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_sysBaimingdanService = sysBaimingdanService;
+ _fiOrderrecievemoneyService = fiOrderrecievemoneyService;
}
[CheckLogin]
public IActionResult Index()
@@ -374,294 +379,427 @@
HttpResponseMessage response = client.GetAsync(address).Result;
var res = response.Content.ReadAsStringAsync().Result;
var document = parser.ParseDocument(res);
- var time = document.QuerySelector("p");
- if (time != null)
+ if (address.StartsWith("https://zfcg.scsczt.cn/"))
{
- string timestr = time.TextContent;
- if (timestr.IndexOf("绯荤粺鍙戝竷鏃堕棿锛�") >= 0)
+ //鏂版嫑鏍囩綉绔�
+ var contentList = document.All.Where(m => m.Id == "print-content");
+ if (contentList != null)
{
- timestr = timestr.Replace("绯荤粺鍙戝竷鏃堕棿锛�", "");
- }
- projectDTO.StartTimestr = timestr;
- }
- var table = document.QuerySelector("table").QuerySelectorAll("tr");
- if (table != null)
- {
+ var cDocumet = contentList.First();
+ var title = cDocumet.QuerySelector("h1");
+ if (title != null)
+ projectDTO.Name = title.TextContent.Replace("\n", "").Trim();
-
- for (int i = 0; i < table.Length; i++)
- {
- var select = table[i].QuerySelector("td");
- if (select != null && select.TextContent.IndexOf("椤圭洰缂栧彿") >= 0)
+ var time = contentList.Where(m => m.Id == "noticeTime");
+ if (time != null)
{
- if (table[i + 1] != null)
+ var time1 = contentList.First();
+ var timestr = time1.QuerySelector("i");
+ if (timestr != null)
{
- var td1 = table[i + 1].QuerySelector("td");
- if (td1 != null)
- {
- projectDTO.Number = table[i + 1].QuerySelector("td").TextContent.Trim();//OuterHtml
- }
+ projectDTO.StartTimestr = timestr.TextContent;
}
-
}
- else if (select != null && select.TextContent.IndexOf("椤圭洰鍚嶇О") >= 0)
+
+ var Numbers = cDocumet.QuerySelectorAll("h4");
+ foreach(var Number in Numbers )
{
- if (table[i + 1] != null)
+ if(Number!=null&& Number.TextContent.Contains("椤圭洰缂栧彿"))
{
- var td1 = table[i + 1].QuerySelector("td");
- if (td1 != null)
- {
- projectDTO.Name = table[i + 1].QuerySelector("td").TextContent.Trim();//OuterHtml
- }
+ projectDTO.Number = Number.TextContent.Replace("涓�銆侀」鐩紪鍙凤細", "").Trim();
}
-
}
- else if (select != null && select.TextContent.IndexOf("涓爣锛堟垚浜わ級淇℃伅") >= 0)
+
+ var Numberss = cDocumet.QuerySelectorAll("p");
+ foreach (var Number in Numberss)
{
- projectDTO.Projectzhongbiaos = new List<ProjectzhongbiaoDTO>();
-
- if (table[i + 1] != null)
+ if (Number != null && Number.TextContent.Contains("椤圭洰缂栧彿"))
{
- var tds = table[i + 1].QuerySelectorAll("td");
- if (tds != null)
+ projectDTO.Number = Number.TextContent.Replace("椤圭洰缂栧彿锛�", "").Trim();
+ }
+ if (Number != null && Number.TextContent.Contains("棰勭畻閲戦"))
+ {
+ decimal caigouyusuanName = 0;
+ decimal.TryParse(Number.TextContent.Replace("棰勭畻閲戦锛�", "").Replace("鍏�", "").Replace(",", "").Trim(), out caigouyusuanName);
+
+ projectDTO.CaigouyusuanName = (caigouyusuanName/new decimal(10000)).ToString();
+ }
+ if (Number != null && Number.TextContent.Contains("搴熸爣鐞嗙敱"))
+ {
+ var Fbyy = Number.QuerySelector("span");
+ projectDTO.Fbyy = Fbyy.TextContent.Trim();
+ }
+ }
+ var Caigourennames = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticePurchase-purchaserOrgName");
+ if (Caigourennames != null && Caigourennames.ToList().Count > 0)
+ {
+ var Caigourenname = Caigourennames.First();
+ projectDTO.Caigourenname = Caigourenname.TextContent;
+ }
+ var Caigourenaddresss = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticePurchase-purchaserOrgAddress");
+ if (Caigourenaddresss != null && Caigourenaddresss.ToList().Count > 0)
+ {
+ var Caigourenaddress = Caigourenaddresss.First();
+ projectDTO.Caigourenaddress = Caigourenaddress.TextContent;
+ }
+ var Caigourencontacts = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticePurchase-purchaserLinkTel");
+ if (Caigourencontacts != null && Caigourencontacts.ToList().Count > 0)
+ {
+ var Caigourencontact = Caigourencontacts.First();
+ projectDTO.Caigourencontact = Caigourencontact.TextContent;
+ }
+ var Dailinames = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticeAgency-agencyName");
+ if (Dailinames != null && Dailinames.ToList().Count > 0)
+ {
+ var Dailiname = Dailinames.First();
+ projectDTO.Dailiname = Dailiname.TextContent;
+ }
+ var Dailiaddresss = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticeAgency-agentAddress");
+ if (Dailiaddresss != null && Dailiaddresss.ToList().Count > 0)
+ {
+ var Dailiaddress = Dailiaddresss.First();
+ projectDTO.Dailiaddress = Dailiaddress.TextContent;
+ }
+ var Dailicontacts = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticeAgency-agentLinkTel");
+ if (Dailicontacts != null && Dailicontacts.ToList().Count > 0)
+ {
+ var Dailicontact = Dailicontacts.First();
+ projectDTO.Dailicontact = Dailicontact.TextContent;
+ }
+
+ var table1 = cDocumet.QuerySelectorAll("div").Where(m => m.Id == "_notice_content_noticeBidResult-noticeBidResult");
+
+ if (table1 != null && table1.ToList().Count > 0)
+ {
+ var table = table1.First().QuerySelectorAll("table");
+ if (table != null && table.ToList().Count > 0)
+ {
+ projectDTO.Projectzhongbiaos = new List<ProjectzhongbiaoDTO>();
+ for (int i = 0; i < table.Length; i++)
{
- if (tds.Length > 1)
+ var td = table[i].QuerySelectorAll("td");
+ if (td.Length >= 3)
{
- string surpliername= table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
- var surpliernames = surpliername.Split(',');
- for(int j = 0;j< surpliernames.Length; j++)
+ var projectzhongbiao = new ProjectzhongbiaoDTO();
+ projectzhongbiao.Names = td[0].TextContent.Trim();
+ projectzhongbiao.Price = td[2].TextContent.Trim();
+ projectDTO.Projectzhongbiaos.Add(projectzhongbiao);
+ }
+ }
+ }
+
+ }
+
+ var zhuanjias = cDocumet.QuerySelectorAll("div").Where(m => m.ClassName == "noticeBidResult-noticeBidResult _notice_content_noticeBidResult-noticeBidResult expert dynamic-form-editor");
+ if (zhuanjias != null && zhuanjias.ToList().Count > 0)
+ {
+ var zhuanjia = zhuanjias.First();
+
+ projectDTO.Zhuanjia = zhuanjia.TextContent.Trim();//OuterHtml
+ }
+ }
+
+
+
+
+ }
+ else
+ {
+ //鏃ф嫑鏍囩綉绔�
+ var time = document.QuerySelector("p");
+ if (time != null)
+ {
+ string timestr = time.TextContent;
+ if (timestr.IndexOf("绯荤粺鍙戝竷鏃堕棿锛�") >= 0)
+ {
+ timestr = timestr.Replace("绯荤粺鍙戝竷鏃堕棿锛�", "");
+ }
+ projectDTO.StartTimestr = timestr;
+ }
+ var table = document.QuerySelector("table").QuerySelectorAll("tr");
+ if (table != null)
+ {
+
+
+ for (int i = 0; i < table.Length; i++)
+ {
+ var select = table[i].QuerySelector("td");
+ if (select != null && select.TextContent.IndexOf("椤圭洰缂栧彿") >= 0)
+ {
+ if (table[i + 1] != null)
+ {
+ var td1 = table[i + 1].QuerySelector("td");
+ if (td1 != null)
+ {
+ projectDTO.Number = table[i + 1].QuerySelector("td").TextContent.Trim();//OuterHtml
+ }
+ }
+
+ }
+ else if (select != null && select.TextContent.IndexOf("椤圭洰鍚嶇О") >= 0)
+ {
+ if (table[i + 1] != null)
+ {
+ var td1 = table[i + 1].QuerySelector("td");
+ if (td1 != null)
+ {
+ projectDTO.Name = table[i + 1].QuerySelector("td").TextContent.Trim();//OuterHtml
+ }
+ }
+
+ }
+ else if (select != null && select.TextContent.IndexOf("涓爣锛堟垚浜わ級淇℃伅") >= 0)
+ {
+ projectDTO.Projectzhongbiaos = new List<ProjectzhongbiaoDTO>();
+
+ if (table[i + 1] != null)
+ {
+ var tds = table[i + 1].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ if (tds.Length > 1)
{
- var projectzhongbiao = new ProjectzhongbiaoDTO();
- projectzhongbiao.Names = surpliernames[j].Trim();
- //if (table[i + 2] != null)
- //{
- // var tds2 = table[i + 2].QuerySelectorAll("td");
- // if (tds2 != null)
- // {
- // if (tds2.Length > 1)
- // {
- // string adress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
- // var adresss = adress.Split('锛�');
- // if (adresss.Length == surpliernames.Length)
- // {
- // projectzhongbiao.Names += " " + adresss[j].Trim();
- // }
- // else if (adresss.Length < surpliernames.Length)
- // {
- // if (j < adresss.Length)
- // {
- // projectzhongbiao.Names += " " + adresss[j].Trim();
- // }
- // else
- // {
- // projectzhongbiao.Names += " ";
- // }
-
- // }
- // else if (adresss.Length % surpliernames.Length == 0)
- // {
-
- // projectzhongbiao.Names += " " + adresss[(j + 1) * (adresss.Length / surpliernames.Length) - 1].Trim();
-
-
- // }
- // else
- // {
- // projectzhongbiao.Names += " " + adresss[j + (adresss.Length - surpliernames.Length)].Trim();
- // }
- // }
- // }
- //}
- if (table[i + 3] != null)
+ string surpliername = table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
+ var surpliernames = surpliername.Split(',');
+ for (int j = 0; j < surpliernames.Length; j++)
{
- var tds3 = table[i + 3].QuerySelectorAll("td");
- if (tds3 != null)
+ var projectzhongbiao = new ProjectzhongbiaoDTO();
+ projectzhongbiao.Names = surpliernames[j].Trim();
+ //if (table[i + 2] != null)
+ //{
+ // var tds2 = table[i + 2].QuerySelectorAll("td");
+ // if (tds2 != null)
+ // {
+ // if (tds2.Length > 1)
+ // {
+ // string adress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
+ // var adresss = adress.Split('锛�');
+ // if (adresss.Length == surpliernames.Length)
+ // {
+ // projectzhongbiao.Names += " " + adresss[j].Trim();
+ // }
+ // else if (adresss.Length < surpliernames.Length)
+ // {
+ // if (j < adresss.Length)
+ // {
+ // projectzhongbiao.Names += " " + adresss[j].Trim();
+ // }
+ // else
+ // {
+ // projectzhongbiao.Names += " ";
+ // }
+
+ // }
+ // else if (adresss.Length % surpliernames.Length == 0)
+ // {
+
+ // projectzhongbiao.Names += " " + adresss[(j + 1) * (adresss.Length / surpliernames.Length) - 1].Trim();
+
+
+ // }
+ // else
+ // {
+ // projectzhongbiao.Names += " " + adresss[j + (adresss.Length - surpliernames.Length)].Trim();
+ // }
+ // }
+ // }
+ //}
+ if (table[i + 3] != null)
{
- if (tds3.Length > 1)
+ var tds3 = table[i + 3].QuerySelectorAll("td");
+ if (tds3 != null)
{
- string jine = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
- var jines = jine.Split('锛�');
- if (jines.Length == surpliernames.Length)
+ if (tds3.Length > 1)
{
- projectzhongbiao.Price = jines[j].Trim().Replace("涓爣閲戦","").Replace(":", "").Replace("锛�", "");//OuterHtml
- }
- else if (jines.Length < surpliernames.Length)
- {
- if (j < jines.Length)
+ string jine = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();//OuterHtml
+ var jines = jine.Split('锛�');
+ if (jines.Length == surpliernames.Length)
{
- projectzhongbiao.Price = jines[j].Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
+ projectzhongbiao.Price = jines[j].Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");//OuterHtml
+ }
+ else if (jines.Length < surpliernames.Length)
+ {
+ if (j < jines.Length)
+ {
+ projectzhongbiao.Price = jines[j].Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
+ }
+ else
+ {
+ projectzhongbiao.Price = " ";
+ }
+
}
else
{
- projectzhongbiao.Price = " ";
+ if (j == 0)
+ {
+ projectzhongbiao.Price = jine.Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
+ }
+ else
+ {
+ projectzhongbiao.Price = jines[j + (jines.Length - surpliernames.Length)].Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
+ }
+
}
+
}
- else
- {
- if (j == 0)
- {
- projectzhongbiao.Price = jine.Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
- }
- else
- {
- projectzhongbiao.Price = jines[j + (jines.Length - surpliernames.Length)].Trim().Replace("涓爣閲戦", "").Replace(":", "").Replace("锛�", "");
- }
-
- }
-
-
}
+
+
+
}
-
-
+ projectDTO.Projectzhongbiaos.Add(projectzhongbiao);
}
- projectDTO.Projectzhongbiaos.Add(projectzhongbiao);
}
-
}
+
+
+
}
- }
-
-
-
+
+ }
+ else if (select != null && select.TextContent.IndexOf("璇勫涓撳") >= 0)
+ {
+ if (table[i + 1] != null)
+ {
+ var td1 = table[i + 1].QuerySelector("td");
+ if (td1 != null)
+ {
+ string ssss = table[i + 1].QuerySelector("td").TextContent.Trim();
+ ssss = ssss.Replace("锛堢粍闀匡級", "").Replace("(缁勯暱)", "").Replace(",", "銆�").Replace("锛堣瘎瀹＄粍闀匡級", "").Replace("(璇勫缁勯暱)", "").Replace("锛�", "銆�").Replace("璇勫缁勯暱锛�", "").Replace("缁勯暱锛�", "").Replace("缁勫憳锛�", "");
+ projectDTO.Zhuanjia = ssss;//OuterHtml
+ }
+ }
+
+ }
+ else if (table[i] != null && table[i].TextContent.IndexOf("閲囪喘浜轰俊鎭�") >= 0)
+ {
+ //StringBuilder remark = new StringBuilder();
+ // remark.Append("閲囪喘浜轰俊鎭�:");
+ if (table[i + 1] != null)
+ {
+ var tds = table[i + 1].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ // remark.Append(table[i + 1].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Caigourenname = table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ }
+ // remark.Append(" ");
+ }
+ if (table[i + 2] != null)
+ {
+ var tds = table[i + 2].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ // remark.Append(table[i + 2].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Caigourenaddress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ }
+ // remark.Append(" ");
+ }
+ if (table[i + 3] != null)
+ {
+ var tds = table[i + 3].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ // remark.Append(table[i + 3].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Caigourencontact = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ }
+ // remark.Append(" ");
+ }
+ // remark.Append(" \n");
+ // projectDTO.Remark = remark.ToString();
+ }
+
+ else if (table[i] != null && table[i].TextContent.IndexOf("閲囪喘浠ｇ悊鏈烘瀯淇℃伅") >= 0)
+ {
+ // StringBuilder remark = new StringBuilder();
+ // remark.Append("閲囪喘浠ｇ悊鏈烘瀯淇℃伅:");
+ if (table[i + 1] != null)
+ {
+ var tds = table[i + 1].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ // remark.Append(table[i + 1].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Dailiname = table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ // remark.Append(" ");
+ }
+ }
+ if (table[i + 2] != null)
+ {
+ var tds = table[i + 2].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ // remark.Append(table[i + 2].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Dailiaddress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ }
+ // remark.Append(" ");
+ }
+ if (table[i + 3] != null)
+ {
+ var tds = table[i + 3].QuerySelectorAll("td");
+ if (tds != null)
+ {
+ //remark.Append(table[i + 3].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
+ if (tds.Length > 1)
+ {
+ // remark.Append(table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
+ projectDTO.Dailicontact = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();
+ }
+ }
+ //remark.Append(" ");
+ }
+ // remark.Append(" \n");
+ //if (string.IsNullOrEmpty(projectDTO.Remark))
+ //{
+ // projectDTO.Remark = remark.ToString();
+ //}
+ //else
+ //{
+ // projectDTO.Remark += remark.ToString();
+ //}
+
+ }
+
+
+
}
- else if (select != null && select.TextContent.IndexOf("璇勫涓撳") >= 0)
- {
- if (table[i + 1] != null)
- {
- var td1 = table[i + 1].QuerySelector("td");
- if (td1 != null)
- {
- string ssss = table[i + 1].QuerySelector("td").TextContent.Trim();
- ssss = ssss.Replace("锛堢粍闀匡級", "").Replace("(缁勯暱)", "").Replace(",", "銆�").Replace("锛堣瘎瀹＄粍闀匡級", "").Replace("(璇勫缁勯暱)", "").Replace("锛�", "銆�").Replace("璇勫缁勯暱锛�", "").Replace("缁勯暱锛�", "").Replace("缁勫憳锛�","");
- projectDTO.Zhuanjia = ssss;//OuterHtml
- }
- }
-
- }
- else if (table[i] != null && table[i].TextContent.IndexOf("閲囪喘浜轰俊鎭�") >= 0)
- {
- //StringBuilder remark = new StringBuilder();
- // remark.Append("閲囪喘浜轰俊鎭�:");
- if (table[i + 1] != null)
- {
- var tds = table[i + 1].QuerySelectorAll("td");
- if (tds != null)
- {
- // remark.Append(table[i + 1].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Caigourenname = table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- }
- // remark.Append(" ");
- }
- if (table[i + 2] != null)
- {
- var tds = table[i + 2].QuerySelectorAll("td");
- if (tds != null)
- {
- // remark.Append(table[i + 2].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Caigourenaddress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- }
- // remark.Append(" ");
- }
- if (table[i + 3] != null)
- {
- var tds = table[i + 3].QuerySelectorAll("td");
- if (tds != null)
- {
- // remark.Append(table[i + 3].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Caigourencontact = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- }
- // remark.Append(" ");
- }
- // remark.Append(" \n");
- // projectDTO.Remark = remark.ToString();
- }
-
- else if (table[i] != null && table[i].TextContent.IndexOf("閲囪喘浠ｇ悊鏈烘瀯淇℃伅") >= 0)
- {
- // StringBuilder remark = new StringBuilder();
- // remark.Append("閲囪喘浠ｇ悊鏈烘瀯淇℃伅:");
- if (table[i + 1] != null)
- {
- var tds = table[i + 1].QuerySelectorAll("td");
- if (tds != null)
- {
- // remark.Append(table[i + 1].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Dailiname = table[i + 1].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- // remark.Append(" ");
- }
- }
- if (table[i + 2] != null)
- {
- var tds = table[i + 2].QuerySelectorAll("td");
- if (tds != null)
- {
- // remark.Append(table[i + 2].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Dailiaddress = table[i + 2].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- }
- // remark.Append(" ");
- }
- if (table[i + 3] != null)
- {
- var tds = table[i + 3].QuerySelectorAll("td");
- if (tds != null)
- {
- //remark.Append(table[i + 3].QuerySelectorAll("td")[0].TextContent.Trim());//OuterHtml)
- if (tds.Length > 1)
- {
- // remark.Append(table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim());//OuterHtml)
- projectDTO.Dailicontact = table[i + 3].QuerySelectorAll("td")[1].TextContent.Trim();
- }
- }
- //remark.Append(" ");
- }
- // remark.Append(" \n");
- //if (string.IsNullOrEmpty(projectDTO.Remark))
- //{
- // projectDTO.Remark = remark.ToString();
- //}
- //else
- //{
- // projectDTO.Remark += remark.ToString();
- //}
-
- }
-
-
}
-
-
}
+
+
+
+
+
return JsonConvert.SerializeObject(projectDTO);
@@ -724,7 +862,160 @@
try
{
+ string userid = "";
+ var headers = Request.Headers;
+ if (headers != null)
+ {
+ //string SecurityKey = _configuration.GetSection("SecurityKey").Value;
+ var keyId = headers["Authorization"].FirstOrDefault();
+ if (string.IsNullOrEmpty("keyId"))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒版潈闄愪俊鎭�";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+
+
+ JwtSecurityToken jwt = null;
+ var handler = new JwtSecurityTokenHandler();
+ var key1 = keyId.Replace("Bearer", "").Trim();
+ jwt = handler.ReadJwtToken(key1);
+ System.Security.Claims.Claim sss = jwt.Claims.Where(x => x.Type == "id").FirstOrDefault();
+ userid = sss.Value;
+
+ System.Security.Claims.Claim act = jwt.Claims.Where(x => x.Type == "act").FirstOrDefault();
+ AesClass aesClass = new AesClass();
+ RuleCollection ruleCollection = aesClass.DecryptRules(act.Value);
+ //鍒ゆ柇鏄惁鏈夋案涔呭鎵嬪垎鏋愭潈闄�
+ FiOrderrecievemoneyDTOSearch searchs = new FiOrderrecievemoneyDTOSearch();
+ searchs.page = 1;
+ searchs.rows = 10000;
+ searchs.Fkzt = "03";
+ searchs.OrderType = "02";
+ searchs.StartTime = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ searchs.EndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ searchs.HuiyuanId = userid;
+ searchs.OrderType1 = "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�";
+ ResultDataEntity<FiOrderrecievemoneyDTO> resultDataEntitys = _fiOrderrecievemoneyService.SearchByPaging(searchs);
+ if (resultDataEntitys.DataList ==null || resultDataEntitys.DataList.Count == 0)
+ //if (resultDataEntitys.DataList.Count > 0)
+ {
+ string token = key1.Length > 100 ? key1.Substring(key1.Length - 100) : key1;
+ if (ruleCollection.ZXDSFXLS > 0)
+ //if (ruleCollection.ZXDSFXLS == 0)
+ {
+ DateTime yuechu = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+ var zxdsfxlDTOs = _projectService.GetListZxdsfxl(userid, yuechu, yuechu.AddMonths(1),"1").OrderByDescending(x => x.Visittime).ToList();
+
+ if (zxdsfxlDTOs.Count > 30)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏈�30娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ else if (zxdsfxlDTOs.Count == 30 && zxdsfxlDTOs[0].Visittime.Value.Day != DateTime.Now.Day)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏈�30娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ var zxdsfxlDTOsnowdate = zxdsfxlDTOs.Where(x => x.Visittime >= DateTime.Now.Date && x.Visittime < DateTime.Now.AddDays(1).Date).OrderByDescending(x=>x.Visittime).ToList();
+ if (zxdsfxlDTOsnowdate.Count > 2)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏃�2娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ else if (zxdsfxlDTOsnowdate.Count == 2)
+ {
+
+ TimeSpan ts2 = new TimeSpan(zxdsfxlDTOsnowdate[0].Visittime.Value.Ticks);
+ TimeSpan ts1 = new TimeSpan(DateTime.Now.Ticks);
+ TimeSpan timeLoop = ts1.Subtract(ts2).Duration();
+ if (timeLoop.TotalMinutes > 15)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏃�2娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ else if (token != zxdsfxlDTOsnowdate[0].Token/* && zxdsfxlDTOs.Count == 30*/)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏃�2娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ }
+ else if(zxdsfxlDTOsnowdate.Count == 1)
+ {
+
+ TimeSpan ts2 = new TimeSpan(zxdsfxlDTOsnowdate[0].Visittime.Value.Ticks);
+ TimeSpan ts1 = new TimeSpan(DateTime.Now.Ticks);
+ TimeSpan timeLoop = ts1.Subtract(ts2).Duration();
+ if (token== zxdsfxlDTOsnowdate[0].Token && timeLoop.TotalMinutes > 15)
+ {
+ Response.StatusCode = 401;//閲嶆柊鐧婚檰
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰娆¤闂椂闂村凡缁忚秴杩�15鍒嗛挓锛岃閲嶆柊鐧婚檰锛�";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ else if(token != zxdsfxlDTOsnowdate[0].Token && zxdsfxlDTOs.Count == 30)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳湰鏈�30娆℃祴璇曟満浼氬凡缁忕敤瀹岋紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ }
+ if ( token != zxdsfxlDTOsnowdate[0].Token)
+ {
+ //瀛樺偍鏈鐨勮闂俊鎭�
+ ZxdsfxlDTO zxdsfxlDTO = new ZxdsfxlDTO();
+ //zxdsfxlDTO.Id = Guid.NewGuid().ToString() ;
+ zxdsfxlDTO.Huiyuanid = userid;
+ zxdsfxlDTO.Huiyuanname = ruleCollection.User;
+ zxdsfxlDTO.Visittime = DateTime.Now;
+ zxdsfxlDTO.Token = key1.Length > 100 ? key1.Substring(key1.Length - 100) : key1;
+ zxdsfxlDTO.Leixing = "1";
+ zxdsfxlDTO.RecStatus = "A";
+ zxdsfxlDTO.Creater = "1";
+ zxdsfxlDTO.Createtime = zxdsfxlDTO.Visittime.Value;
+ zxdsfxlDTO.Modifier = "1";
+ zxdsfxlDTO.Modifytime = zxdsfxlDTO.Visittime.Value;
+ ResultEntity resultEntity = _projectService.saveZxdsfxl(zxdsfxlDTO);
+ if (resultEntity.Result == false)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "璁块棶澶辫触";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ }
+
+ }
+ else
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳病鏈夋潈闄愯闂珵浜夊鎵嬪垎鏋�";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ }
+ }
+ else
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "浣犳病鏈夌櫥褰曪紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
//search.page = 1;
//search.rows = 1;
ResultDataEntity<ProjectDTO> resultDataEntity = _projectService.SearchByPaging(search);
@@ -737,7 +1028,7 @@
catch (Exception ex)
{
returnMsg.code = 2;
- returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.error = "绯荤粺鍙戠敓閿欒";
returnMsg.count = 0;
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index ab973af..d255ea0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -142,6 +142,10 @@
{
PltUserDTO.ShebaodateName = PltUserDTO.Shebaodate.Value.ToString("yyyy-MM-dd");
}
+ if (PltUserDTO.HetongDateEnd.HasValue)
+ {
+ PltUserDTO.HetongDateEndName = PltUserDTO.HetongDateEnd.Value.ToString("yyyy-MM-dd");
+ }
if (PltUserDTO.ShiyongDate.HasValue)
{
PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
index a72126f..23e8156 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
@@ -1343,7 +1343,7 @@
}
}
- if(data.Step == "璐㈠姟瀹℃壒")
+ if(data.Step == "璐㈠姟瀹℃壒" && data.Tongguojujue == "A")
{
WfRunProcessDTO wfRunProcessDTO = _wfRunProcessService.GetList(data.Id, "20").FirstOrDefault();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index 0461843..39bd473 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -176,17 +176,17 @@
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in OrderType)
{
- @if (!item.CodeSn.Equals(Model.OrderType))
+ @if (!item.CodeSn.Equals(Model.OrderType))
{
- <option value="@item.CodeSn" hassubinfo="true">
- @item.Comments
- </option>
+ <option value="@item.CodeSn" hassubinfo="true">
+ @item.Comments
+ </option>
}
else
{
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
+ <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+ @item.Comments
+ </option>
}
}
@@ -216,31 +216,38 @@
<input type="hidden" id="order_type2" name="order_type2" value="@Model.OrderType2" />
</div>
+ <label class="text-right col-sm-1 col-md-1 control-label" id="dingdanleixing4">璁㈠崟绫诲瀷2</label>
+ <div class="col-sm-2 col-md-2" id="dingdanleixing5">
+ <input class="form-control" label="瀹㈡埛鍚嶇О" name="OrderType3" id="OrderType3" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.OrderType2" maxlength="50">
+
+ </div>
+
+
@*<label class="text-right col-sm-1 col-md-1 control-label">椤圭洰<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2">
- <select id="OrderPro" class="form-control" name="OrderPro" data-placeholder="閫夋嫨 搴忓垪 ...">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in project)
+ <div class="col-sm-2 col-md-2">
+ <select id="OrderPro" class="form-control" name="OrderPro" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in project)
+ {
+ @if (!item.Id.Equals(Model.OrderPro))
{
- @if (!item.Id.Equals(Model.OrderPro))
- {
- <option value="@item.Id" hassubinfo="true">
- @item.Name
- </option>
- }
- else
- {
- <option value="@item.Id" hassubinfo="true" selected="selected">
- @item.Name
- </option>
- }
-
+ <option value="@item.Id" hassubinfo="true">
+ @item.Name
+ </option>
}
+ else
+ {
+ <option value="@item.Id" hassubinfo="true" selected="selected">
+ @item.Name
+ </option>
}
- </select>
+ }
+ }
- </div>*@
+ </select>
+
+ </div>*@
@@ -867,8 +874,8 @@
</select>
</div>
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍏憡鏈熼檺</label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label" id="tousuNoticeDatelabel">鍏憡鏈熼檺</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata" id="tousuNoticeDatediv">
<input class="form-control" label="鍏憡鏈熼檺" name="tousuNoticeDate" id="tousuNoticeDate" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.NoticeDateName" readonly="readonly">
</div>
@@ -903,8 +910,8 @@
</select>
</div>
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍏憡鏈熼檺</label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label" id="tousuResultnoticeDatelabel">鍏憡鏈熼檺</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata" id="tousuResultnoticeDatediv">
<input class="form-control" label="鍏憡鏈熼檺" name="tousuResultnoticeDate" id="tousuResultnoticeDate" labtype="txt" addvisible="true" maxlength="50" editvisible="true" reg="" ismust="true" type="text" value="@complaintletterDTO.ResultnoticeDateName" readonly="readonly">
</div>
@@ -977,7 +984,8 @@
laydate({ elem: "#zhiyiDocumentsDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
laydate({ elem: "#tousuResultnoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
laydate({ elem: "#tousuNoticeDate", format: 'YYYY-MM-DD', istime: true, event: "focus" });
-
+ $("#dingdanleixing4").hide();
+ $("#dingdanleixing5").hide();
$(document).ready(function () {
if ("@ShouliStatus" != "1") {
@@ -1399,6 +1407,13 @@
$("#dingdanleixing2").hide();
$("#dingdanleixing3").hide();
+ if (sheng == "姘戜簨绾犵悍" || sheng == "鍏朵粬绾犵悍") {
+ $("#dingdanleixing4").show();
+ $("#dingdanleixing5").show();
+ } else {
+ $("#dingdanleixing4").hide();
+ $("#dingdanleixing5").hide();
+ }
} else {
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -1533,6 +1548,13 @@
if (order_type != "02" || order_type1 == "鐢佃瘽鍜ㄨ" || order_type1 == "褰撻潰鍜ㄨ" || order_type1 == "浠ｆ嫙璐ㄧ枒绛斿" || order_type1 == "浠ｆ嫙鎶曡瘔澶勭悊鍐冲畾" || order_type1 == "绔炰簤瀵规墜鍜岃瘎瀹′笓瀹跺弬鍔犳斂搴滈噰璐暟鎹俊鎭煡璇�" || order_type1 == "鏀块噰璐�") {
$("#dingdanleixing2").hide();
$("#dingdanleixing3").hide();
+ if (order_type1 == "姘戜簨绾犵悍" || order_type1 == "鍏朵粬绾犵悍") {
+ $("#dingdanleixing4").show();
+ $("#dingdanleixing5").show();
+ } else {
+ $("#dingdanleixing4").hide();
+ $("#dingdanleixing5").hide();
+ }
} else {
var aaa = '';
@@ -1928,6 +1950,36 @@
}
}
+
+
+ $("#tousuIsNotice").change(function () {
+
+ var OrderNum = $("#tousuIsNotice").val();
+ if (OrderNum == 'D') {
+ $("#tousuNoticeDatelabel").hide();
+ $("#tousuNoticeDatediv").hide();
+ } else {
+ $("#tousuNoticeDatelabel").show();
+ $("#tousuNoticeDatediv").show();
+ }
+
+ });
+
+
+ $("#tousuIsResultnotice").change(function () {
+
+ var OrderNum = $("#tousuIsResultnotice").val();
+ if (OrderNum == 'D') {
+ $("#tousuResultnoticeDatelabel").hide();
+ $("#tousuResultnoticeDatediv").hide();
+ } else {
+ $("#tousuResultnoticeDatelabel").show();
+ $("#tousuResultnoticeDatediv").show();
+ }
+
+ });
+
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
index 5a33af5..dadd4a8 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditTousushu.cshtml
@@ -713,7 +713,7 @@
}
</select>
-
+ <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
</div>
@@ -733,25 +733,33 @@
{
@if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
-
- </div>
+ </div>
}
else
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
-
- </div>
+ </div>
}
}
</div>
@@ -782,7 +790,7 @@
}
</select>
-
+ <input type="hidden" name="complaintItemId" value="@complaintItemDTOs[i].Id" />
</div>
@@ -800,25 +808,33 @@
{
@if (complaintItemDTOs[i].sysCodeDtls.Count == 1)
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
-
- </div>
+ </div>
}
else
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(complaintItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(complaintItemDTOs[i].sysCodeDtls[j].Classify2)锛欯complaintItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
-
- </div>
+ <input type="hidden" name="Law" value="@complaintItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="complaintItemIdlaw" value="@complaintItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
+ </div>
}
}
</div>
@@ -895,14 +911,18 @@
<div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
<div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
@*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
- <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
- </a>*@
- <a class="btn btn-success" href="javascript:void(0)" onclick="printPosition();" style="margin-left:4px; border-radius:4px;">
- <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎵撳嵃</span>
+ <i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
+ </a>*@
+ @*<a class="btn btn-success" href="javascript:void(0)" onclick="printPosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎵撳嵃</span>
+ </a>*@
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition(1);" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">淇濆瓨</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition(2);" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
+ <input type="hidden" id="Status" name="Status" value="0" />
</div>
</div>
@@ -972,8 +992,8 @@
// 淇濆瓨宀椾綅淇℃伅
- var savePosition = function () {
-
+ var savePosition = function (Status) {
+
if ($.trim($("#TsrName").val()) == '') {
toastr.warning("鎶曡瘔浜轰笉鑳戒负绌�");
return;
@@ -1042,7 +1062,7 @@
toastr.warning("鍓湰鏁伴噺涓嶈兘涓虹┖");
return;
}
-
+ $("#Status").val(Status);
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
@@ -1171,11 +1191,11 @@
function Questionchangge(i) {
-
+ var challengeItemId = document.getElementsByName("complaintItemId")[i].value;
var sss = document.getElementsByName("Question")[i].value;
$.ajax({
type: "GET",
- url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i,
+ url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i + "&challengeItemId=" + challengeItemId,
dataType: "json",
global: false,
data: "",
@@ -1195,7 +1215,11 @@
銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-
+<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+ <input type="hidden" name="complaintItemIdlaw" value="` + data.Remark + `" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
</div>
`;
} else {
@@ -1206,7 +1230,11 @@
銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-
+<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+ <input type="hidden" name="complaintItemIdlaw" value="` + data.Remark + `" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
</div>
`;
}
@@ -1439,7 +1467,7 @@
}
</select>
-
+ <input type="hidden" name="complaintItemId" value="`+ (guid()) + `" />
</div>
</div>
@@ -1523,6 +1551,21 @@
}
}
+
+
+ function dellawBtn(obj) {
+
+ $(obj).parent().parent().remove();
+
+
+ }
+
+ function guid() {
+ function S4() {
+ return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ }
+ return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
index 4dbb8e6..c0c1d95 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/EditZhiyihan.cshtml
@@ -331,7 +331,7 @@
}
</select>
-
+ <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
</div>
@@ -350,25 +350,31 @@
{
@if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
- </div>
-
-
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
+ </div>
}
else
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
- </div>
-
-
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
+ </div>
}
@@ -402,7 +408,7 @@
}
</select>
-
+ <input type="hidden" name="challengeItemId" value="@challengeItemDTOs[i].Id" />
</div>
@if (i == 0)
{
@@ -427,25 +433,33 @@
{
@if (challengeItemDTOs[i].sysCodeDtls.Count == 1)
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
-
- </div>
+ </div>
}
else
{
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
- <div class="col-sm-8 col-md-8">
- 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
- </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">娉曞緥渚濇嵁@(j+1)</label>
+ <div class="col-sm-8 col-md-8">
+ 銆夽(challengeItemDTOs[i].sysCodeDtls[j].CodeSn)銆婡(challengeItemDTOs[i].sysCodeDtls[j].Classify2)锛欯challengeItemDTOs[i].sysCodeDtls[j].Contents
+ </div>
+ <input type="hidden" name="Law" value="@challengeItemDTOs[i].sysCodeDtls[j].Comments" />
+ <input type="hidden" name="challengeItemIdlaw" value="@challengeItemDTOs[i].Id" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
-
- </div>
+ </div>
}
}
</div>
@@ -531,12 +545,16 @@
@*<a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>*@
- <a class="btn btn-success" href="javascript:void(0)" onclick="printPosition();" style="margin-left:4px; border-radius:4px;">
- <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎵撳嵃</span>
+ @*<a class="btn btn-success" href="javascript:void(0)" onclick="printPosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎵撳嵃</span>
+ </a>*@
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition(1);" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">淇濆瓨</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition(2);" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
+ <input type="hidden" id="Status" name="Status" value="0" />
</div>
</div>
@@ -601,7 +619,7 @@
// 淇濆瓨宀椾綅淇℃伅
- var savePosition = function () {
+ var savePosition = function (Status) {
if ($.trim($("#GysName").val()) == '') {
toastr.warning("璐ㄧ枒渚涘簲鍟嗕笉鑳戒负绌�");
@@ -644,7 +662,7 @@
toastr.warning("鍓湰鏁伴噺涓嶈兘涓虹┖");
return;
}
-
+ $("#Status").val(Status);
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
@@ -716,9 +734,11 @@
function Questionchangge(i) {
var sss = document.getElementsByName("Question")[i].value;
+
+ var challengeItemId = document.getElementsByName("challengeItemId")[i].value;
$.ajax({
type: "GET",
- url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i,
+ url: "/CooperOrder/getQuestionLaw?id=" + sss + "&no=" + i + "&challengeItemId=" + challengeItemId,
dataType: "json",
global: false,
data: "",
@@ -739,7 +759,11 @@
銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-
+<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+ <input type="hidden" name="challengeItemIdlaw" value="` + data.Remark + `" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
</div>
`;
@@ -752,7 +776,11 @@
銆奰 + data.DataList[i].CodeSn + `銆媊 + data.DataList[i].Classify2 + `锛歚 + data.DataList[i].Contents + `
</div>
-
+<input type="hidden" name="Law" value="` + data.DataList[i].Comments + `" />
+ <input type="hidden" name="challengeItemIdlaw" value="` + data.Remark + `" />
+ <div class="col-sm-1 col-md-1" grouptype="Vdata">
+ <button type="button" class="delBtn" onclick="dellawBtn(this)" data-type="1" style="width:32px">-</button>
+ </div>
</div>
`;
@@ -845,12 +873,12 @@
function addzhiyishixiang(obj) {
var sss = document.getElementsByName("Question").length;
if (document.getElementsByName("Question").length == 1) {
-
+
$('#Questionlabel').text("璐ㄧ枒浜嬮」1");
$('#Evidentiallabel').text("浜嬪疄渚濇嵁1");
}
- $('#zhiyishixiang').append(` <div class="zhiyishixiangitem">
+ $('#zhiyishixiang').append(` <div class="zhiyishixiangitem">
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璐ㄧ枒浜嬮」`+ (sss+1) + `</label>
<div class="col-sm-4 col-md-4" grouptype="Vdata">
@@ -867,7 +895,7 @@
}
</select>
-
+ <input type="hidden" name="challengeItemId" value="`+ (guid()) + `" />
</div>
</div>
@@ -936,8 +964,22 @@
$('#zhiyishixiang').find('.zhiyishixiangitem:last').remove();
}
- }
+ }
}
+ function dellawBtn(obj) {
+
+ $(obj).parent().parent().remove();
+
+
+ }
+
+ function guid() {
+ function S4() {
+ return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+ }
+ return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+ }
+
</script>
</body>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
index aeb0aa0..52034a6 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/IndexWenshu.cshtml
@@ -41,7 +41,7 @@
];
- dataUrl = "/CooperOrder/GetListWenshu";
+ dataUrl = "/CooperOrder/GetListWenshu?Status=1";
searchCol = [
{ label: '椤圭洰鍚嶇О', name: 'XmName', labtype: 'txt', hidden: false },
{ label: '椤圭洰缂栧彿', name: 'XmCode', labtype: 'txt', hidden: false },
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
index 3d045b4..97e58a6 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/PrintZhiyihan.cshtml
@@ -125,7 +125,7 @@
<td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@challengecomplaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
</tr>
<tr>
- <td align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;font-size:13pt;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span></td>
+ <td align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@challengecomplaintShouquandaibiaoDTOs[i].Dizhi </span></td>
<td align="left">@(string.IsNullOrEmpty(challengecomplaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪")@(i!=0?(i+""):"")锛�<span style="width:160px;">@challengecomplaintShouquandaibiaoDTOs[i].Youbian </span></td>
</tr>
}
@@ -133,7 +133,7 @@
<td colspan="2"><b>浜屻�佽川鐤戦」鐩熀鏈儏鍐�</b></td>
</tr>
<tr>
- <td colspan="2" align="left">璐ㄧ枒椤圭洰鐨勫悕绉帮細<span style="width:415px;font-size:13pt;">@Model.XmName </span></td>
+ <td colspan="2" align="left">璐ㄧ枒椤圭洰鐨勫悕绉帮細<span style="width:415px;">@Model.XmName </span></td>
</tr>
<tr>
<td align="left">璐ㄧ枒椤圭洰鐨勭紪鍙凤細<span style="width:180px;">@Model.XmCode </span></td>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
index 0f4e6b3..292f62f 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Printtousushu.cshtml
@@ -133,8 +133,8 @@
<td colspan="2" align="left">鑱旂郴鐢佃瘽@(i!=0?(i+""):"")锛�<span style="width:480px;">@complaintShouquandaibiaoDTOs[i].Lianxidianhua </span></td>
</tr>
<tr>
- <td align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;font-size:13pt;">@complaintShouquandaibiaoDTOs[i].Dizhi </span></td>
- <td align="left">@(string.IsNullOrEmpty(complaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪锛�")@(i!=0?(i+""):"")锛�<span style="width:160px;">@complaintShouquandaibiaoDTOs[i].Youbian </span></td>
+ <td align="left">鍦板潃@(i!=0?(i+""):"")锛�<span style="width:290px;">@complaintShouquandaibiaoDTOs[i].Dizhi </span></td>
+ <td align="left">@(string.IsNullOrEmpty(complaintShouquandaibiaoDTOs[i].Youbian)?"":"閭紪锛�")@(i!=0?(i+""):"")<span style="width:160px;">@complaintShouquandaibiaoDTOs[i].Youbian </span></td>
</tr>
}
@for (int i = 0; i < complaintRespondentDTOs.Count; i++)
@@ -145,7 +145,7 @@
<td colspan="2" align="left">琚姇璇変汉锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
</tr>
<tr>
- <td align="left">鍦板潃锛�<span style="width:290px;font-size:13pt;">@complaintRespondentDTOs[i].Address </span></td>
+ <td align="left">鍦板潃锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span></td>
<td align="left">@(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
</tr>
<tr>
@@ -159,7 +159,7 @@
<td colspan="2" align="left">琚姇璇変汉@(i+1)锛�<span style="width:480px;">@complaintRespondentDTOs[i].Respondent </span></td>
</tr>
<tr>
- <td align="left">鍦板潃@(i+1)锛�<span style="width:290px;font-size:13pt;">@complaintRespondentDTOs[i].Address </span></td>
+ <td align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintRespondentDTOs[i].Address </span></td>
<td align="left">@(string.IsNullOrEmpty(complaintRespondentDTOs[i].Postcode)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintRespondentDTOs[i].Postcode </span></td>
</tr>
<tr>
@@ -178,11 +178,11 @@
<td colspan="2" align="left">鐩稿叧渚涘簲鍟嗭細<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
</tr>
<tr>
- <td align="left">鍦板潃锛�<span style="width:290px;font-size:13pt;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+ <td align="left">鍦板潃锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
<td align="left">@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
</tr>
<tr>
- <td align="left">鑱旂郴浜猴細<span style="width:290px;font-size:13pt;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+ <td align="left">鑱旂郴浜猴細<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
<td align="left">鑱旂郴鐢佃瘽锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
</tr>
}
@@ -192,11 +192,11 @@
<td colspan="2" align="left">鐩稿叧渚涘簲鍟咢(i+1)锛�<span style="width:480px;">@complaintGongyingshangDTOs[i].Gongytingshang </span></td>
</tr>
<tr>
- <td align="left">鍦板潃@(i+1)锛�<span style="width:290px;font-size:13pt;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+ <td align="left">鍦板潃@(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
<td align="left">@(string.IsNullOrEmpty(complaintGongyingshangDTOs[i].Youbian)?"":"閭紪锛�")@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
</tr>
<tr>
- <td align="left">鑱旂郴浜篅(i+1)锛�<span style="width:290px;font-size:13pt;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
+ <td align="left">鑱旂郴浜篅(i+1)锛�<span style="width:290px;">@complaintGongyingshangDTOs[i].Dizhi </span></td>
<td align="left">鑱旂郴鐢佃瘽@(i+1)锛�<span style="width:160px;">@complaintGongyingshangDTOs[i].Youbian </span></td>
</tr>
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
index 83b1b93..086a35a 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
@@ -41,7 +41,7 @@
];
- dataUrl = "/CooperOrder/GetListWenshu";
+ dataUrl = "/CooperOrder/GetListWenshu?Status=2";
searchCol = [
{ label: '鏃堕棿', name: 'XdTime', labtype: 'datearea', hidden: false },
{ label: '鏂囦功绫诲埆', name: 'Wenshuleixing', labtype: 'combox', hidden: false, data: JSON.parse(Wenshuleixing) },
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
index 36dfabd..9cc3549 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
@@ -349,7 +349,11 @@
</div>
-
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍓╀綑濂楅浠舵暟</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="瀹㈡埛鍚嶇О" name="Taocanjianshu" id="Taocanjianshu" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@(Model.Taocanjianshu.HasValue?Model.Taocanjianshu.Value.ToString():"")" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^[1-9]{1}[0-9]*$/)">
+
+ </div>
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index f01c1d7..ecfa364 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -31,6 +31,7 @@
{ label: '涓氬姟缁忕悊', name: 'YwjlName', labtype: 'txt', hidden: false, width: 100 },
{ label: '璁㈠崟鏁伴噺', name: 'Ordercount', labtype: 'txt', hidden: false, width: 100 },
{ label: '璁㈠崟浜у��', name: 'Moneycount', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鍓╀綑濂楅浠舵暟', name: 'Taocanjianshu', labtype: 'txt', hidden: false, width: 100 },
{
label: '瀹㈡埛鍥炶', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml
index dda16be..f0ed0b8 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/EditResult.cshtml
@@ -254,9 +254,7 @@
if (data.Result) {
// parent._afterSave(true);
parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
- var Topictype = $("#Topictype").val();
- var Zhishitype = $("#Zhishitype").val();
- var Area = $("#Area").val();
+
window.location = "/ExpertTestTopic/EditResult";
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
index 86ef060..91b8c57 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
@@ -864,6 +864,10 @@
starttime.val(data.StartTimestr);
var Number = $("#Number");
Number.val(data.Number);
+ var Caigouyusuan = $("#Caigouyusuan");
+ Caigouyusuan.val(data.CaigouyusuanName);
+ var Fbyy = $("#Fbyy");
+ Fbyy.val(data.Fbyy);
var Name = $("#Name");
Name.val(data.Name);
var Zhuanjia = $("#Zhuanjia");
@@ -902,7 +906,7 @@
var oTr = document.createElement('div');
$('#addlist_1').append(oTr);
$(oTr).html('<div class="clearfix layer-area" style="padding-bottom:15px;"> <label class="text-right col-sm-1 col-md-1 control-label">涓爣锛堟垚浜わ級渚涘簲鍟�</label>'
- +'<div class="col-sm-6 col-md-6">'
+ +'<div class="col-sm-4 col-md-4">'
+ '<input class="form-control" label="涓爣锛堟垚浜わ級渚涘簲鍟�" name="Names" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="' + data.Projectzhongbiaos[i].Names+'">'
+ '</div>'
+ '<label class="text-right col-sm-1 col-md-1 control-label" style="width:30px;">鎶ヤ环</label>'
@@ -910,6 +914,10 @@
+ '<input class="form-control" label="涓爣锛堟垚浜わ級渚涘簲鍟�" name="Price" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="' + data.Projectzhongbiaos[i].Price +'">'
+ '<input type="hidden" name="ZhongbiaoId" value="" />'
+ ' </div>'
+ + ' <label class="text-right col-sm-1 col-md-1 control-label" style="width:60px;">璇勫寰楀垎</label>'
+ + ' <div class="col-sm-2 col-md-2" style="width:10%;">'
+ + ' <input class="form-control" label="璇勫寰楀垎" name="Defen" id="Defen" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)" >'
+ +' </div>'
+ '<div class="col-sm-1 col-md-1" style="width:100px;">'
+ '<button type = "button" onclick = "_pageAdd(\'' + data.Projectzhongbiaos[i].Names +'\')" data - type="1" style="color:red;" >娣诲姞渚涘簲鍟�</button >'
+ ' </div>'
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
index f5df10d..adfd9eb 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Indexlaw.cshtml
@@ -9,17 +9,17 @@
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '璐ㄧ枒浜嬮」', name: 'Classify1Name', labtype: 'txt', hidden: false, width: 300,
+ label: '璐ㄧ枒浜嬮」', name: 'Classify1Name', labtype: 'txt', hidden: false, width: 100,
},
{
- label: '缂栫爜', name: 'CodeSn', labtype: 'txt', hidden: false, width: 50,
+ label: '缂栫爜', name: 'CodeSn', labtype: 'txt', hidden: false, width: 20,
formatter: function (cellvalue, options, rowObject) {
return "<a onclick=\"OpenWindow('" + rowObject.Comments + "','98%','100%', '/SysCode/Editlaw?Classify1=" + rowObject.Classify1 + "')\" >" + cellvalue + "</a>";
}
},
{
- label: '娉曞緥鍚嶇О', name: 'CommentsName', labtype: 'txt', hidden: false, width: 100,
+ label: '娉曞緥鍚嶇О', name: 'CommentsName', labtype: 'txt', hidden: false, width: 150,
},
{
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index d386d90..8976f7b 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -445,48 +445,53 @@
<div class="col-sm-2 col-md-2">
<input id="Shebaodate" class="form-control" label="璁¤柂鏃堕棿" name="Shebaodate" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShebaodateName" readonly="readonly">
</div>
-
+
<label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鐢佃剳MAC</label>
<div class="col-sm-2 col-md-2">
<input id="IpMac" class="form-control" label="宸ヤ綔鐢佃剳MAC" name="IpMac" labtype="txt" addvisible="true" maxlength="30" editvisible="true" reg="" ismust="true" type="text" value="@Model.IpMac">
</div>
+ <label class="text-right col-sm-1 col-md-1 control-label">鍚堝悓鍒版湡鏃� </label>
+ <div class="col-sm-2 col-md-2">
+ <input id="HetongDateEnd" class="form-control" label="鍚堝悓鍒版湡鏃�" name="HetongDateEnd" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.HetongDateEndName" readonly="readonly">
+ </div>
</div>
+
@*<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-right col-sm-1 col-md-1 control-label">鍩烘湰宸ヨ祫 </label>
- <div class="col-sm-2 col-md-2">
- <div class="col-sm-9 col-md-9" style="padding:0">
- <input class="form-control" label="鍩烘湰宸ヨ祫" name="jibensalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jibensalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
- </div>
- <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
- <label class="text-left control-label">鍏�/鏈�</label>
- </div>
- </div>
+ <label class="text-right col-sm-1 col-md-1 control-label">鍩烘湰宸ヨ祫 </label>
+ <div class="col-sm-2 col-md-2">
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="鍩烘湰宸ヨ祫" name="jibensalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jibensalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/鏈�</label>
+ </div>
+ </div>
- <label class="text-right col-sm-1 col-md-1 control-label">淇濆瘑璐�</label>
- <div class="col-sm-2 col-md-2">
+ <label class="text-right col-sm-1 col-md-1 control-label">淇濆瘑璐�</label>
+ <div class="col-sm-2 col-md-2">
- <div class="col-sm-9 col-md-9" style="padding:0">
- <input class="form-control" label="淇濆瘑璐�" name="baomisalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.baomisalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
- </div>
- <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
- <label class="text-left control-label">鍏�/鏈�</label>
- </div>
- </div>
- <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔琛ヨ创</label>
- <div class="col-sm-2 col-md-2">
- <div class="col-sm-9 col-md-9" style="padding:0">
- <input class="form-control" label="宸ヤ綔琛ヨ创" name="jintiesalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jintiesalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
- </div>
- <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
- <label class="text-left control-label">鍏�/骞�</label>
- </div>
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="淇濆瘑璐�" name="baomisalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.baomisalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/鏈�</label>
+ </div>
+ </div>
+ <label class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔琛ヨ创</label>
+ <div class="col-sm-2 col-md-2">
+ <div class="col-sm-9 col-md-9" style="padding:0">
+ <input class="form-control" label="宸ヤ綔琛ヨ创" name="jintiesalary" labtype="txt" addvisible="true" maxlength="20" editvisible="true" reg="" ismust="true" type="text" value="@Model.jintiesalary" oninput="if(value.length>8)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ </div>
+ <div class="col-sm-3 col-md-3" style="padding:0 0 0 10px">
+ <label class="text-left control-label">鍏�/骞�</label>
+ </div>
- </div>
+ </div>
-
- </div>*@
+
+ </div>*@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">棰勫彂宸ヨ祫 </label>
@@ -853,7 +858,7 @@
laydate({ elem: "#Indate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
laydate({ elem: "#Shebaodate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
laydate({ elem: "#Outdate", format: 'YYYY-MM-DD', istime: false, event: "focus" });
-
+ laydate({ elem: "#HetongDateEnd", format: 'YYYY-MM-DD', istime: false, event: "focus" });
var delPosition = function () {
diff --git a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
index 98a0b0a..603e858 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
@@ -93,6 +93,13 @@
//}
},
{
+ label: '鍚堝悓鍒版湡鏃�', name: 'HetongDateEndName', labtype: 'txt', hidden: false, width: 100
+ //,
+ //formatter: function (cellvalue, options, rowObject) {
+ // return "<span style='color:" + rowObject.Coler + ";'>" + cellvalue + "</span>";
+ //}
+ },
+ {
label: '妗ｆ鏌ヨ', name: 'Education', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
return "<a onclick=\"OpenWindow('濂栨儵','98%','100%', '/AdmBreakPrecedent/IndexRenshi?UserId=" + rowObject.Id + "')\" >濂栨儵</a> "
--
Gitblit v1.9.1