From c60a7d7b29faba465969555e2a9c69acb8510f90 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 二月 2022 09:11:41 +0800
Subject: [PATCH] 如果客户资料中有“*”的内容，生产文书时自动填上，质疑单位默认填写客户名称，可修改
---
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index be27733..ab973af 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -24,9 +24,11 @@
private readonly ILiaotianService _liaotianService;
private readonly IPltJiatingchengyuanService _pltJiatingchengyuanService;
private readonly ISysAttachmentService _sysAttachmentService;
+ private readonly IPltRoleService _pltRoleService;
- public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService)
+ public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService
+ , IPltRoleService pltRoleService)
{
_logger = logger;
_userService = userService;
@@ -35,6 +37,7 @@
_liaotianService = liaotianService;
_pltJiatingchengyuanService = pltJiatingchengyuanService;
_sysAttachmentService = sysAttachmentService;
+ _pltRoleService = pltRoleService;
}
@@ -151,6 +154,10 @@
{
PltUserDTO.ShiyongDateName = PltUserDTO.ShiyongDate.Value.ToString("yyyy-MM-dd");
}
+ if (PltUserDTO.Outdate.HasValue)
+ {
+ PltUserDTO.OutdateName = PltUserDTO.Outdate.Value.ToString("yyyy-MM-dd");
+ }
if (pltJiatingchengyuanDTOs.Count == 0)
{
@@ -255,16 +262,17 @@
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;
userdata.RecStatus = "A";
if (String.IsNullOrEmpty(userdata.Id))
{
userdata.Creater = curentuser.Id;
userdata.Createtime = DateTime.Now;
+ charujues = true;
}
userdata.Modifier = curentuser.Id;
userdata.Modifytime = DateTime.Now;
@@ -274,6 +282,21 @@
{
return JsonConvert.SerializeObject(resultEntity);
}
+ if (charujues)
+ {
+ var pltRoleDTO = _pltRoleService.listRole().Where(x => x.RoleName == "鍛樺伐").FirstOrDefault();
+
+ if (pltRoleDTO != null)
+ {
+ resultEntity = _pltRoleService.SaveUserRole(pltRoleDTO.Id,userdata.Id, curentuser.Id);
+ if (resultEntity.Result == false)
+ {
+ return JsonConvert.SerializeObject(resultEntity);
+ }
+ }
+
+ }
+
string[] JiatingchengyuanId = userdata.JiatingchengyuanId;
string[] Name = userdata.Name;
string[] Guanxi = userdata.Guanxi;
@@ -332,11 +355,11 @@
}
scope.Complete();
}
- }
- else
- {
- resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
- }
+ //}
+ //else
+ //{
+ // resultEntity.Message = "MAC鍦板潃鏍煎紡閿欒";
+ //}
return JsonConvert.SerializeObject(resultEntity);
}
#endregion
@@ -450,6 +473,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