教育培训任务代码提交

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

@@ -19,7 +19,7 @@ public class CoreEduTrainingTaskEditDto {
     private Long id;
 
     /**
-     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * @see com.xunmei.common.core.enums.edu.EduTrainingType
      * 类型
      */
     @ApiModelProperty(value = "类型")

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 @Data
@@ -31,7 +30,7 @@ public class CoreEduTrainingTaskPageDto extends PageRequest {
     private Date endTime;
 
     @ApiModelProperty(value = "任务时间范围", notes = "App传递此参数")
-    private LocalDate date;
+    private Date date;
 
     @ApiModelProperty(value = "是否是App端查询", notes = "App端查询传递此参数")
     private Integer isAppSelect;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingType.java

@@ -15,8 +15,8 @@ import java.util.Map;
 public enum EduTrainingType {
 
 
-    AQFFXXJY(0, "安全防范学习教育"),
-    ZBXZHD(1, "治保小组活动");
+    AQFFXXJY(0, "每月安全培训教育"),
+    ZBXZHD(1, "专项安全培训教育");
 
 
     /**

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

@@ -94,9 +94,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         }
         //如果是App段的查询
         if (ObjectUtil.isNotNull(request.getDate())) {
-            Date date = java.sql.Date.valueOf(request.getDate());
-            request.setStartTime(DateUtil.beginOfMonth(date));
-            request.setEndTime(DateUtil.endOfMonth(date));
+            // Date date = java.sql.Date.valueOf(request.getDate());
+            request.setStartTime(DateUtil.beginOfMonth(request.getDate()));
+            request.setEndTime(DateUtil.endOfMonth(request.getDate()));
 
         }
         if (ObjectUtil.equal(1, request.getIsAppSelect())) {