招募贴我的报名列表

Mall.Module.Miai/MiaiModule.cs

@@ -193,7 +193,7 @@ namespace Mall.Module.Miai
                 UserName = umodel.Name,
                 umodel.Photo,
                 Sex,
-                Deadline = model.Deadline.ToString("yyyy-MM-dd"),
+                Deadline = model.Deadline.ToString("yyyy-MM-dd HH:mm"),
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
                 IsEnroll,
@@ -225,7 +225,7 @@ namespace Mall.Module.Miai
                 model.UserId,
                 UserName = umodel.Name,
                 umodel.Photo,
-                Deadline = model.Deadline.ToString("yyyy-MM-dd"),
+                Deadline = model.Deadline.ToString("yyyy-MM-dd HH:mm"),
                 CreateDate = model.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 PeopleNum,
                 ReplyNum = rlist.FirstOrDefault()?.ReplyNum ?? 0
@@ -577,6 +577,12 @@ namespace Mall.Module.Miai
             var model = miai_ActivityEnrollRepository.GetEntity(enrollId);
             if (model == null || model.Status == 1) { return "已取消报名"; }
             if (model.UserId != userInfo.UserId) { return "没有取消权限"; }
+            var amodel = miai_ActivityRepository.GetEntity(model.ActivityId);
+            if (amodel == null || amodel.Status == 1) { return "帖子已被删除"; }
+            if (amodel.Deadline <= DateTime.Now)
+            {
+                return "已过了报名时间，无法报名";
+            }
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_Miai_ActivityEnroll_Extend.Status),1 },
                 { nameof(RB_Miai_ActivityEnroll_Extend.UpdateDate),DateTime.Now },

Mall.Repository/Miai/RB_Miai_ActivityEnrollRepository.cs

@@ -106,7 +106,11 @@ where {where} order by e.Id desc";
         /// <returns></returns>
         public List<RB_Miai_ActivityEnroll_Extend> GetMyEnrollPageList(int pageIndex, int pageSize, out long count, RB_Miai_ActivityEnroll_Extend dmodel)
         {
-            string where = $" 1=1 and {nameof(RB_Miai_ActivityEnroll_Extend.Status)}=0 ";
+            string where = $" 1=1 ";
+            if (dmodel.Status >= 0)
+            {
+                where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.Status)}={dmodel.Status}";
+            }
             if (dmodel.TenantId > 0)
             {
                 where += $@" and {nameof(RB_Miai_ActivityEnroll_Extend.TenantId)}={dmodel.TenantId}";

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -83,7 +83,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ImageList,
                 x.ReplyNum,
                 x.EnrollNum,
-                Deadline = x.Deadline.ToString("yyyy-MM-dd"),
+                Deadline = x.Deadline.ToString("yyyy-MM-dd HH:mm"),
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);
@@ -432,6 +432,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Mobile,
                 x.PeopleNum,
                 x.Remark,
+                x.Status,
                 ActivityModel = new {
                     x.ActivityModel?.Id,
                     x.ActivityModel?.ActivityTitle,

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -135,7 +135,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ImageList,
                 x.ReplyNum,
                 x.EnrollNum,
-                Deadline = x.Deadline.ToString("yyyy-MM-dd"),
+                Deadline = x.Deadline.ToString("yyyy-MM-dd HH:mm"),
                 CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pagelist);