From 0a0421f0411471b83a8ff2356325ce21aeace60c Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期三, 10 八月 2022 14:58:04 +0800 Subject: [PATCH] 权限修改 --- zhengcaioa/Services/CooperOrderService.cs | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 1 deletions(-) diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs index 99e418d..03ed8db 100644 --- a/zhengcaioa/Services/CooperOrderService.cs +++ b/zhengcaioa/Services/CooperOrderService.cs @@ -90,6 +90,9 @@ updateproject.SonghuoTime1 = entity.SonghuoTime1; updateproject.HuifangJdr = entity.HuifangJdr; updateproject.HuifangKehuyijian = entity.HuifangKehuyijian; + updateproject.Xmname = entity.Xmname; + updateproject.Xmcode = entity.Xmcode; + updateproject.Jichumoney = entity.Jichumoney; } @@ -964,6 +967,53 @@ } + public List<TChallengeletterDTO> GetListChallengelettertousu(string customid, string XmCode) + { + + var entity = (from a in _context.CooperOrders.Where(x=>x.OrderType1== "浠f嫙璐ㄧ枒鍑�" && x.RecStatus == "A" && x.Khdw == customid) + join b in _context.TChallengeletters.Where(x=>x.XmCode == XmCode) on a.Id equals b.OrderId + select b ).ToList(); + + + //_context.TChallengeletters.Where(x =>/* x.Status == 1 && */x.OrderId == OrderId).ToList(); + + + + var result = _mapper.Map<List<TChallengeletterDTO>>(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" + 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 + } + ).Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList(); + foreach (var challengeletterDTO in result) + { + var codeDataEntity = listCode.Where(x => x.CodeSn == challengeletterDTO.RequestInfo).FirstOrDefault(); + if (codeDataEntity != null) + { + challengeletterDTO.RequestInfoName = codeDataEntity.Comments; + } + + } + + + return result; + } + + public List<TChallengeletterDTO> GetListChallengeletterChosen() { var query = (from a in _context.TChallengeletters @@ -1175,6 +1225,7 @@ updateproject.Law = entity.Law; updateproject.Sort = entity.Sort; updateproject.Lawcoment = entity.Lawcoment; + updateproject.Questionname = entity.Questionname; } @@ -1457,7 +1508,7 @@ updateproject.Law = entity.Law; updateproject.Sort = entity.Sort; updateproject.Lawcoment = entity.Lawcoment; - + updateproject.Questionname = entity.Questionname; } @@ -1985,5 +2036,115 @@ return entity; } + + + public List<TChallengeRequestInfoDTO> GetListChallengeRequestInfo(string ChallengeId) + { + + var entity = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).OrderBy(x => x.Id).ToList(); + + + + var result = _mapper.Map<List<TChallengeRequestInfoDTO>>(entity); + + + var request_info = (from a in _context.SysCodeDtls + join b in _context.SysCodes + on a.CodeId equals b.Id + where a.RecStatus == "A" + && b.RecStatus == "A" + 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 + } + ).Where(x => x.CodeTable == "t_challengeletter" && x.CodeField == "request_info").ToList(); + + + + + foreach (var challengeItemDTO in result) + { + var codeDataEntity = request_info.Where(x => x.CodeSn == challengeItemDTO.RequestInfo).FirstOrDefault(); + if (codeDataEntity != null) + { + challengeItemDTO.RequestInfoNameName = codeDataEntity.Comments; + } + + + } + + + return result; + } + + + public ResultEntity saveChallengeRequestInfo(TChallengeRequestInfoDTO dto) + { + ResultEntity resultEntity = new ResultEntity(); + try + { + + + var entity = _mapper.Map<TChallengeRequestInfo>(dto); + + + if (entity.Id <= 0) + { + + + _context.TChallengeRequestInfos.Add(entity); + } + else + { + var updateproject = _context.TChallengeRequestInfos.Find(entity.Id); + + + updateproject.ChallengeId = entity.ChallengeId; + updateproject.RequestInfo = entity.RequestInfo; + updateproject.RequestInfoname = entity.RequestInfoname; + + + } + + _context.SaveChanges(); + resultEntity.ReturnID = entity.Id.ToString(); + resultEntity.Result = true; + } + catch (Exception ex) + { + resultEntity.Result = false; + resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠$悊鍛�"; + + } + return resultEntity; + } + + + /// <summary> + /// 鍒犻櫎璐ㄧ枒鍑藉瓙琛� + /// </summary> + /// <returns></returns> + public ResultEntity deleteChallengeRequestInfo(string ChallengeId) + { + ResultEntity result = new ResultEntity(); + result.Result = true; + + var models = _context.TChallengeRequestInfos.Where(x => x.ChallengeId == ChallengeId).ToList(); ; + + foreach (var challengeItem in models) + { + _context.TChallengeRequestInfos.Remove(challengeItem); + } + _context.SaveChanges(); + return result; + } + } } -- Gitblit v1.9.1