修改 活动地址添加地图选点功能

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

@@ -1,7 +1,5 @@
 package platform.modules.api.web;
 
-import com.alibaba.fastjson.JSON;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -10,7 +8,6 @@ import platform.common.Constant;
 import platform.common.annotation.OperationLog;
 import platform.common.base.controller.BaseController;
 import platform.common.util.ShiroUtils;
-import platform.common.util.WxAppUtil;
 import platform.modules.build.entity.Company;
 import platform.modules.build.service.CompanyService;
 import platform.modules.government.dto.ParamRegistration;
@@ -107,9 +104,14 @@ public class ActivityOpenController extends BaseController {
     public ResponseMessage getActivityDetail(@RequestParam("activity_id") String id, @RequestParam("phone") String phone) {
 
         List<ActivityRegistration> activityRegistrationList = activityRegistrationService.getCurrRegUsers(id, phone);
-        if (CollectionUtils.isEmpty(activityRegistrationList))
-            return ResponseMessage.success("查询成功!", false);
-        return ResponseMessage.success("查询成功!", true);
+        if (!CollectionUtils.isEmpty(activityRegistrationList)){
+            for (ActivityRegistration activityRegistration : activityRegistrationList) {
+                if(!Objects.equals("3",activityRegistration.getReview_state())){
+                    return ResponseMessage.success("查询成功!", true);
+                }
+            }
+        }
+        return ResponseMessage.success("查询成功!", false);
     }
 
     /**

src/main/java/platform/modules/government/web/ActivityController.java

@@ -1076,5 +1076,18 @@ public class ActivityController extends BaseController {
         is.close();
         os.close();
     }
+
+    /**
+     * 跳转到地图
+     *
+     * @return
+     * @throws Exception
+     */
+    @GetMapping(value = "/map")
+    public String toMap() throws Exception {
+        log.info("跳转到地图!");
+
+        return BASE_GOVERNMENT_PATH + "map_component/map";
+    }
 }
 

src/main/java/platform/modules/sys/entity/ActivityDetail.java

@@ -21,6 +21,8 @@ public class ActivityDetail extends BaseEntity {
 
     private String activity_location;
 
+    private String lat_lng;
+
     private String activity_starttime;
 
     private String activity_endtime;