bug修复

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

@@ -49,6 +49,8 @@ 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;
@@ -200,8 +202,8 @@ public class ActivityInfoController {
             }
             infoVo.setName(objectMap.get("training_name").toString());
             infoVo.setContent(objectMap.get("training_topic").toString());
-            infoVo.setStartDate((Date)objectMap.get("start_time"));
-            infoVo.setEndDate((Date)objectMap.get("end_time"));
+            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.setPlace(objectMap.get("training_address").toString());
             infoVo.setDutyPerson(objectMap.get("person_in_charge").toString());
         }else if(category == 6){

src/main/java/com/xjrsoft/module/form/service/impl/FormExecuteServiceImpl.java

@@ -102,7 +102,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -1311,8 +1310,6 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
                         throw new MyException("更新数据失败");
                     }
                 }
-
-
                 // 遍历数据 根据 表名 保存子表数据
                 for (Map.Entry<String, List<Entity>> tableMap : childMaps.entrySet()) {
                     //先删除子表单数据 然后再新增  这里使用物理删除  不再逻辑删除。  tableMap的key  就是 子表的表名