活动报名判断修改

src/main/java/platform/modules/api/web/ActivityOpenController.java

@@ -104,12 +104,12 @@ public class ActivityOpenController extends BaseController {
      * @Return: platform.modules.sys.web.ResponseMessage
      **/
     @GetMapping(value = "/is_regist")
-    public ResponseMessage getActivityDetail(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
+    public ResponseMessage getActivityDetail(@RequestParam("activity_id") String id, @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "user_id", required = false) String userId) {
 
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, null);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, userId);
         if (!CollectionUtils.isEmpty(activityRegistrationList)) {
             for (ActivityRegistration activityRegistration : activityRegistrationList) {
-                if (!Objects.equals("3", activityRegistration.getReview_state())) {
+                if (Objects.equals("0", activityRegistration.getReview_state())) {
                     return ResponseMessage.success("查询成功!", true);
                 }
             }
@@ -220,9 +220,9 @@ public class ActivityOpenController extends BaseController {
      * @Return: platform.modules.sys.web.ResponseMessage
      **/
     @GetMapping(value = "/regist_user/list")
-    public ResponseMessage getCurrRegUsers(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
+    public ResponseMessage getCurrRegUsers(@RequestParam("activity_id") String id, @RequestParam("phone") String phone, @RequestParam("userId") String userId) {
 
-        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, null);
+        List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone, userId);
         return ResponseMessage.success("查询成功!", activityRegistrationList);
     }
 
@@ -287,10 +287,16 @@ public class ActivityOpenController extends BaseController {
     //根据手机号获取报名信息
     @OperationLog(value = "根据手机号获取报名信息")
     @GetMapping(value = "/registration")
-    public ResponseMessage getByPhone(@RequestParam("activity_id") Integer id, @RequestParam("phone") String phone) {
+    public ResponseMessage getByPhone(@RequestParam("activity_id") Integer id, @RequestParam(value = "phone", required = false) String phone, @RequestParam(value = "user_id", required = false) String userId) {
 
         ActivityRegistration activityRegistration = new ActivityRegistration();
         activityRegistration.setActivity_id(id);
+        if (StringUtils.isNotBlank(phone)) {
+            activityRegistration.setPhone(phone);
+        }
+        if (StringUtils.isNotBlank(userId)) {
+            activityRegistration.setUser_id(Integer.valueOf(userId));
+        }
         activityRegistration.setPhone(phone);
         List<ActivityRegistration> ret = activityRegistrationService.findListByWhere(activityRegistration);
         Iterator<ActivityRegistration> it = ret.iterator();