From 7df23c739201c4413e3e64affae1707a694a2e1b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 16 六月 2022 12:56:47 +0800
Subject: [PATCH] 打印合同
---
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index 2f1cabc..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");
@@ -262,8 +266,8 @@
string s = @"^([A-Fa-f0-9]{2}[-,:]){5}[A-Fa-f0-9]{2}$";
Regex rStr = new Regex(s);
- if (rStr.IsMatch(userdata.IpMac))
- {
+ //if (rStr.IsMatch(userdata.IpMac))
+ //{
using (TransactionScope scope = new TransactionScope())
{
bool charujues = false;
@@ -355,11 +359,11 @@
}
scope.Complete();
}
- }
- else
- {
- resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
- }
+ //}
+ //else
+ //{
+ // resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
+ //}
return JsonConvert.SerializeObject(resultEntity);
}
#endregion
@@ -473,6 +477,16 @@
return View();
}
+ [CheckLogin]
+ public string GetUserListJiBenGongZi(PltUserDTOSearch search)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ search.Zhiwustatus = "A";
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return JsonConvert.SerializeObject(_userService.SearchByPaging(search));
+ }
+
#region 淇敼澶囨敞
[CheckLogin]
--
Gitblit v1.9.1