活动bug修复

src/main/java/com/xjrsoft/module/activity/controller/ActivityInfoController.java

@@ -8,24 +8,18 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.module.activity.dto.ActivityEnrollExportDto;
-import com.xjrsoft.module.activity.dto.ActivityEnrollPageDto;
 import com.xjrsoft.module.activity.dto.ActivityInfoPageDto;
 import com.xjrsoft.module.activity.dto.AddActivityEnrollRangeDto;
 import com.xjrsoft.module.activity.dto.AddActivityInfoDto;
 import com.xjrsoft.module.activity.dto.ChangeStatusDto;
 import com.xjrsoft.module.activity.dto.UpdateActivityInfoDto;
 import com.xjrsoft.module.activity.entity.ActivityEnroll;
-import com.xjrsoft.module.activity.entity.ActivityEnrollRange;
 import com.xjrsoft.module.activity.entity.ActivityInfo;
 import com.xjrsoft.module.activity.service.IActivityEnrollRangeService;
 import com.xjrsoft.module.activity.service.IActivityEnrollService;
@@ -55,8 +49,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -166,52 +158,65 @@ public class ActivityInfoController {
 
             Set<ActivityEnrollPageVo> notSuretSet = enrollList.stream().filter(x -> x.getStatus() == 0).collect(Collectors.toSet());
             infoVo.setNotSureCount(notSuretSet.size());
-        }else if(category != null && category == 3){
+        }else if(category == 3){
             String tableName = "club_activities";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
+            if(objectMap == null){
+                return RT.ok(infoVo);
+            }
+
             infoVo.setName(objectMap.get("club_activities_name").toString());
             infoVo.setContent(objectMap.get("club_activities_content").toString());
-            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
-            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setStartDate((Date)objectMap.get("start_time"));
+            infoVo.setEndDate((Date)objectMap.get("end_time"));
             infoVo.setPlace(objectMap.get("activity_location").toString());
-        }else if(category != null && category == 4){
+        }else if(category == 4){
             String tableName = "moral_event";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
+            if(objectMap == null){
+                return RT.ok(infoVo);
+            }
             infoVo.setName(objectMap.get("moral_event_name").toString());
             infoVo.setContent(objectMap.get("event_content").toString());
-            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("event_start_time")).atZone(ZoneId.systemDefault()).toInstant()));
-            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("event_end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setStartDate((Date)objectMap.get("event_start_time"));
+            infoVo.setEndDate((Date)objectMap.get("event_end_time"));
             infoVo.setPlace(objectMap.get("event_address").toString());
             infoVo.setOrgName(objectMap.get("host_unit").toString());
             infoVo.setDutyPerson(objectMap.get("event_leader").toString());
-        }else if(category != null && category == 5){
+        }else if(category == 5){
             String tableName = "wf_teacher_training";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
+            if(objectMap == null){
+                return RT.ok(infoVo);
+            }
             infoVo.setName(objectMap.get("training_name").toString());
             infoVo.setContent(objectMap.get("training_topic").toString());
-            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("start_time")).atZone(ZoneId.systemDefault()).toInstant()));
-            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setStartDate((Date)objectMap.get("start_time"));
+            infoVo.setEndDate((Date)objectMap.get("end_time"));
             infoVo.setPlace(objectMap.get("training_address").toString());
             infoVo.setDutyPerson(objectMap.get("person_in_charge").toString());
-        }else if(category != null && category == 6){
+        }else if(category == 6){
             String tableName = "party_build_event";
             Entity where = Entity.create(tableName);
             where.set("id", id);
             Map<String, Object> objectMap = SqlRunnerAdapter.db().dynamicSelectOne(tableName, where);
             infoVo = new ActivityInfoVo();
+            if(objectMap == null){
+                return RT.ok(infoVo);
+            }
             infoVo.setName(objectMap.get("event_type").toString());
             infoVo.setContent(objectMap.get("event_content").toString());
-            infoVo.setStartDate(Date.from(((LocalDateTime)objectMap.get("event_start_time")).atZone(ZoneId.systemDefault()).toInstant()));
-            infoVo.setEndDate(Date.from(((LocalDateTime)objectMap.get("event_end_time")).atZone(ZoneId.systemDefault()).toInstant()));
+            infoVo.setStartDate((Date)objectMap.get("event_start_time"));
+            infoVo.setEndDate((Date)objectMap.get("event_end_time"));
             infoVo.setPlace(objectMap.get("event_address").toString());
         }