From e1064dd08bba4326d19c81a0b9f4da18c2fa462d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 24 十一月 2022 13:22:42 +0800
Subject: [PATCH] 废标公告写入oa
---
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 259 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index e23b9a9..eb6f92f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -16,6 +16,7 @@
using zhengcaioa.Models;
using System.IdentityModel.Tokens.Jwt;
using CommonToolsCore;
+using System.Transactions;
namespace zhengcaioa.Controllers
{
@@ -299,8 +300,21 @@
}
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
+ {
+ resultEntity = _projectService.saveLiaotian(data);
+ scope.Complete();
+ }
- ResultEntity resultEntity = _projectService.saveLiaotian(data);
+
return JsonConvert.SerializeObject(resultEntity);
}
@@ -371,6 +385,13 @@
ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
ViewBag.flbx = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.ShiFouyReasonname = _liaotianService.GetSYScode("Project", "ShiFouyReasonname").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
+
+ ViewBag.wanshan = _liaotianService.GetSYScode("Project", "wanshan").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
return View();
}
@@ -434,6 +455,15 @@
}
}
+ var feibiaoliyous = cDocumet.QuerySelectorAll("div").Where(m => m.Id == "_notice_content_reason-reason");
+ if (feibiaoliyous != null && feibiaoliyous.ToList().Count > 0)
+ {
+ var feibiaoliyou = feibiaoliyous.First();
+ projectDTO.Fbyy = feibiaoliyou.TextContent.Replace("\n", "").Replace("\t", "");
+ projectDTO.Fblx = "缁堟閲囪喘";
+ }
+
+
var Numbers = cDocumet.QuerySelectorAll("h4");
foreach(var Number in Numbers )
{
@@ -461,7 +491,15 @@
{
var Fbyy = Number.QuerySelector("span");
projectDTO.Fbyy = Fbyy.TextContent.Trim();
+ projectDTO.Fblx = "鍋滄璇勫";
}
+ if (Number != null && Number.TextContent.Contains("缁堟鍘熷洜"))
+ {
+ var Fbyy = Number.QuerySelector("span");
+ projectDTO.Fbyy = Fbyy.TextContent.Trim();
+ projectDTO.Fblx = "鍋滄璇勫";
+ }
+
}
var Caigourennames = cDocumet.QuerySelectorAll("span").Where(m => m.Id == "_notice_content_noticePurchase-purchaserOrgName");
if (Caigourennames != null && Caigourennames.ToList().Count > 0)
@@ -549,6 +587,14 @@
}
projectDTO.StartTimestr = timestr;
}
+
+ var tittle = document.QuerySelector("h1");
+ if (tittle != null)
+ {
+ string tittlestr = tittle.TextContent;
+
+ projectDTO.Name = tittlestr;
+ }
var table = document.QuerySelector("table").QuerySelectorAll("tr");
if (table != null)
{
@@ -569,14 +615,34 @@
}
}
- else if (select != null && select.TextContent.IndexOf("椤圭洰鍚嶇О") >= 0)
+ //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)
{
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
+ projectDTO.Fbyy = table[i + 1].QuerySelector("td").TextContent.Trim();//OuterHtml
+ if (projectDTO.Fbyy.IndexOf("缁堟")<0)
+ {
+ projectDTO.Fblx = "鍋滄璇勫";
+ }
+ else
+ {
+ projectDTO.Fblx = "缁堟閲囪喘";
+ }
}
}
@@ -1113,5 +1179,195 @@
return new JsonResult(returnMsg);
}
+
+
+
+ /// <summary>
+ /// 璐ㄧ枒
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public IActionResult Zhiyi(string projectid, string mingid, string type)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ ViewData["projectid"] = projectid;
+ ViewData["mingid"] = mingid;
+ ViewData["type"] = type;
+ var zhiyistatus = "";
+ var zhiyishijian = "";
+ var zhiyichengli = "";
+
+ var projectDTO = _projectService.GetLiaotianEntity(projectid);
+ if (type == "1")
+ {
+ var projectzhongbiaoDTO = projectDTO.Projectzhongbiaos.Where(x => x.ZhongbiaoId == mingid).FirstOrDefault();
+ if (projectzhongbiaoDTO != null)
+ {
+ zhiyistatus = projectzhongbiaoDTO.ZbZhiyistatus;
+ zhiyishijian = projectzhongbiaoDTO.ZbZhiyishijian.HasValue? projectzhongbiaoDTO.ZbZhiyishijian.Value.ToString("yyyy-MM-dd"):"";
+ zhiyichengli = projectzhongbiaoDTO.ZbZhiyichengli;
+ }
+ }
+ else if (type == "2")
+ {
+ zhiyistatus = projectDTO.DehxZhiyistatus;
+ zhiyishijian = projectDTO.DehxZhiyishijian.HasValue ? projectDTO.DehxZhiyishijian.Value.ToString("yyyy-MM-dd") : "";
+ zhiyichengli = projectDTO.DehxZhiyichengli;
+ }
+ else if (type == "3")
+ {
+ zhiyistatus = projectDTO.DshxZhiyistatus;
+ zhiyishijian = projectDTO.DshxZhiyishijian.HasValue ? projectDTO.DshxZhiyishijian.Value.ToString("yyyy-MM-dd") : "";
+ zhiyichengli = projectDTO.DshxZhiyichengli;
+ }
+ else if (type == "4")
+ {
+ var projectyouxiao = projectDTO.Projectyouxiaos.Where(x => x.YouxiaoId == mingid).FirstOrDefault();
+ if (projectyouxiao != null)
+ {
+ zhiyistatus = projectyouxiao.YxZhiyistatus;
+ zhiyishijian = projectyouxiao.YxZhiyishijian.HasValue ? projectyouxiao.YxZhiyishijian.Value.ToString("yyyy-MM-dd") : "";
+ zhiyichengli = projectyouxiao.YxZhiyichengli;
+ }
+ }
+ else if (type == "5")
+ {
+ var projectreason = projectDTO.projectreasons.Where(x => x.ReasonId == mingid).FirstOrDefault();
+ if (projectreason != null)
+ {
+ zhiyistatus = projectreason.WxZhiyistatus;
+ zhiyishijian = projectreason.WxZhiyishijian.HasValue ? projectreason.WxZhiyishijian.Value.ToString("yyyy-MM-dd") : "";
+ zhiyichengli = projectreason.WxZhiyichengli;
+ }
+ }
+
+
+ if (string.IsNullOrWhiteSpace(zhiyishijian))
+ {
+ zhiyishijian = DateTime.Now.ToString("yyyy-MM-dd");
+ }
+
+ ViewData["zhiyistatus"] = zhiyistatus;
+ ViewData["zhiyishijian"] = zhiyishijian;
+ ViewData["zhiyichengli"] = zhiyichengli;
+ ViewData.Model = new ProjectDTO();
+
+ return View();
+
+
+ }
+
+
+ [CheckLogin]
+ public IActionResult Zhiyibaocun(ProjectDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+
+
+ resultEntity = _projectService.savezhiyi("A", dto.Zhiyishijian, dto.Zhiyichengli, dto.Id, dto.MingxiId,dto.Type);
+
+ return new JsonResult(resultEntity);
+ }
+
+ /// <summary>
+ /// 鎶曡瘔
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [CheckLogin]
+ public IActionResult Tousu(string projectid, string mingid, string type)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ ViewData["projectid"] = projectid;
+ ViewData["mingid"] = mingid;
+ ViewData["type"] = type;
+ var tousustatus = "";
+ var tousushijian = "";
+ var tousuchengli = "";
+
+ var projectDTO = _projectService.GetLiaotianEntity(projectid);
+ if (type == "1")
+ {
+ var projectzhongbiaoDTO = projectDTO.Projectzhongbiaos.Where(x => x.ZhongbiaoId == mingid).FirstOrDefault();
+ if (projectzhongbiaoDTO != null)
+ {
+ tousustatus = projectzhongbiaoDTO.ZbTousustatus;
+ tousushijian = projectzhongbiaoDTO.ZbTousushijian.HasValue ? projectzhongbiaoDTO.ZbTousushijian.Value.ToString("yyyy-MM-dd") : ""; ;
+ tousuchengli = projectzhongbiaoDTO.ZbTousuchengli;
+ }
+ }
+ else if (type == "2")
+ {
+ tousustatus = projectDTO.DehxTousustatus;
+ tousushijian = projectDTO.DehxTousushijian.HasValue ? projectDTO.DehxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ;
+ tousuchengli = projectDTO.DehxTousuchengli;
+ }
+ else if (type == "3")
+ {
+ tousustatus = projectDTO.DshxTousustatus;
+ tousushijian = projectDTO.DshxTousushijian.HasValue ? projectDTO.DshxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ;
+ tousuchengli = projectDTO.DshxTousuchengli;
+ }
+ else if (type == "4")
+ {
+ var projectyouxiao = projectDTO.Projectyouxiaos.Where(x => x.YouxiaoId == mingid).FirstOrDefault();
+ if (projectyouxiao != null)
+ {
+ tousustatus = projectyouxiao.YxTousustatus;
+ tousushijian = projectyouxiao.YxTousushijian.HasValue ? projectyouxiao.YxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ;
+ tousuchengli = projectyouxiao.YxTousuchengli;
+ }
+ }
+ else if (type == "5")
+ {
+ var projectreason = projectDTO.projectreasons.Where(x => x.ReasonId == mingid).FirstOrDefault();
+ if (projectreason != null)
+ {
+ tousustatus = projectreason.WxTousustatus;
+ tousushijian = projectreason.WxTousushijian.HasValue ? projectreason.WxTousushijian.Value.ToString("yyyy-MM-dd") : ""; ;
+ tousuchengli = projectreason.WxTousuchengli;
+ }
+ }
+
+
+ if (string.IsNullOrWhiteSpace(tousushijian))
+ {
+ tousushijian = DateTime.Now.ToString("yyyy-MM-dd");
+ }
+
+ ViewData["tousustatus"] = tousustatus;
+ ViewData["tousushijian"] = tousushijian;
+ ViewData["tousuchengli"] = tousuchengli;
+ ViewData.Model = new ProjectDTO();
+
+ return View();
+
+
+ }
+
+
+ [CheckLogin]
+ public IActionResult Tousubaocun(ProjectDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+
+
+ resultEntity = _projectService.savetousu("A", dto.Tousushijian, dto.Tousuchengli, dto.Id, dto.MingxiId, dto.Type);
+
+ return new JsonResult(resultEntity);
+ }
}
}
--
Gitblit v1.9.1