From 283f3e33e15409f657c152881620103c95811768 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 15 七月 2022 15:29:15 +0800
Subject: [PATCH] 提交修改
---
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 149 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 41774d5..46d9b4d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -15,6 +15,7 @@
using System.Threading.Tasks;
using zhengcaioa.Models;
using zhengcaioa.IService;
+using System.Transactions;
namespace zhengcaioa.Controllers.Customer
{
@@ -27,9 +28,11 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IUserService _userService;
private readonly IHrDeptService _hrDeptService;
+ private readonly ISysAttachmentService _sysAttachmentService;
- public CooperatecustomCustomerController(ILogger<CooperatecustomCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, IHrDeptService hrDeptService)
+ public CooperatecustomCustomerController(ILogger<CooperatecustomCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, IHrDeptService hrDeptService
+ , ISysAttachmentService sysAttachmentService)
{
_logger = logger;
_projectService = projectService;
@@ -37,6 +40,7 @@
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_userService = userService;
_hrDeptService = hrDeptService;
+ _sysAttachmentService = sysAttachmentService;
}
public IActionResult Index()
@@ -100,13 +104,27 @@
ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
- ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
return View();
}
@@ -137,8 +155,22 @@
cooperatecustomCustomerDTO.AreaId = "510107";
}
-
- var sheng = _projectService.Getsheng();
+
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ var sheng = areaDTOs;
var shi = _projectService.Getshi(cooperatecustomCustomerDTO.Sheng);
var quxian = _projectService.Getquxian(cooperatecustomCustomerDTO.City);
var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
@@ -154,8 +186,52 @@
ViewData["quxian"] = quxian;
ViewData["DeptId"] = _hrDeptService.GetList();
ViewData.Model = cooperatecustomCustomerDTO;
+
+ ResultDataEntity<SysAttachmentDTO> resultsyinyezhizhao = new ResultDataEntity<SysAttachmentDTO>();
+ if (!string.IsNullOrEmpty(id))
+ {
+ SysAttachmentDTOSearch searchEntity = new SysAttachmentDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.AttObj = "Cooperyinyezhizhao";
+ searchEntity.AttObjid = id;
+ resultsyinyezhizhao = _sysAttachmentService.SearchByPaging(searchEntity);
+ }
+ ViewBag.yinyezhizhao = resultsyinyezhizhao;
+
+
+ ResultDataEntity<SysAttachmentDTO> resultshenfenzheng = new ResultDataEntity<SysAttachmentDTO>();
+ if (!string.IsNullOrEmpty(id))
+ {
+ SysAttachmentDTOSearch searchEntity = new SysAttachmentDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.AttObj = "Cooperashenfenzheng";
+ searchEntity.AttObjid = id;
+ resultshenfenzheng = _sysAttachmentService.SearchByPaging(searchEntity);
+ }
+ ViewBag.shenfenzheng = resultshenfenzheng;
+
+
return View();
}
+
+
+
+ public IActionResult GetCustomer(string id)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+
+
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(id);
+
+
+
+ return new JsonResult(cooperatecustomCustomerDTO);
+ }
+
/// <summary>
@@ -167,18 +243,79 @@
[HttpPost]
public IActionResult Save(CooperatecustomCustomerDTO data)
{
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
- if (String.IsNullOrEmpty(data.Id))
+ using (TransactionScope scope = new TransactionScope())
{
- data.Creater = curentuser.Id;
- data.Createtime = DateTime.Now;
- }
- data.Modifier = curentuser.Id;
- data.Modifytime = DateTime.Now;
+ if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
+ {
+ data.Shifoutianjiaweixin = "D";
+ data.Weixiner = null;
+ data.Weixintime = null;
+ }
+ else
+ {
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+ else
+ {
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(data.Id);
+ if (string.IsNullOrEmpty(cooperatecustomCustomerDTO.Weixiner))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
- ResultEntity resultEntity = _cooperatecustomCustomerService.save(data);
+ }
+ }
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Creater = curentuser.Id;
+ data.Createtime = DateTime.Now;
+ }
+ data.Modifier = curentuser.Id;
+ data.Modifytime = DateTime.Now;
+
+ resultEntity = _cooperatecustomCustomerService.save(data);
+
+
+ string[] Filepaths = data.Filepath;
+
+ if (Filepaths != null && Filepaths.Length > 0)
+ {
+ for (int i = 0; i < Filepaths.Length; i++)
+ {
+ if (string.IsNullOrEmpty(data.attachmentid[i]))
+ {
+ SysAttachmentDTO sysAttachmentDTO = new SysAttachmentDTO();
+ //sysAttachmentDTO.Id =
+ sysAttachmentDTO.AttObj = data.AttObj[i];
+ sysAttachmentDTO.AttObjid = data.Id;
+ sysAttachmentDTO.Filefullname = data.Filefullname[i];
+ sysAttachmentDTO.Filepath = data.Filepath[i];
+ sysAttachmentDTO.Creater = curentuser.Id;
+ sysAttachmentDTO.Modifier = curentuser.Id;
+ sysAttachmentDTO.Createtime = DateTime.Now;
+ sysAttachmentDTO.Modifytime = sysAttachmentDTO.Createtime;
+
+ resultEntity = _sysAttachmentService.save(sysAttachmentDTO);
+ if (resultEntity.Result == false)
+ {
+ return new JsonResult(resultEntity);
+ }
+ }
+ }
+ }
+ scope.Complete();
+ }
+
+
return new JsonResult(resultEntity);
}
--
Gitblit v1.9.1