教育培训bug修改

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

@@ -5,7 +5,9 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -34,20 +36,23 @@ public class CoreEduTrainingTaskEditDto {
     private LocalDateTime trainingEndDateTime;
 
 
-    @ApiModelProperty(value = "内容")
+    /*@Length(max = 2000, message = "培训内容长度不能超过2000个字符", min = 1)
+    @ApiModelProperty(value = "培训内容")*/
     private String content;
 
-
+    //@Length(max = 2000, message = "培训内容长度不能超过2000个字符", min = 1)
     @ApiModelProperty(value = "总结")
     private String note;
 
+    //@NotEmpty(message = "上传图片不能为空")
     @ApiModelProperty(value = "图片")
     private String imageList;
 
+    //@NotNull(message = "提交类型不能为空")
     @ApiModelProperty(value = "提交类型", notes = "1:暂存,2:提交")
     private Integer submitType;
 
-
+    //@NotEmpty(message = "参与人员不能为空")
     @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
     private List<CoreEduTrainingTaskToUser> taskUserList;
 

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

@@ -52,7 +52,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     }
 
     @ApiOperation(value = "获取教育任务详细信息")
-    @RequiresPermissions("core:eduTask:query")
+    @RequiresPermissions("core:eduTask:list")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskById(id));
@@ -83,7 +83,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     }
 
     @ApiOperation(value = "教育培训统计报表")
-    @RequiresPermissions("core:eduTask:report")
+    @RequiresPermissions("core:eduTask:list")
     @PostMapping("report")
     public AjaxResult report(@RequestBody @Validated CoreEduTrainingTaskReportDto request) {
         return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskReport(request));

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -105,7 +105,7 @@
                 )
             </if>
         </where>
-        order by t.update_time desc
+        order by t.status, t.update_time desc
     </select>
 
     <select id="selectEduTrainingTaskDetail"