Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/TradePavilion/RB_FirstShop_ListEnroll.cs

@@ -65,7 +65,7 @@ namespace Mall.Model.Entity.TradePavilion
         public string MedalImageBig { get; set; }
 
         /// <summary>
-        /// 候选状态  1报名中  2候选  3淘汰 
+        /// 候选状态  1未评比  2候选  3淘汰 
         /// </summary>
         public int CandidateState { get; set; }
 

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -796,8 +796,8 @@ namespace Mall.Module.TradePavilion
             if (listModel.PrizeNum != deList.Count()) { return "名单数量不正确"; }
             //首先清除历史评比
             firstShop_ListEnrollRepository.ClearHostoryAppraisal(listId, mallBaseId);
-            int RankListState = type == 1 ? 3 : 2;
-            if (type == 1)
+            int RankListState = type == 1 ? 3 : 1;
+            if (type == 2)
             {
                 //设置榜单为已放榜
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
@@ -823,7 +823,7 @@ namespace Mall.Module.TradePavilion
                     { nameof(RB_FirstShop_ListEnroll_Extend.MedalImageBig),item.MedalImageBig },
                     { nameof(RB_FirstShop_ListEnroll_Extend.RankListState),RankListState },
                     { nameof(RB_FirstShop_ListEnroll_Extend.UpdateBy),empId },
-                    { nameof(RB_FirstShop_ListEnroll_Extend.UpdateDate),item.Reviews }
+                    { nameof(RB_FirstShop_ListEnroll_Extend.UpdateDate),DateTime.Now }
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
                     new WhereHelper(){

Mall.Repository/TradePavilion/RB_FirstShop_ListRepository.cs

@@ -189,7 +189,7 @@ where {where} order by w.Id desc
             }
             if (dmodel.CreateBy > 0)
             {
-                where += $@" and w.{nameof(RB_FirstShop_ListEnroll_Extend.UserId)}={dmodel.CreateBy}";
+                where += $@" and e.{nameof(RB_FirstShop_ListEnroll_Extend.UserId)}={dmodel.CreateBy}";
             }
 
             string sql = $@"select w.*,e.ObjectType,e.ObjectId,e.Rank,e.MedalImage,e.RankListState from RB_FirstShop_List w

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -2426,6 +2426,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             RB_FirstShop_List_Extend demodel = JsonHelper.DeserializeObject<RB_FirstShop_List_Extend>(req.msg.ToString());
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.CreateBy = userInfo.UserId;
 
             var list = firstShopListModule.GetAppletMyEnrollFistShopListPageList(pageModel.pageIndex, pageModel.pageSize, out long count, demodel);
             pageModel.count = Convert.ToInt32(count);