教育培训任务代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskEditDto.java

@@ -18,18 +18,6 @@ public class CoreEduTrainingTaskEditDto {
     @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
     private Long id;
 
-    @ApiModelProperty(value = "教育培训计划Id")
-    private Long planId;
-
-    @ApiModelProperty(value = "机构")
-    private Long orgId;
-
-    @ApiModelProperty(value = "机构名称")
-    private String orgName;
-
-    @ApiModelProperty(value = "学习主题")
-    private String title;
-
     /**
      * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
      * 类型
@@ -37,18 +25,6 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "类型")
     private Integer type;
 
-    @ApiModelProperty(value = "类型名称")
-    private String typeText;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "开始日期")
-    private LocalDateTime startDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "截止日期")
-    private LocalDateTime endDate;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private LocalDateTime trainingStartDateTime;
@@ -68,8 +44,6 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "图片")
     private List<String> imageList;
 
-    @ApiModelProperty(value = "附件")
-    private List<String> fileList;
     @ApiModelProperty(value = "提交类型", notes = "1:暂存,2:提交")
     private Integer submitType;
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskDetailVo.java

@@ -6,7 +6,7 @@ import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -57,19 +57,19 @@ public class CoreEduTrainingTaskDetailVo {
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务开始日期")
-    private Date startDate;
+    private LocalDateTime startDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "计划任务截止日期")
-    private Date endDate;
+    private LocalDateTime endDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
-    private Date trainingStartDateTime;
+    private LocalDateTime trainingStartDateTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
-    private Date trainingEndDateTime;
+    private LocalDateTime trainingEndDateTime;
 
     @ApiModelProperty(value = "内容")
     private String content;

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

@@ -35,19 +35,15 @@ public class CoreEduTrainingTaskController extends BaseController {
     @Autowired
     private ICoreEduTrainingTaskService coreEduTrainingTaskService;
 
-    /**
-     * 查询教育任务列表
-     */
-    @ApiOperation(value = "查询CoreEduTrainingTask列表")
+
+    @ApiOperation(value = "查询教育任务分页")
     @RequiresPermissions("core:eduTask:list")
-    @PostMapping("/list")
-    public TableDataInfo<CoreEduTrainingTaskPageVo> list(@RequestBody CoreEduTrainingTaskPageDto coreEduTrainingTask) {
+    @GetMapping("/list")
+    public TableDataInfo<CoreEduTrainingTaskPageVo> list(CoreEduTrainingTaskPageDto coreEduTrainingTask) {
         return coreEduTrainingTaskService.selectPage(coreEduTrainingTask);
     }
 
-    /**
-     * App端获取签名情况
-     */
+
     @ApiOperation(value = "App端获取签名情况")
     @RequiresPermissions("core:eduTask:list")
     @GetMapping("/signUserList/{id}")
@@ -55,21 +51,14 @@ public class CoreEduTrainingTaskController extends BaseController {
         return success(coreEduTrainingTaskService.signUserList(id));
     }
 
-
-    /**
-     * 获取教育任务详细信息
-     */
-    @ApiOperation(value = "获取CoreEduTrainingTask详细信息")
+    @ApiOperation(value = "获取教育任务详细信息")
     @RequiresPermissions("core:eduTask:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskById(id));
     }
 
-    /**
-     * 新增教育任务
-     */
-    @ApiOperation(value = "新增CoreEduTrainingTask")
+    @ApiOperation(value = "新增教育任务")
     @RequiresPermissions("core:eduTask:add")
     @Log(title = "教育任务", businessType = BusinessType.INSERT)
     @PostMapping
@@ -77,10 +66,7 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.insertCoreEduTrainingTask(coreEduTrainingTask));
     }
 
-    /**
-     * 修改教育任务
-     */
-    @ApiOperation(value = "修改CoreEduTrainingTask")
+    @ApiOperation(value = "任务登记")
     @RequiresPermissions("core:eduTask:edit")
     @Log(title = "教育任务", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -88,24 +74,15 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.updateCoreEduTrainingTask(coreEduTrainingTask));
     }
 
-    /**
-     * 删除教育任务
-     */
-    @ApiOperation(value = "删除CoreEduTrainingTask")
+    @ApiOperation(value = "ApiOperation")
     @RequiresPermissions("core:eduTask:remove")
     @Log(title = "教育任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-
-
         return toAjax(coreEduTrainingTaskService.deleteCoreEduTrainingTaskByIds(ids));
     }
 
-
-    /**
-     * 导出教育任务
-     */
-    @ApiOperation(value = "导出CoreEduTrainingTask")
+    @ApiOperation(value = "导出教育任务")
     @RequiresPermissions("core:eduTask:report")
     @PostMapping("report")
     public AjaxResult report(@RequestBody @Validated CoreEduTrainingTaskReportDto request) {