Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EvaluationTeach/Eval_Main/Eval_MainService.cs

@@ -176,12 +176,33 @@ namespace Learun.Application.TwoDevelopment.EvaluationTeach
         /// <returns></returns>
         public void DeleteEntity(string keyValue)
         {
+            var db = this.BaseRepository().BeginTrans();
             try
             {
-                this.BaseRepository().Delete<Eval_MainEntity>(t => t.VID == keyValue);
+                var entity = this.BaseRepository().FindEntity<Eval_MainEntity>(x => x.VID == keyValue);
+                if (entity != null)
+                {
+                    var questionList = this.BaseRepository().FindList<Eval_QuestionEntity>(x => x.VID == entity.VID);
+                    if (questionList.Any())
+                    {
+                        foreach (var item in questionList)
+                        {
+                            var qitemsList = this.BaseRepository().FindList<Eval_QuestionItemsEntity>(x => x.QID == item.QID);
+                            //删除答案
+                            db.Delete(qitemsList.ToList());
+                        }
+                        //删除问题
+                        db.Delete(questionList.ToList());
+                    }
+                    //删除问卷
+                    db.Delete(entity);
+                }
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;