zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -255,6 +255,12 @@ CreateMap<AdmAskCiZhi, AdmAskCiZhiDTO>(); CreateMap<AdmAskCiZhiDTO, AdmAskCiZhi>(); CreateMap<AdmAskJiaojie, AdmAskJiaojieDTO>(); CreateMap<AdmAskJiaojieDTO, AdmAskJiaojie>(); CreateMap<AdmAskJiaojieDtl, AdmAskJiaojieDtlDTO>(); CreateMap<AdmAskJiaojieDtlDTO, AdmAskJiaojieDtl>(); } } } zhengcaioa/DTO/AdmAskJiaojieDTO.cs
New file @@ -0,0 +1,36 @@ using System; using System.Collections.Generic; using System.Text; namespace DTO { public class AdmAskJiaojieDTO { public string id { get; set; } public string Id { get; set; } public string CiZhiId { get; set; } public string Remark { get; set; } public string ShenpiStatus { 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 CreaterName { get; set; } public string Tittle { get; set; } public string Content { get; set; } public string Tongguojujue { get; set; } public string Step { get; set; } public string JiaojieDtlId { get; set; } public List<AdmAskJiaojieDtlDTO> admAskJiaojieDtlDTOs { get; set; } public DateTime? JiaojietimeStart { get; set; } public string JiaojietimeStartName { get; set; } public DateTime? JiaojietimeEnd { get; set; } public string JiaojietimeEndName { get; set; } public string JiaojieStatus { get; set; } } } zhengcaioa/DTO/AdmAskJiaojieDtlDTO.cs
New file @@ -0,0 +1,29 @@ using System; using System.Collections.Generic; #nullable disable namespace DTO { public class AdmAskJiaojieDtlDTO { public string Id { get; set; } public string JiaojieId { get; set; } public DateTime? Jiaojietime { get; set; } public string JiaojietimeName { get; set; } public string JiaojieType { get; set; } public string JiaojieTypeName { get; set; } public string Kehudanwei { get; set; } public string JiaojieNeirong { get; set; } public string JiaojieUserId { get; set; } public string JiaojieUserName { get; set; } public DateTime? JieShoutime { get; set; } public string JieShoutimeName { get; set; } public string JiaojieStatus { 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; } } } zhengcaioa/IServices/IAskService.cs
@@ -51,5 +51,13 @@ //è¾èç³è¯· ResultEntity SaveAskCiZhi(AdmAskCiZhiDTO admAsk); AdmAskCiZhiDTO GetAskCiZhi(string Id); //å·¥ä½äº¤æ¥ ResultEntity SaveAskJiaojie(AdmAskJiaojieDTO admAsk); AdmAskJiaojieDTO GetAskJiaojie(string Id); ResultEntity SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO admAsk); List<AdmAskJiaojieDtlDTO> GetAskJiaojieDtls(string JiaojieId); AdmAskJiaojieDtlDTO GetAskJiaojieDtl(string Id); } } zhengcaioa/IServices/IWfRunProcessService.cs
@@ -46,5 +46,7 @@ ResultEntity WfCustomerWithdrawal(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version); ResultEntity WfAskCiZhi(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version); ResultEntity WfAskJiaojie(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version); } } zhengcaioa/Model/AdmAskJiaojie.cs
New file @@ -0,0 +1,22 @@ using System; using System.Collections.Generic; #nullable disable namespace zhengcaioa.Models { public partial class AdmAskJiaojie { public string Id { get; set; } public string CiZhiId { get; set; } public string Remark { get; set; } public string ShenpiStatus { 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 CreaterName { get; set; } public string Tittle { get; set; } } } zhengcaioa/Model/AdmAskJiaojieDtl.cs
New file @@ -0,0 +1,25 @@ using System; using System.Collections.Generic; #nullable disable namespace zhengcaioa.Models { public partial class AdmAskJiaojieDtl { public string Id { get; set; } public string JiaojieId { get; set; } public DateTime? Jiaojietime { get; set; } public string JiaojieType { get; set; } public string Kehudanwei { get; set; } public string JiaojieNeirong { get; set; } public string JiaojieUserId { get; set; } public DateTime? JieShoutime { get; set; } public string JiaojieStatus { 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; } } } zhengcaioa/Model/zhengcaioaContext.cs
@@ -29,6 +29,8 @@ public virtual DbSet<AdmAskCiZhi> AdmAskCiZhis { get; set; } public virtual DbSet<AdmAskcost> AdmAskcosts { get; set; } public virtual DbSet<AdmAskGood> AdmAskGoods { get; set; } public virtual DbSet<AdmAskJiaojie> AdmAskJiaojies { get; set; } public virtual DbSet<AdmAskJiaojieDtl> AdmAskJiaojieDtls { get; set; } public virtual DbSet<AdmAskLeave> AdmAskLeaves { get; set; } public virtual DbSet<AdmAskLeaveOff> AdmAskLeaveOffs { get; set; } public virtual DbSet<AdmAskMarketingCost> AdmAskMarketingCosts { get; set; } @@ -415,6 +417,112 @@ .HasColumnName("tittle"); }); modelBuilder.Entity<AdmAskJiaojie>(entity => { entity.ToTable("ADM_AskJiaojie"); entity.Property(e => e.Id).HasMaxLength(50); entity.Property(e => e.CiZhiId).HasMaxLength(50); entity.Property(e => e.Creater) .IsRequired() .HasMaxLength(50) .HasColumnName("creater") .HasDefaultValueSql("('1')"); entity.Property(e => e.CreaterName) .HasMaxLength(50) .HasColumnName("createrName"); entity.Property(e => e.Createtime) .HasColumnType("datetime") .HasColumnName("createtime") .HasDefaultValueSql("(getdate())"); 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.Remark).HasMaxLength(500); entity.Property(e => e.ShenpiStatus) .HasMaxLength(1) .HasColumnName("shenpi_status") .HasDefaultValueSql("('D')"); entity.Property(e => e.Tittle) .HasMaxLength(50) .HasColumnName("tittle"); }); modelBuilder.Entity<AdmAskJiaojieDtl>(entity => { entity.ToTable("ADM_AskJiaojieDtl"); 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.JiaojieId).HasMaxLength(50); entity.Property(e => e.JiaojieNeirong).HasMaxLength(500); entity.Property(e => e.JiaojieStatus) .HasMaxLength(1) .HasColumnName("jiaojie_status") .HasDefaultValueSql("('D')"); entity.Property(e => e.JiaojieType).HasMaxLength(50); entity.Property(e => e.JiaojieUserId).HasMaxLength(50); entity.Property(e => e.Jiaojietime).HasColumnType("datetime"); entity.Property(e => e.JieShoutime).HasColumnType("datetime"); entity.Property(e => e.Kehudanwei).HasMaxLength(500); 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')"); }); modelBuilder.Entity<AdmAskLeave>(entity => { entity.ToTable("ADM_AskLeave"); zhengcaioa/Services/AskService.cs
@@ -588,7 +588,184 @@ } #endregion #region å·¥ä½äº¤æ¥ public ResultEntity SaveAskJiaojie(AdmAskJiaojieDTO admAsk) { ResultEntity resultEntity = new ResultEntity(); try { AdmAskJiaojie ask = _mapper.Map<AdmAskJiaojie>(admAsk); if (string.IsNullOrEmpty(admAsk.Id)) { ask.Id = Guid.NewGuid().ToString(); admAsk.Id = ask.Id; _context.AdmAskJiaojies.Add(ask); } else { var entity = _context.AdmAskJiaojies.Find(admAsk.Id); entity.Remark = admAsk.Remark; entity.CiZhiId = admAsk.CiZhiId; entity.ShenpiStatus = admAsk.ShenpiStatus; entity.CreaterName = admAsk.CreaterName; entity.Tittle = admAsk.Tittle; entity.Modifier = admAsk.Modifier; entity.Modifytime = DateTime.Now; } _context.SaveChanges(); resultEntity.ReturnID = admAsk.Id; resultEntity.Result = true; } catch (Exception ex) { resultEntity.Result = false; resultEntity.Message = "ä¿å失败ï¼è¯·è系管çå"; ex.Message.ToString(); } return resultEntity; } public AdmAskJiaojieDTO GetAskJiaojie(string Id) { var entity = _context.AdmAskJiaojies.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault(); if (entity == null) { entity = new AdmAskJiaojie(); } var leaveDTO = _mapper.Map<AdmAskJiaojieDTO>(entity); return leaveDTO; } public ResultEntity SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO admAsk) { ResultEntity resultEntity = new ResultEntity(); try { AdmAskJiaojieDtl ask = _mapper.Map<AdmAskJiaojieDtl>(admAsk); if (string.IsNullOrEmpty(admAsk.Id)) { ask.Id = Guid.NewGuid().ToString(); admAsk.Id = ask.Id; _context.AdmAskJiaojieDtls.Add(ask); } else { var entity = _context.AdmAskJiaojieDtls.Find(admAsk.Id); entity.JiaojieId = admAsk.JiaojieId; entity.Jiaojietime = admAsk.Jiaojietime; entity.JiaojieType = admAsk.JiaojieType; entity.Kehudanwei = admAsk.Kehudanwei; entity.JiaojieNeirong = admAsk.JiaojieNeirong; entity.JiaojieUserId = admAsk.JiaojieUserId; entity.JieShoutime = admAsk.JieShoutime; entity.JiaojieStatus = admAsk.JiaojieStatus; entity.Modifier = admAsk.Modifier; entity.Modifytime = DateTime.Now; } _context.SaveChanges(); resultEntity.ReturnID = ask.Id; resultEntity.Result = true; } catch (Exception ex) { resultEntity.Result = false; resultEntity.Message = "ä¿å失败ï¼è¯·è系管çå"; ex.Message.ToString(); } return resultEntity; } public List<AdmAskJiaojieDtlDTO> GetAskJiaojieDtls(string JiaojieId) { var entity = _context.AdmAskJiaojieDtls.Where(e => e.RecStatus == "A" && e.JiaojieId == JiaojieId).OrderBy(x=>x.JiaojieType).ToList(); var leaveDTOs = _mapper.Map<List<AdmAskJiaojieDtlDTO>>(entity); var listCode = (from a in _context.SysCodeDtls join b in _context.SysCodes on a.CodeId equals b.Id where a.RecStatus == "A" && b.RecStatus == "A" && b.CodeTable == "ADM_AskJiaojieDtl" && b.CodeField == "JiaojieType" select new CodeDataEntity() { CodeId = b.Id, CodeTable = b.CodeTable, CodeField = b.CodeField, CodeSn = a.CodeSn, Comments = a.Comments, Contents = a.Contents, RecStatus = a.RecStatus, Sort = a.Sort } ).ToList(); var pltUsers = _context.PltUsers.Where(e => e.RecStatus == "A" && e.Zhiwustatus == "A").ToList(); foreach (var leaveDTO in leaveDTOs) { leaveDTO.JiaojietimeName = leaveDTO.Jiaojietime.HasValue ? leaveDTO.Jiaojietime.Value.ToString("yyyy-MM-dd") : ""; leaveDTO.JieShoutimeName = leaveDTO.JieShoutime.HasValue ? leaveDTO.JieShoutime.Value.ToString("yyyy-MM-dd") : ""; var codeDataEntity = listCode.Where(x => x.CodeSn == leaveDTO.JiaojieType).FirstOrDefault(); if (codeDataEntity != null) { leaveDTO.JiaojieTypeName = codeDataEntity.Comments; } var pltUser = pltUsers.Where(x => x.Id == leaveDTO.JiaojieUserId).FirstOrDefault(); if (pltUser != null) { leaveDTO.JiaojieUserName = pltUser.UserName; } } return leaveDTOs; } public AdmAskJiaojieDtlDTO GetAskJiaojieDtl(string Id) { var entity = _context.AdmAskJiaojieDtls.Where(e => e.RecStatus == "A" && e.Id == Id).FirstOrDefault(); if (entity == null) { entity = new AdmAskJiaojieDtl(); } var leaveDTO = _mapper.Map<AdmAskJiaojieDtlDTO>(entity); return leaveDTO; } #endregion zhengcaioa/Services/WfNeeddeelService.cs
@@ -143,6 +143,8 @@ join d in _context.WfApplytypes on k.Applytiye equals d.Applyno into dsssss from ddd in dsssss.DefaultIfEmpty() join b in _context.PltUsers on k.Creater equals b.Id @@ -185,7 +187,7 @@ Applyno = k.Applyno, CreaterName = b.UserName, DeptName = c.DeptName, Applytiye = d.Applytiye, Applytiye = ddd.Applytiye, Content = k.Content, ShenpiStatusName = eee.Comments, Resivetime = a.Resivetime, zhengcaioa/Services/WfRunProcessService.cs
@@ -6973,5 +6973,370 @@ return result; } public ResultEntity WfAskJiaojie(string DanjuId, string step, string tongguojujue, string Userid, string Content, string title, string version) { ResultEntity result = new ResultEntity(); result.Result = true; WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "22").FirstOrDefault(); if (wfRunProcessDTO != null) { version = wfRunProcessDTO.Version; } if (version == "v1") { if (step == "ä¿å") { //æ´æ°æµç¨å®ä¾ // WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "22").FirstOrDefault(); if (wfRunProcessDTO == null) { //æå ¥æµç¨å®ä¾ wfRunProcessDTO = new WfRunProcessDTO(); //wfRunProcessDTO.Applyno = wfRunProcessDTO.Applytime = DateTime.Now; wfRunProcessDTO.Applytiye = "22"; wfRunProcessDTO.DanjuId = DanjuId; wfRunProcessDTO.Content = title; wfRunProcessDTO.Step = "æäº¤"; wfRunProcessDTO.ShenpiStatus = "D"; wfRunProcessDTO.Version = version; wfRunProcessDTO.RecStatus = "A"; wfRunProcessDTO.Creater = Userid; wfRunProcessDTO.Createtime = DateTime.Now; wfRunProcessDTO.Modifier = Userid; wfRunProcessDTO.Modifytime = DateTime.Now; wfRunProcessDTO.Deelurl = "/AdmAsk/AskJiaojie?id=" + DanjuId+ "&JiaojieStatus=D"; result = this.save(wfRunProcessDTO); if (result.Result == false) { return result; } //æ¥è¯¢å¤ç人 var pltUsers = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == Userid).ToList(); if (pltUsers == null || pltUsers.Count == 0) { result.Result = false; result.Message = "æªæ¾å°å¤ç人"; return result; } foreach (var pltUser in pltUsers) { //æå ¥å¾ å WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO(); wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id; wfNeeddeelDTO.SendUserId = Userid; wfNeeddeelDTO.DeelUserId = pltUser.Id; wfNeeddeelDTO.Sendtime = DateTime.Now; wfNeeddeelDTO.Resivetime = DateTime.Now; wfNeeddeelDTO.Step = "æäº¤"; wfNeeddeelDTO.NeeddeelType = "1"; wfNeeddeelDTO.ChuliStatus = "0"; wfNeeddeelDTO.Deelurl = "/AdmAsk/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D"; wfNeeddeelDTO.Content = ""; wfNeeddeelDTO.Sort = 1; wfNeeddeelDTO.RecStatus = "A"; wfNeeddeelDTO.Creater = Userid; wfNeeddeelDTO.Createtime = DateTime.Now; wfNeeddeelDTO.Modifier = Userid; wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime; result = _wfNeeddeelService.save(wfNeeddeelDTO); if (result.Result == false) { return result; } } _context.SaveChanges(); } } if (step == "æäº¤") { //æ´æ°æµç¨å®ä¾ wfRunProcessDTO.Step = "å·¥ä½äº¤æ¥"; wfRunProcessDTO.Modifier = Userid; wfRunProcessDTO.Modifytime = DateTime.Now; result = this.save(wfRunProcessDTO); if (result.Result == false) { return result; } //æ´æ°å¾ å List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "æäº¤"); var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs); var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault(); if (wfHistoryDTO == null) { result.Result = false; result.Message = "æªæ¾å°ä»£å"; return result; } wfHistoryDTO.Content = Content; wfHistoryDTO.ChuliStatus = "2"; wfHistoryDTO.Modifier = Userid; wfHistoryDTO.Modifytime = DateTime.Now; var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs); foreach (var wfHistory in wfHistories) { _context.WfHistories.Add(wfHistory); } var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs); foreach (var wfNeeddeel in wfNeeddeels) { //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid); _context.WfNeeddeels.Remove(wfNeeddeel); } _context.SaveChanges(); var pltUsers = new List<PltUser>(); //æ¥è¯¢å¤ç人è§è² var hrPositions = _context.PltRoles.Where(x => x.RecStatus == "A" && (x.RoleName == "è´¢å¡" || x.RoleName == "人äº" || x.RoleName == "è¡æ¿" || x.RoleName == "æ»ç»ç")).Select(x=>x.Id).ToList(); if (hrPositions == null || hrPositions.Count == 0) { result.Result = false; result.Message = "æªæ¾å°èä½"; return result; } var pltUsersrole = (from a in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A") join b in _context.PltUserRoles.Where(x => x.RecStatus == "A" && hrPositions.Contains(x.RoleId)) on a.Id equals b.UserId select a ).ToList(); foreach (var pltUser1 in pltUsersrole) { pltUsers.Add(pltUser1); } //æ¥è¯¢å¤ç人主管 var user = _context.PltUsers.Find(Userid); var hrDept = _context.HrDepts.Where(x => x.RecStatus == "A" && x.Id == user.DeptId).FirstOrDefault(); if (hrDept == null) { result.Result = false; result.Message = "æªæ¾å°é¨é¨"; return result; } var pltUserszhuguan = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.Id == hrDept.Director).ToList(); foreach (var pltUser1 in pltUserszhuguan) { pltUsers.Add(pltUser1); } //æ¥è¯¢å¤çäººäº¤æ¥ var admAskJiaojie = _context.AdmAskJiaojies.Find(DanjuId); if (admAskJiaojie != null) { var admAskCiZhi = _context.AdmAskCiZhis.Find(admAskJiaojie.CiZhiId); if (admAskCiZhi != null) { var JiaojieUser = admAskCiZhi.JiaojieUser.Split(','); if (JiaojieUser.Length > 0) { var pltUsersJiaojie = _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && JiaojieUser.Contains(x.Id)).ToList(); foreach (var pltUser1 in pltUsersJiaojie) { pltUsers.Add(pltUser1); } } } } pltUsers = pltUsers.Distinct().ToList(); if (pltUsers == null || pltUsers.Count == 0) { result.Result = false; result.Message = "æªæ¾å°å¤ç人"; return result; } foreach (var pltUser in pltUsers) { //æå ¥æ°çå¾ å WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO(); wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id; wfNeeddeelDTO.SendUserId = Userid; wfNeeddeelDTO.DeelUserId = pltUser.Id; wfNeeddeelDTO.Sendtime = DateTime.Now; wfNeeddeelDTO.Resivetime = DateTime.Now; wfNeeddeelDTO.Step = "å·¥ä½äº¤æ¥"; wfNeeddeelDTO.NeeddeelType = "1"; wfNeeddeelDTO.ChuliStatus = "0"; wfNeeddeelDTO.Deelurl = "/AdmAsk/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D"; wfNeeddeelDTO.Content = ""; wfNeeddeelDTO.Sort = 2; wfNeeddeelDTO.RecStatus = "A"; wfNeeddeelDTO.Creater = Userid; wfNeeddeelDTO.Createtime = DateTime.Now; wfNeeddeelDTO.Modifier = Userid; wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime; result = _wfNeeddeelService.save(wfNeeddeelDTO); if (result.Result == false) { return result; } } } if (step == "å·¥ä½äº¤æ¥") { //æ´æ°æµç¨å®ä¾ //WfRunProcessDTO wfRunProcessDTO = this.GetList(DanjuId, "22").FirstOrDefault(); if (wfRunProcessDTO == null) { result.Result = false; result.Message = "æªæ¾å°æµç¨å®ä¾"; return result; } if (wfRunProcessDTO.Step != "å·¥ä½äº¤æ¥") { result.Result = false; result.Message = "å½åæ¥éª¤å·²ç»å¤ç"; return result; } if (tongguojujue == "A") { wfRunProcessDTO.Step = "å®ç»"; wfRunProcessDTO.ShenpiStatus = "A"; wfRunProcessDTO.Modifier = Userid; wfRunProcessDTO.Modifytime = DateTime.Now; result = this.save(wfRunProcessDTO); if (result.Result == false) { return result; } //æ´æ°åæ® var admAskJiaojie = _context.AdmAskJiaojies.Find(DanjuId); if (wfRunProcessDTO == null) { result.Result = false; result.Message = "æªæ¾å°åæ®"; return result; } admAskJiaojie.ShenpiStatus = "A"; _context.SaveChanges(); List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "å·¥ä½äº¤æ¥"); var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs); var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault(); if (wfHistoryDTO == null) { result.Result = false; result.Message = "æªæ¾å°ä»£å"; return result; } wfHistoryDTO.Content = Content; wfHistoryDTO.ChuliStatus = "2"; wfHistoryDTO.Modifier = Userid; wfHistoryDTO.Modifytime = DateTime.Now; var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs); foreach (var wfHistory in wfHistories) { _context.WfHistories.Add(wfHistory); } var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs); foreach (var wfNeeddeel in wfNeeddeels) { // _wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid); _context.WfNeeddeels.Remove(wfNeeddeel); } _context.SaveChanges(); } else { wfRunProcessDTO.Step = "æäº¤"; wfRunProcessDTO.Modifier = Userid; wfRunProcessDTO.Modifytime = DateTime.Now; result = this.save(wfRunProcessDTO); if (result.Result == false) { return result; } //æ´æ°å¾ å List<WfNeeddeelDTO> wfNeeddeelDTOs = _wfNeeddeelService.GetList(wfRunProcessDTO.Id, "å·¥ä½äº¤æ¥"); var wfHistoryDTOs = _mapper.Map<List<WfHistoryDTO>>(wfNeeddeelDTOs); var wfHistoryDTO = wfHistoryDTOs.Where(x => x.DeelUserId == Userid).FirstOrDefault(); if (wfHistoryDTO == null) { result.Result = false; result.Message = "æªæ¾å°ä»£å"; return result; } wfHistoryDTO.Content = Content; wfHistoryDTO.ChuliStatus = "1"; wfHistoryDTO.Modifier = Userid; wfHistoryDTO.Modifytime = DateTime.Now; var wfHistories = _mapper.Map<List<WfHistory>>(wfHistoryDTOs); foreach (var wfHistory in wfHistories) { _context.WfHistories.Add(wfHistory); } var wfNeeddeels = _mapper.Map<List<WfNeeddeel>>(wfNeeddeelDTOs); foreach (var wfNeeddeel in wfNeeddeels) { //_wfNeeddeelService.ModifyStatus(wfNeeddeel.Id, Userid); _context.WfNeeddeels.Remove(wfNeeddeel); } _context.SaveChanges(); //æå ¥æ°çå¾ å WfNeeddeelDTO wfNeeddeelDTO = new WfNeeddeelDTO(); wfNeeddeelDTO.RunProcessId = wfRunProcessDTO.Id; wfNeeddeelDTO.SendUserId = Userid; wfNeeddeelDTO.DeelUserId = wfRunProcessDTO.Creater; wfNeeddeelDTO.Sendtime = DateTime.Now; wfNeeddeelDTO.Resivetime = DateTime.Now; wfNeeddeelDTO.Step = "æäº¤"; wfNeeddeelDTO.NeeddeelType = "1"; wfNeeddeelDTO.ChuliStatus = "0"; wfNeeddeelDTO.Deelurl = "/AdmAsk/AskJiaojie?id=" + DanjuId + "&JiaojieStatus=D"; wfNeeddeelDTO.Content = ""; wfNeeddeelDTO.Sort = 1; wfNeeddeelDTO.RecStatus = "A"; wfNeeddeelDTO.Creater = Userid; wfNeeddeelDTO.Createtime = DateTime.Now; wfNeeddeelDTO.Modifier = Userid; wfNeeddeelDTO.Modifytime = wfNeeddeelDTO.Createtime; result = _wfNeeddeelService.save(wfNeeddeelDTO); if (result.Result == false) { return result; } } } } return result; } } } zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -442,6 +442,14 @@ data.Creater = curentuser.Id; data.Createtime = DateTime.Now; } else { var intentionCustomerDTO = _intentionCustomerService.Get(data.Id); data.Yixiangtime = intentionCustomerDTO.Yixiangtime; data.Yixiang = intentionCustomerDTO.Yixiang; data.Dianxiaozhuanyuan = intentionCustomerDTO.Dianxiaozhuanyuan; data.Zuijinzhuizongtime = intentionCustomerDTO.Zuijinzhuizongtime; } data.Modifier = curentuser.Id; data.Modifytime = DateTime.Now; zhengcaioa/zhengcaioa/Controllers/OA/WfApplytypeController.cs
@@ -34,7 +34,7 @@ { ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03" && x.Applyno != "20").ToList(); ViewBag.wfApplytypeDTOs = _wfApplytypeService.GetList().Where(x => x.Applyno != "03" && x.Applyno != "20" && x.Applyno != "22").ToList(); return View(); } } zhengcaioa/zhengcaioa/Controllers/admin/AdmAskController.cs
@@ -1483,6 +1483,89 @@ if (data.Step == "æ»ç»ç审æ¹") { //æ»ç»ç审æ¹åæä¹åï¼æå ¥å·¥ä½äº¤æ¥ var askCiZhiDTO = _askService.GetAskCiZhi(resultEntity.ReturnID); var pltUserDTO = _userService.GetPltUserEntity(askCiZhiDTO.Creater); AdmAskJiaojieDTO admAskJiaojieDTO = new AdmAskJiaojieDTO(); admAskJiaojieDTO.CiZhiId = resultEntity.ReturnID; admAskJiaojieDTO.Remark = ""; admAskJiaojieDTO.ShenpiStatus = "D"; admAskJiaojieDTO.RecStatus = "A"; admAskJiaojieDTO.Creater = askCiZhiDTO.Creater; admAskJiaojieDTO.Createtime = DateTime.Now; admAskJiaojieDTO.Modifier = askCiZhiDTO.Creater; admAskJiaojieDTO.Modifytime = admAskJiaojieDTO.Createtime; admAskJiaojieDTO.CreaterName = pltUserDTO.UserName; admAskJiaojieDTO.Tittle = "å·¥ä½äº¤æ¥(" + pltUserDTO.UserName + ")"; resultEntity = _askService.SaveAskJiaojie(admAskJiaojieDTO); if (!resultEntity.Result) { return new JsonResult(resultEntity); } //æ¥è¯¢åä½å®¢æ· CooperatecustomCustomerDTOSearch searchEntity = new CooperatecustomCustomerDTOSearch(); searchEntity.page = 1; searchEntity.rows = 10000; searchEntity.Ywjl = admAskJiaojieDTO.Creater; var resultDataEntity = _cooperatecustomCustomerService.SearchByPaging(searchEntity); var cooperatecustomCustomerDTOs = resultDataEntity.DataList; foreach (var cooperatecustomCustomerDTO in cooperatecustomCustomerDTOs) { AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO(); admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id; admAskJiaojieDtl.Jiaojietime = DateTime.Now; admAskJiaojieDtl.JiaojieType = "01"; admAskJiaojieDtl.Kehudanwei = cooperatecustomCustomerDTO.Name; admAskJiaojieDtl.JiaojieStatus = "D"; admAskJiaojieDtl.RecStatus = "A"; admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater; admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime; admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater; admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime; resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } //æ¥è¯¢æåå®¢æ· IntentionCustomerDTOSearch searchEntityin = new IntentionCustomerDTOSearch(); searchEntityin.page = 1; searchEntityin.rows = 10000; searchEntityin.YwjlYx = admAskJiaojieDTO.Creater; searchEntityin.Ywjl = admAskJiaojieDTO.Creater; searchEntityin.Yixiang = "05"; var resultDataEntity1 = _intentionCustomerService.SearchByPaging(searchEntityin); var intentionCustomerDTOs = resultDataEntity1.DataList; foreach (var intentionCustomerDTO in intentionCustomerDTOs) { AdmAskJiaojieDtlDTO admAskJiaojieDtl = new AdmAskJiaojieDtlDTO(); admAskJiaojieDtl.JiaojieId = admAskJiaojieDTO.Id; admAskJiaojieDtl.Jiaojietime = DateTime.Now; admAskJiaojieDtl.JiaojieType = "02"; admAskJiaojieDtl.Kehudanwei = intentionCustomerDTO.Name; admAskJiaojieDtl.JiaojieStatus = "D"; admAskJiaojieDtl.RecStatus = "A"; admAskJiaojieDtl.Creater = admAskJiaojieDTO.Creater; admAskJiaojieDtl.Createtime = admAskJiaojieDTO.Createtime; admAskJiaojieDtl.Modifier = admAskJiaojieDTO.Creater; admAskJiaojieDtl.Modifytime = admAskJiaojieDTO.Createtime; resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } //æå ¥äº¤æ¥æç» resultEntity = _wfRunProcessService.WfAskJiaojie(admAskJiaojieDTO.Id, "ä¿å", "A", admAskJiaojieDTO.Creater, "", admAskJiaojieDTO.Tittle, "v1"); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } @@ -1498,5 +1581,221 @@ } return new JsonResult(resultEntity); } public IActionResult AskJiaojie(AdmAskJiaojieDTO data) { AdmAskJiaojieDTO dto = new AdmAskJiaojieDTO(); var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); //æµç¨ç¸å ³ string shifoubiaoji = "A"; string sifoudangqian = "A"; string dangqianbuzhou = "æäº¤"; var lishiyijian = new List<WfHistoryDTO>(); if (string.IsNullOrEmpty(data.id)) { dto.CreaterName = curentuser.UserName; dto.Tittle = "å·¥ä½äº¤æ¥ï¼" + curentuser.UserName + "ï¼"; dto.admAskJiaojieDtlDTOs = new List<AdmAskJiaojieDtlDTO>(); } else if (dto != null) { dto = _askService.GetAskJiaojie(data.id); dto.JiaojietimeStart = data.JiaojietimeStart; dto.JiaojietimeEnd = data.JiaojietimeEnd; dto.JiaojieStatus = data.JiaojieStatus; dto.JiaojietimeStartName = dto.JiaojietimeStart.HasValue? dto.JiaojietimeStart.Value.ToString("yyyy-MM-dd"):""; dto.JiaojietimeEndName = dto.JiaojietimeEnd.HasValue ? dto.JiaojietimeEnd.Value.ToString("yyyy-MM-dd") : ""; //dto.JineName = dto.Jine.Value.ToString("F2"); var admAskJiaojieDtlDTOs = _askService.GetAskJiaojieDtls(data.id); if (!string.IsNullOrEmpty(data.JiaojieStatus)) { admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.JiaojieStatus == data.JiaojieStatus).ToList(); } if (data.JiaojietimeStart.HasValue) { admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime >= data.JiaojietimeStart).ToList(); } if (data.JiaojietimeEnd.HasValue) { admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs.Where(x => x.Jiaojietime <= data.JiaojietimeEnd.Value.AddDays(1)).ToList(); } dto.admAskJiaojieDtlDTOs = admAskJiaojieDtlDTOs; var wfRunProcessDTO = _wfRunProcessService.GetList(dto.Id, "22").FirstOrDefault(); if (wfRunProcessDTO == null) { shifoubiaoji = "D"; sifoudangqian = "D"; } else { dangqianbuzhou = wfRunProcessDTO.Step; //æ¥è¯¢å®¡æ¹è¿åº¦ lishiyijian = _wfHistoryService.GetListshenpi(wfRunProcessDTO.Id); if (wfRunProcessDTO.Step != "æäº¤") { shifoubiaoji = "D"; } //æ¥è¯¢å¾ å var chaxundaiban = _wfNeeddeelService.GetListTracking(wfRunProcessDTO.Id, wfRunProcessDTO.Step).Where(x => x.DeelUserId == curentuser.Id).ToList(); if (chaxundaiban != null && chaxundaiban.Count > 0) { sifoudangqian = "A"; } else { sifoudangqian = "D"; } } } ViewBag.shifoubiaoji = shifoubiaoji; ViewBag.sifoudangqian = sifoudangqian; ViewBag.lishiyijian = lishiyijian; ViewBag.dangqianbuzhou = dangqianbuzhou; ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou"); //ViewBag.visType = _liaotianService.GetSYScode("CooperVisit", "visType"); //var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetList(); //var intentionCustomerDTOs = _intentionCustomerService.GetList(); //ViewBag.CooperatecustomCustomerDTOs = ViewData.Model = dto; return View(); } /// <summary> /// å·¥ä½äº¤æ¥ /// </summary> /// <param name="data"></param> /// <returns></returns> [HttpPost] public IActionResult SaveAskJiaojie(AdmAskJiaojieDTO data) { var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); ResultEntity resultEntity = new ResultEntity(); using (TransactionScope scope = new TransactionScope()) { if (data.Step == "æäº¤") { data.ShenpiStatus = "D"; data.RecStatus = "A"; data.Creater = curentuser.Id; data.Createtime = DateTime.Now; data.Modifier = data.Creater; data.Modifytime = data.Createtime; resultEntity = _askService.SaveAskJiaojie(data); if (!resultEntity.Result) { return new JsonResult(resultEntity); } //åèµ·æµç¨ç¸å ³ resultEntity = _wfRunProcessService.WfAskJiaojie(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1"); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } else if (data.Step == "å·¥ä½äº¤æ¥") { var ids = data.JiaojieDtlId.Split(','); foreach(var id in ids) { if (string.IsNullOrEmpty(id)) { continue; } var admAskJiaojieDtl = _askService.GetAskJiaojieDtl(id); if (admAskJiaojieDtl.JiaojieStatus == "A") { continue; } else { admAskJiaojieDtl.JiaojieStatus = "A"; admAskJiaojieDtl.JiaojieUserId = curentuser.Id; admAskJiaojieDtl.Jiaojietime = DateTime.Now; admAskJiaojieDtl.JieShoutime = admAskJiaojieDtl.Jiaojietime; admAskJiaojieDtl.Modifier = curentuser.Id; ; admAskJiaojieDtl.Modifytime = admAskJiaojieDtl.Jiaojietime.Value; resultEntity = _askService.SaveAskJiaojieDtl(admAskJiaojieDtl); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } } var admAskJiaojieDtls = _askService.GetAskJiaojieDtls(data.Id).Where(x => x.JiaojieStatus == "D").ToList(); if(admAskJiaojieDtls ==null || admAskJiaojieDtls.Count == 0) { //åèµ·æµç¨ç¸å ³ resultEntity = _wfRunProcessService.WfAskJiaojie(data.Id, data.Step, data.Tongguojujue, curentuser.Id, data.Content, data.Tittle, "v1"); if (!resultEntity.Result) { return new JsonResult(resultEntity); } } } scope.Complete(); } return new JsonResult(resultEntity); } public IActionResult EditAskJiaojie(string id) { ViewBag.id = id; ViewBag.JiaojieType = _liaotianService.GetSYScode("ADM_AskJiaojieDtl", "JiaojieType"); ViewData.Model = new AdmAskJiaojieDtlDTO(); return View(); } /// <summary> /// ä¿å /// </summary> /// <param name="data">å²ä½å®ä½ç±»å¯¹è±¡</param> /// <returns></returns> [HttpPost] public string SaveAskJiaojieDtl(AdmAskJiaojieDtlDTO data) { var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User")); ViewData["curentuser"] = curentuser; data.RecStatus = "A"; data.JiaojieStatus = "D"; if (String.IsNullOrEmpty(data.Id)) { data.Creater = curentuser.Id; data.Createtime = DateTime.Now; } data.Modifier = curentuser.Id; data.Modifytime = DateTime.Now; ResultEntity resultEntity = _askService.SaveAskJiaojieDtl(data); return JsonConvert.SerializeObject(resultEntity); } } } zhengcaioa/zhengcaioa/Views/AdmAsk/AskJiaojie.cshtml
New file @@ -0,0 +1,480 @@ @model AdmAskJiaojieDTO; @using DTO; @using zhengcaioa.Models; @{ Layout = null; //æµç¨ç¸å ³ string shifoubiaoji = ViewBag.shifoubiaoji as string; string sifoudangqian = ViewBag.sifoudangqian as string; string dangqianbuzhou = ViewBag.dangqianbuzhou as string; List<WfHistoryDTO> lishiyijian = ViewData["lishiyijian"] as List<WfHistoryDTO>; //审æ¹è¿åº¦ List<SysCodeDtl> shifou = ViewBag.shifou as List<SysCodeDtl>; List<AdmAskJiaojieDtlDTO> admAskJiaojieDtlDTOs = Model.admAskJiaojieDtlDTOs; } <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="description" content=""> <meta name="author" content="ThemeBucket"> <link href="~/css/bootstrap.min.css" rel="stylesheet"> <link href="~/css/font-awesome.min.css" rel="stylesheet"> <link href="~/css/animate.min.css" rel="stylesheet"> <link href="~/css/style.min.css" rel="stylesheet"> <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet"> <link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet"> <link href="~/css/style.min.css" rel="stylesheet"> <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" /> <!-- jqgrid--> <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script> <script src="~/js/bootstrap.min.js"></script> <!--容å¨--> <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script> <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script> <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script> <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script> <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script> <script src="~/js/TUJS.js"></script> <style type="text/css"> div.clearfix > label { padding-top: 8px; } .col-md-1.control-label { padding-right: 0px; font-weight: 400; } table { border-collapse: collapse; border-spacing: 0; } td, th { padding: 0; } .pure-table { border-collapse: collapse; border-spacing: 0; empty-cells: show; border: 1px solid #cbcbcb; } .pure-table caption { color: #000; font: italic 85%/1 arial,sans-serif; padding: 1em 0; text-align: center; } .pure-table td, .pure-table th { border-left: 1px solid #cbcbcb; border-width: 0 0 0 1px; font-size: inherit; margin: 0; overflow: visible; padding: .5em 1em; } .pure-table thead { background-color: #e0e0e0 !important; color: #000; text-align: left; vertical-align: bottom; -webkit-print-color-adjust: exact; } .pure-table td { background-color: transparent; } .pure-table-bordered td { border-bottom: 1px solid #cbcbcb; } .pure-table-bordered tbody > tr:last-child > td { border-bottom-width: 0; } </style> </head> <body class="gray-bg" style="overflow:auto"> <form id="fm" method="post"> <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;"> <div class="row"> <div class="col-sm-12"> <div class="ibox float-e-margins"> <div id="div_content" class="ibox-content" style="background-color:white;"> <div class="row"> <div class="clearfix layer-area" style="padding-bottom:15px;"> <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"> <input type="text" class="form-control" value="@Model.Tittle" name="tittle" id="tittle" validate="RequiredField" autocomplete="off" 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">ç³è¯·äºº<i class="red">*</i></label> <div class="col-sm-2 col-md-2"> <input type="text" class="form-control" value="@Model.CreaterName" name="createrName" id="createrName" validate="RequiredField" autocomplete="off" 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"> <input type="text" class="layui-input layer-date ldate form-control" value="@Model.JiaojietimeStartName" name="JiaojietimeStart" id="JiaojietimeStart" readonly="readonly"> </div> <label class="text-right col-sm-1 col-md-1 control-label">å°</label> <div class="col-sm-2 col-md-2"> <input type="text" class="layui-input layer-date ldate form-control" value="@Model.JiaojietimeEndName" name="JiaojietimeEnd" id="JiaojietimeEnd" readonly="readonly"> </div> <label class="text-right col-sm-1 col-md-1 control-label">æ¯å¦äº¤æ¥</label> <div class="col-sm-2 col-md-2"> <select id="JiaojieStatus" class="form-control" name="JiaojieStatus" data-placeholder="éæ© åºå ..." style="font-weight:normal;"> <option value="" hassubinfo="true">è¯·éæ©</option> @foreach (var item in shifou) { @if (Model.JiaojieStatus == item.CodeSn) { <option value="@item.CodeSn" hassubinfo="true" selected="selected"> @item.Comments </option> } else { <option value="@item.CodeSn" hassubinfo="true"> @item.Comments </option> } } </select> </div> <div class="col-sm-2 col-md-2"> <a class="btn btn-success" href="javascript:void(0)" onclick="chaxun();" style="margin-left:4px; border-radius:4px;"> æ¥è¯¢ </a> @if (dangqianbuzhou == "æäº¤") { <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAdd();" style="margin-left:4px; border-radius:4px;"> æ°å¢äº¤æ¥ </a> } </div> </div> <div class="clearfix layer-area" style="padding-bottom:15px;"> <table class="pure-table pure-table-bordered" style="width:100%;"> <thead> <tr> <th style="width:5%;"> éæ© </th> <th style="width:8%;"> åºå· </th> <th style="width:15%;"> äº¤æ¥æ¶é´ </th> <th style="width:15%;"> 交æ¥ç±»å </th> <th style="width:15%;"> 客æ·åä½ï¼å·¥ä½äºé¡¹ï¼ </th> <th style="width:15%;"> 交æ¥å 容 </th> <th style="width:15%;"> æ¥æ¶äºº </th> <th style="width:15%;"> æ¥æ¶æ¶é´ </th> </tr> </thead> <tbody> @{ if (admAskJiaojieDtlDTOs != null && admAskJiaojieDtlDTOs.Count > 0) { for (int i = 0; i < admAskJiaojieDtlDTOs.Count; i++) { <tr> <td><input type="checkbox" name="checkbox" value="@admAskJiaojieDtlDTOs[i].Id" /></td> <td>@(i+1)</td> <td>@admAskJiaojieDtlDTOs[i].JiaojietimeName</td> <td>@admAskJiaojieDtlDTOs[i].JiaojieTypeName</td> <td>@admAskJiaojieDtlDTOs[i].Kehudanwei</td> <td>@admAskJiaojieDtlDTOs[i].JiaojieNeirong</td> <td>@admAskJiaojieDtlDTOs[i].JiaojieUserName</td> <td>@admAskJiaojieDtlDTOs[i].JieShoutimeName</td> </tr> } } } </tbody> </table> </div> <div class="clearfix layer-area" style="padding-bottom:15px;" id="shenpiyijian"> <label class="text-right col-sm-1 col-md-1 control-label">å®¡æ¹æè§</label> <div class="col-sm-6 col-md-6"> <textarea class="form-control data" id="Content" name="Content" style="resize:none;overflow-y:hidden; height:80px;" maxlength="500"></textarea> </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-6 col-md-6"> <table> @if (lishiyijian.Count > 0) { <tr> <td style="border:1px solid #ccc;width:150px;">æ¥éª¤ </td> <td style="border:1px solid #ccc;width:150px;"> æ¹å¤ç¶æ</td> <td style="border:1px solid #ccc;width:150px;">æ¹å¤æ¶é´</td> <td style="border:1px solid #ccc;width:300px;"> å®¡æ¹æè§</td> <td style="border:1px solid #ccc;width:100px;"> æ¹å¤äºº</td> </tr> } @foreach (var wfHistory in lishiyijian) { <tr> <td style="border:1px solid #ccc;width:150px;">@wfHistory.Step</td> <td style="border:1px solid #ccc;width:150px;">@wfHistory.ChuliStatusName</td> <td style="border:1px solid #ccc;width:150px;">@wfHistory.ModifytimeName</td> <td style="border:1px solid #ccc;width:300px;">@wfHistory.Content</td> <td style="border:1px solid #ccc;width:100px;">@wfHistory.DeelUserIdName</td> </tr> } </table> </div> </div> <div class="clearfix layer-area" style="padding-bottom:60px;"> </div> </div> </div> </div> </div> </div> </div> <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"> <a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;"> <i class="glyphicon glyphicon-remove"></i> <span class="bold">åæ¶</span> </a> <a class="btn btn-success" id="tijiao" href="javascript:void(0)" onclick="saveSimCost('');" style="margin-left:4px; border-radius:4px;"> <i class="glyphicon glyphicon-ok"></i> <span class="bold">æäº¤</span> </a> <a class="btn btn-success" id="tongyi" href="javascript:void(0)" onclick="saveSimCost('A');" style="margin-left:4px; border-radius:4px;"> <span class="bold">交æ¥</span> </a> <input type="hidden" id="id" name="id" value="@Model.Id" /> <input type="hidden" id="Tongguojujue" name="Tongguojujue" value="" /> <input type="hidden" id="Step" name="Step" value="@dangqianbuzhou" /> <input type="hidden" id="JiaojieDtlId" name="JiaojieDtlId" value="" /> </div> </div> </form> <script type="text/javascript"> var hh = document.body.clientHeight - $("#top").height() * 2 - 50; $("#div_content").height(hh); toastr.options = { "closeButton": true, "debug": false, "progressBar": true, "positionClass": "toast-bottom-right", "onclick": null, "showDuration": "300", "hideDuration": "600", "timeOut": "4500", "extendedTimeOut": "600", "showEasing": "swing", "hideEasing": "linear", "showMethod": "fadeIn", "hideMethod": "fadeOut" }; $(function () { $('#shenpiyijian').hide(); if ("@shifoubiaoji" != "A") { //$("input").attr('readonly', true); //$("textarea").attr('readonly', true); //$(':radio').attr('disabled', true); //$(':checkbox').attr('disabled', true); //$(':button').attr('disabled', true); ////$('a').removeAttr('onclick'); // $('select').attr('disabled', true); // $("#fileUp").attr('disabled', true); // $('.fujianshanchu').removeAttr('onclick'); if ("@sifoudangqian" == "A") { $("#Content").attr('readonly', false); $('#tijiao').hide(); } else { $('#tongyi').hide(); $('#tijiao').hide(); $('#shenpiyijian').hide(); } } else { //审æ¹ç¸å ³ $('#shenpiyijian').hide(); if ("@sifoudangqian" == "A") { $('#tongyi').hide(); } else { $('#tongyi').hide(); $('#tijiao').hide(); } } $(".ldate").each(function (el) { laydate({ elem: "#" + $(this).attr('id'), //对åºid format: 'YYYY-MM-DD', //æ¥ææ ¼å¼ // åé符å¯ä»¥ä»»æå®ä¹ï¼è¯¥ä¾åè¡¨ç¤ºåªæ¾ç¤ºå¹´æ min: '2021-01-01', //è®¾å®æå°æ¥æä¸ºå½åæ¥æ max: '2099-06-16', //æå¤§æ¥æ type: 'datetime', festival: false, //æ¾ç¤ºèæ¥ istime: true,  //æ¯å¦æ¾ç¤ºæ¶åç§ istoday: true, //æ¯å¦æ¯ä»å¤© choose: function (datas) { //éæ©æ¥æå®æ¯çåè° // console.log("234234234234324"); // end.min = datas; //å¼å§æ¥é好åï¼éç½®ç»ææ¥çæå°æ¥æ // end.start = datas //å°ç»ææ¥çåå§å¼è®¾å®ä¸ºå¼å§æ¥ //checktime(); } }); }); }) function chaxun() { window.location.href = "/AdmAsk/AskJiaojie?id=@Model.Id&JiaojietimeStart=" + $("#JiaojietimeStart").val() + "&JiaojietimeEnd=" + $("#JiaojietimeEnd").val() + "&JiaojieStatus=" + $("#JiaojieStatus").val(); } // ä¿å function saveSimCost(tongyi) { var aa = ""; if (tongyi == "A") { $("input[name='checkbox']:checkbox:checked").each(function () { aa += $(this).val()+"," }) } if (aa == "") { toastr.warning("è¯·éæ©äº¤æ¥çå·¥ä½"); return; } $("#JiaojieDtlId").val(aa); $("#Tongguojujue").val(tongyi); $.ajax({ type: "POST", url: "/AdmAsk/SaveAskJiaojie", dataType: "json", global: false, data: $('#fm').serialize(), success: function (data) { if (data.Result) { parent.layer.msg('æäº¤æå', { icon: 6 }); try { _pageAutoClose();//èªå¨å ³é页颿¹æ³ } catch (err) { var pathname = window.location.pathname; var search = window.location.search; parent._CloseTab1(pathname + search); } } else { parent.layer.msg(data.Message, { icon: 5 }); } }, error: function () { parent.layer.msg('失败', { icon: 5 }); } }); } var _pageAdd = function () { OpenWindow("æ°å¢äº¤æ¥", "90%", "90%", "/AdmAsk/EditAskJiaojie?id=@Model.Id"); } function _pageAutoClose() { try { parent.window._reloadPageData(); var index = parent.layer.getFrameIndex(window.name); parent.layer.isRefresh = true; parent.layer.closeAll('loading'); parent.layer.close(index); return false; } catch (err) { var pathname = window.location.pathname; var search = window.location.search; parent._CloseTab1(pathname + search); } } </script> </body> </html> zhengcaioa/zhengcaioa/Views/AdmAsk/EditAskJiaojie.cshtml
New file @@ -0,0 +1,302 @@ @model DTO.AdmAskJiaojieDtlDTO @using DTO; @using zhengcaioa.Models; @{ string id = ViewBag.id as string; List<SysCodeDtl> JiaojieType = ViewBag.JiaojieType as List<SysCodeDtl>; //string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(','); } @{ Layout = null; } <!DOCTYPE html> <html> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="description" content=""> <meta name="author" content="ThemeBucket"> <title>@(SiteConfig.SiteName)</title> <link href="~/css/bootstrap.min.css" rel="stylesheet"> <link href="~/css/font-awesome.min.css" rel="stylesheet"> <link href="~/css/animate.min.css" rel="stylesheet"> @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@ <link href="~/css/style.min.css" rel="stylesheet"> <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet"> @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@ @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@ <link href="~/css/style.min.css" rel="stylesheet"> <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" /> <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" /> <style type="text/css"> .webuploader-pick { position: relative; display: inline-block; cursor: pointer; background: #00b7ee; padding: 8px 14px 7px 14px; color: #fff; text-align: center; border-radius: 3px; overflow: hidden; } div.clearfix > label { padding-top: 8px; } .chosen-container { border-radius: 1px; border: 1px solid #e5e6e7; } .col-md-1.control-label { padding-right: 0px; font-weight: 400; } </style> <!-- jqgrid--> @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@ <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script> <script src="~/js/bootstrap.min.js"></script> @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@ <!--容å¨--> @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@ @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@ @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@ <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script> @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@ <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script> @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@ @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@ <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script> <script src="~/js/plugins/webuploader/webuploader.min.js"></script> <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script> <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script> @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@ @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@ <script src="~/js/TUJS.js"></script> </head> <body class="gray-bg" style="overflow:auto"> <form id="formtest"> <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;"> <div class="row"> <div class="col-sm-12"> <div class="ibox float-e-margins"> <div class="ibox-title"> <h5> <i class="fa fa-list"></i> åºæ¬ä¿¡æ¯</h5> </div> <div id="div_content" class="ibox-content" style="background-color:white;"> <div class="row"> <div class="clearfix layer-area" style="padding-bottom:15px;"> <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"> <input type="text" class="layui-input layer-date ldate form-control" value="@Model.JiaojietimeName" name="Jiaojietime" id="Jiaojietime" readonly="readonly"> </div> <input type="hidden" id="JiaojieId" name="JiaojieId" value="@id" /> </div> <div class="clearfix layer-area" style="padding-bottom:15px;"> <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="JiaojieType" class="form-control" name="JiaojieType" data-placeholder="éæ© åºå ..." style="font-weight:normal;"> <option value="" hassubinfo="true">è¯·éæ©</option> @foreach (var item in JiaojieType) { @if (!item.CodeSn.Equals(Model.JiaojieType)) { <option value="@item.CodeSn" hassubinfo="true"> @item.Comments </option> } else { <option value="@item.CodeSn" hassubinfo="true" selected="selected"> @item.Comments </option> } } </select> </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-8 col-md-8"> <input class="form-control" label="客æ·åä½" name="Kehudanwei" id="Kehudanwei" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.Kehudanwei"> </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">交æ¥å 容<i class="red">*</i></label> <div class="col-sm-8 col-md-8"> <textarea class="form-control bt" id="JiaojieNeirong" name="JiaojieNeirong" title="夿³¨" isempty="" maxlength="500" length="long">@Model.JiaojieNeirong</textarea> </div> </div> </div> </div> </div> </div> </div> </div> <div class="wrapper wrapper-content" style="margin-top:0px"></div> <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="savePosition();" style="margin-left:4px; border-radius:4px;"> <i class="glyphicon glyphicon-ok"></i> <span class="bold">æäº¤</span> </a> </div> </div> </form> <script type="text/javascript"> var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2 - 95; $("#div_content").height(hh); toastr.options = { "closeButton": true, "debug": false, "progressBar": true, "positionClass": "toast-bottom-right", "onclick": null, "showDuration": "300", "hideDuration": "600", "timeOut": "4500", "extendedTimeOut": "600", "showEasing": "swing", "hideEasing": "linear", "showMethod": "fadeIn", "hideMethod": "fadeOut" }; $(".ldate").each(function (el) { laydate({ elem: "#" + $(this).attr('id'), //对åºid format: 'YYYY-MM-DD', //æ¥ææ ¼å¼ // åé符å¯ä»¥ä»»æå®ä¹ï¼è¯¥ä¾åè¡¨ç¤ºåªæ¾ç¤ºå¹´æ min: '2021-01-01', //è®¾å®æå°æ¥æä¸ºå½åæ¥æ max: '2099-06-16', //æå¤§æ¥æ type: 'datetime', festival: false, //æ¾ç¤ºèæ¥ istime: true,  //æ¯å¦æ¾ç¤ºæ¶åç§ istoday: true, //æ¯å¦æ¯ä»å¤© choose: function (datas) { //éæ©æ¥æå®æ¯çåè° // console.log("234234234234324"); // end.min = datas; //å¼å§æ¥é好åï¼éç½®ç»ææ¥çæå°æ¥æ // end.start = datas //å°ç»ææ¥çåå§å¼è®¾å®ä¸ºå¼å§æ¥ //checktime(); } }); }); // ä¿åå²ä½ä¿¡æ¯ var savePosition = function () { if ($("#Jiaojietime").val() == '') { toastr.warning("äº¤æ¥æ¶é´ä¸è½ä¸ºç©º"); return; } if ($("#JiaojieType").val() == '') { toastr.warning("交æ¥ç±»åä¸è½ä¸ºç©º"); return; } if ($.trim($("#JiaojieNeirong").val()) == '') { toastr.warning("交æ¥å 容ä¸è½ä¸ºç©º"); return; } //var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" } $.ajax({ type: "POST", url: "/AdmAsk/SaveAskJiaojieDtl", dataType: "json", global: false, data: $('form').serializeArray(), success: function (data) { if (data.Result) { // parent._afterSave(true); parent.layer.msg('æåä¿å', { icon: 6 }); //window.location = "/Project/add?id=" + data.ReturnID; try { _pageAutoClose();//èªå¨å ³é页颿¹æ³ } catch (err) { parent._CloseTab1("/AdmAsk/EditAskJiaojie/"); } } else { // toastr.error("失败"); parent.layer.msg(data.Message, { icon: 5 }); } }, error: function () { parent.layer.msg('失败', { icon: 5 }); } }); } function _pageAutoClose() { parent.window.chaxun(); var index = parent.layer.getFrameIndex(window.name); parent.layer.isRefresh = true; parent.layer.closeAll('loading'); parent.layer.close(index); return false; } </script> </body> </html> zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
@@ -131,6 +131,7 @@ </select> <input type="hidden" id="Id" name="Id" value="@Model.Id" /> <input type="hidden" id="Yixiang" name="Yixiang" value="@Model.Yixiang" /> </div> ±íÐÞ¸Ä.sql
@@ -1,6 +1,180 @@ USE [zhengcaioa] GO /****** Object: Table [dbo].[ADM_AskJiaojie] Script Date: 2021/8/26 8:56:15 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO CREATE TABLE [dbo].[ADM_AskJiaojie]( [Id] [nvarchar](50) NOT NULL, [CiZhiId] [nvarchar](50) NULL, [Remark] [nvarchar](500) NULL, [shenpi_status] [nvarchar](1) NULL, [rec_status] [nvarchar](1) NOT NULL, [creater] [nvarchar](50) NOT NULL, [createtime] [datetime] NOT NULL, [modifier] [nvarchar](50) NOT NULL, [modifytime] [datetime] NOT NULL, [createrName] [nvarchar](50) NULL, [tittle] [nvarchar](50) NULL, CONSTRAINT [PK__AskJiaojie__3214EC077AC5FA48] PRIMARY KEY CLUSTERED ( [Id] ASC )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 100) ON [PRIMARY] ) ON [PRIMARY] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT ('D') FOR [shenpi_status] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT ('A') FOR [rec_status] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT ('1') FOR [creater] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT (getdate()) FOR [createtime] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT ('1') FOR [modifier] GO ALTER TABLE [dbo].[ADM_AskJiaojie] ADD DEFAULT (getdate()) FOR [modifytime] GO USE [zhengcaioa] GO /****** Object: Table [dbo].[ADM_AskJiaojieDtl] Script Date: 2021/8/26 8:56:15 ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO CREATE TABLE [dbo].[ADM_AskJiaojieDtl]( [Id] [nvarchar](50) NOT NULL, [JiaojieId] [nvarchar](50) NULL, [Jiaojietime] [datetime] NULL, [JiaojieType] [nvarchar](50) NULL, [Kehudanwei] [nvarchar](500) NULL, [JiaojieNeirong] [nvarchar](500) NULL, [JiaojieUserId] [nvarchar](50) NULL, [JieShoutime] [datetime] NULL, [jiaojie_status] [nvarchar](1) NULL, [rec_status] [nvarchar](1) NOT NULL, [creater] [nvarchar](50) NOT NULL, [createtime] [datetime] NOT NULL, [modifier] [nvarchar](50) NOT NULL, [modifytime] [datetime] NOT NULL, CONSTRAINT [PK__AskJiaojieDtl__3214EC077AC5FA48] PRIMARY KEY CLUSTERED ( [Id] ASC )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 100) ON [PRIMARY] ) ON [PRIMARY] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT ('D') FOR [jiaojie_status] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT ('A') FOR [rec_status] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT ('1') FOR [creater] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT (getdate()) FOR [createtime] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT ('1') FOR [modifier] GO ALTER TABLE [dbo].[ADM_AskJiaojieDtl] ADD DEFAULT (getdate()) FOR [modifytime] GO USE [zhengcaioa] GO /****** Object: Table [dbo].[ADM_AskCiZhi] Script Date: 2021/8/25 8:43:44 ******/ SET ANSI_NULLS ON GO