教育培训需求变更 代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/DateUtils.java

@@ -162,6 +162,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return Date.from(zdt.toInstant());
     }
 
+    public static LocalDateTime toLocalDateTime(Date date) {
+        return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+    }
+
+    public static LocalDate toLocalDate(Date date) {
+        return toLocalDateTime(date).toLocalDate();
+    }
+
     public static DateRange getStartAndEnd(Date date, int planCycle) {
         LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         LocalDateTime startDateTime;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingTaskController.java

@@ -54,7 +54,7 @@ public class CoreEduTrainingTaskController extends BaseController {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskById(id));
     }
 
-    @ApiOperation(value = "新增教育任务")
+    @ApiOperation(value = "新增教育任务,任务补录")
     @RequiresPermissions("core:eduTask:add")
     @Log(title = "教育任务", businessType = BusinessType.INSERT)
     @PostMapping("/add")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -219,6 +219,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         task.setOrgPath(sysOrg.getPath());
         BeanUtils.copyProperties(request,task);
         task.setCreateTime(DateUtils.getNowDate());
+        task.setTrainingStartDateTime(DateUtils.toLocalDateTime(request.getTrainingStartDateTime()));
+        task.setTrainingEndDateTime(DateUtils.toLocalDateTime(request.getTrainingEndDateTime()));
         if (ObjectUtil.isNotEmpty(request.getFileList())) {
             task.setFileList(com.alibaba.fastjson.JSON.toJSONString(request.getFileList()));
         }
@@ -367,6 +369,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     private void saveTaskAndRoleData(CoreEduTrainingPlanDataVo plan, Date start, Date end, List<SysOrg> orgList) {
+        System.out.println("12121212");
         //List<CoreEduTrainingPlanToRole> planRoleList = plan.getPlanRoleList();
         List<CoreEduTrainingTask> taskList = new ArrayList<>();
         List<CoreEduTrainingTaskToRole> taskRoleList = new ArrayList<>();