提交

PC-201906131823\Administrator

2021-11-10 c1ec7e06f7b44beaf793af23477e1134451c80ae

 zhengcaioa/Services/ExpertTestTopicService.cs

@@ -121,7 +121,7 @@
                {
                    for (int i = 0; i < Falv.Length; i++)
                    {
                        if (!string.IsNullOrEmpty(dto.Falv[i]))
                        if (!string.IsNullOrEmpty(dto.Falv[i]) || !string.IsNullOrEmpty(dto.Fatiao[i]) || !string.IsNullOrEmpty(dto.Fatiaomingxi[i]))
                        {
                            ExpertTestTopicjiexi expertTestTopicjiexi = new ExpertTestTopicjiexi();

@@ -132,6 +132,7 @@
                            expertTestTopicjiexi.Falv = dto.Falv[i];
                            expertTestTopicjiexi.Fatiao = dto.Fatiao[i];
                            expertTestTopicjiexi.Flag = dto.Flag[i];
                            expertTestTopicjiexi.Jiexi = dto.Fatiaomingxi[i];  
                            expertTestTopicjiexi.Creater = dto.Modifier;
                            expertTestTopicjiexi.Createtime = DateTime.Now;
                            expertTestTopicjiexi.Modifier = dto.Modifier;
@@ -326,10 +327,42 @@

                foreach (var quer in querydel)
                {
                    lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
                    if (lian.Topictype != "03")
                    {
                        lian.Topic += quer.Anwserno + " " + quer.Anwser + " </br>";
                    }
                 
                    if(quer.Shifouzhengqu == "A")
                    {
                        lian.Anwsers += quer.Anwserno ;
                    }
                    
                }
            }


            var queryjiexis = (from aaa in _context.ExpertTestTopicjiexis.Where(x => x.RecStatus == "A" && lianlist11.Contains(x.Topic)) select aaa).ToList();
            var falvs = listCode.Where(x => x.CodeTable == "expert_test_topicjiexi" && x.CodeField == "falv").ToList();
            foreach (var lian in lianlist)
            {
                var queryjiexi = queryjiexis.Where(x => x.Topic == lian.Id).OrderBy(x => x.Flag).ToList();
                var jiexi = "";
                foreach (var quer in queryjiexi)
                {
                 var falv = falvs.Where(x => x.CodeSn == quer.Falv).FirstOrDefault();

                    jiexi +=(falv!=null? "《" + falv.Comments + "》" : "") + " " + quer.Fatiao + " " + quer.Jiexi + " </br>" ;
                }
                if (string.IsNullOrEmpty(lian.Jiexi))
                {
                    lian.Jiexi = jiexi;
                }
                else
                {
                    lian.Jiexi = jiexi + lian.Jiexi + " </br>";
                }
               
            }

            data.LoadData(searchEntity, lianlist);
            return data;
@@ -760,7 +793,7 @@
                                Modifytime = a.Modifytime,

                            }
                ).OrderBy(x => x).ToList();
                ).OrderBy(x => x.Resulttype).ToList();

            return listRole;
        }
@@ -813,9 +846,10 @@
                                TopictypeName = eee.Comments,
                                Zhishitype = a.Zhishitype,
                                ZhishitypeName = fff.Comments,
                                Fenshu = a.Fenshu,
                                Fenzhi = a.Fenzhi,

                                Fenshu = a.Fenshu ?? 0,
                                Fenzhi = a.Fenzhi??0,
                                FenshuName = (a.Fenshu ?? 0).ToString("0.##"),
                                FenzhiName = (a.Fenzhi ?? 0).ToString("0.##"),
                                Creater = a.Creater,
                                Createtime = a.Createtime,

@@ -927,5 +961,40 @@
            return resultEntity;
        }



        public ExpertTestResultDTO GetResult(string Resulttype)
        {

            var entity = _context.ExpertTestResults.Where(x=>x.RecStatus =="A" && x.Resulttype == Resulttype).FirstOrDefault();

            if (entity==null)
            {
                entity = new ExpertTestResult();
            }

            var result = _mapper.Map<ExpertTestResultDTO>(entity);


            return result;
        }


        public ExpertTestTopicpeizhiDTO Getpeizhi(string Topictype, string Zhishitype)
        {

            var entity = _context.ExpertTestTopicpeizhis.Where(x => x.RecStatus == "A" && x.Topictype == Topictype && x.Zhishitype == Zhishitype).FirstOrDefault();

            if (entity == null)
            {
                entity = new ExpertTestTopicpeizhi();
            }

            var result = _mapper.Map<ExpertTestTopicpeizhiDTO>(entity);


            return result;
        }

    }
}