教育培训任务代码提交

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

@@ -86,10 +86,6 @@ public class CoreEduTrainingTask extends BaseEntity {
     @ApiModelProperty(value = "任务计划截止日期")
     private Date endDate;
 
-//    @TableField("date_time")
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-//    @ApiModelProperty(value = "培训时间")
-//    private Date dateTime;
 
     @TableField("training_start_date_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

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

@@ -41,6 +41,9 @@ public class CoreEduTrainingTaskToUser extends BaseEntity {
     @ApiModelProperty(value = "1:参与人员,2:缺席人员")
     private Long type;
 
+    @TableField("sign")
+    @ApiModelProperty(value = "是否签名:0:未签名,1:已签名")
+    private int sign;
 
     @Override
     public String toString() {

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

@@ -0,0 +1,22 @@
+package com.xunmei.common.core.domain.edu.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class CoreEduTrainingTaskReportDto {
+
+    @ApiModelProperty(value = "教育培训计划Id")
+    private Long planId;
+
+    @ApiModelProperty(value = "机构")
+    private Long orgId;
+
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @ApiModelProperty(value = "统计月份")
+    private Date date;
+
+}

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

@@ -0,0 +1,29 @@
+package com.xunmei.common.core.domain.edu.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CoreEduTrainingTaskReportVo {
+
+    @ApiModelProperty(value = "教育培训计划Id")
+    private Integer no;
+
+    @ApiModelProperty(value = "机构")
+    private Long orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+
+    @ApiModelProperty(value = "应培训数量")
+    private Integer shouldFinish;
+
+    @ApiModelProperty(value = "已培训数量")
+    private Integer finish;
+
+    @ApiModelProperty(value = "培训完成率")
+    private String finishRate;
+
+
+}

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

@@ -4,6 +4,7 @@ package com.xunmei.core.edu.controller;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -96,4 +97,15 @@ public class CoreEduTrainingTaskController extends BaseController {
     public AjaxResult export() {
         return null;
     }
+
+    /**
+     * 导出教育任务
+     */
+    @ApiOperation(value = "导出CoreEduTrainingTask")
+    @RequiresPermissions("core:eduTask:report")
+    @Log(title = "教育任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("report")
+    public AjaxResult report(@RequestBody CoreEduTrainingTaskReportDto request) {
+        return success(coreEduTrainingTaskService.selectCoreEduTrainingTaskReport(request));
+    }
 }

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskReportVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 import java.util.Date;
@@ -78,4 +80,6 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
 
 
     void createTaskForNow(CoreEduTrainingPlanDataVo plan, Date start, Date end);
+
+    List<CoreEduTrainingTaskReportVo> selectCoreEduTrainingTaskReport(CoreEduTrainingTaskReportDto request);
 }

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -15,11 +14,11 @@ import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.edu.domain.*;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskEditDto;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskReportDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskDetailVo;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskReportVo;
 import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.enums.edu.EduTrainingType;
 import com.xunmei.common.core.utils.DateUtils;
@@ -249,6 +248,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             coreEduTrainingTaskToRoleService.saveBatch(taskRoleList);
         }
     }
+
+
+    @Override
+    public List<CoreEduTrainingTaskReportVo> selectCoreEduTrainingTaskReport(CoreEduTrainingTaskReportDto request) {
+        return null;
+    }
 }