Parcourir la source

教育培训任务代码,生成pdf代码提交

jingyuanchao il y a 2 ans
Parent
commit
c3c7ac40a3

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

@@ -49,11 +49,9 @@ public class CoreEduTrainingTaskEditDto {
     @ApiModelProperty(value = "截止日期")
     private Date endDate;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训开始时间")
     private Date trainingStartDateTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "培训截止时间")
     private Date trainingEndDateTime;
 

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

@@ -93,23 +93,13 @@ public class CoreEduTrainingTaskController extends BaseController {
         return toAjax(coreEduTrainingTaskService.deleteCoreEduTrainingTaskByIds(ids));
     }
 
-    /**
-     * 导出教育任务
-     */
-    @ApiOperation(value = "导出CoreEduTrainingTask")
-    @RequiresPermissions("core:eduTask:export")
-    @Log(title = "教育任务", businessType = BusinessType.DELETE)
-    @DeleteMapping("export")
-    public AjaxResult export() {
-        return null;
-    }
 
     /**
      * 导出教育任务
      */
     @ApiOperation(value = "导出CoreEduTrainingTask")
     @RequiresPermissions("core:eduTask:report")
-    @DeleteMapping("report")
+    @PostMapping("report")
     public AjaxResult report(@RequestBody @Validated CoreEduTrainingTaskReportDto request) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskReport(request));
     }
@@ -117,7 +107,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     @ApiOperation(value = "教育培训签名")
     @RequiresPermissions("core:eduTask:sign")
     @Log(title = "教育任务签名", businessType = BusinessType.DELETE)
-    @DeleteMapping("sign")
+    @PostMapping("sign")
     public AjaxResult sign(@RequestBody @Validated CoreEduTrainingTaskSignDto request) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskSign(request));
     }

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

@@ -161,8 +161,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
      */
     @Override
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
-        String format = DateUtil.format(request.getTrainingStartDateTime(), "yyyy-MM-dd HH:mm:ss");
-        System.out.println("------------------" + format + "------------------");
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
         BeanUtils.copyProperties(request, coreEduTrainingTask);
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());