教育培训任务代码提交

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

@@ -71,6 +71,10 @@ public class CoreEduTrainingTask extends BaseEntity {
     @ApiModelProperty(value = "主持人")
     private Long hostId;
 
+    @TableField("recorder_id")
+    @ApiModelProperty(value = "记录人")
+    private Long recorderId;
+
 
     @TableField("start_date")
     @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/dto/CoreEduTrainingTaskEditDto.java

@@ -0,0 +1,73 @@
+package com.xunmei.common.core.domain.edu.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 java.util.Date;
+import java.util.List;
+
+@Data
+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
+     * 类型
+     */
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "类型名称")
+    private String typeText;
+
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始日期")
+    private Date startDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "截止日期")
+    private Date endDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "培训时间")
+    private Date dateTime;
+
+
+    @TableField("content")
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+
+    @TableField("note")
+    @ApiModelProperty(value = "总结")
+    private String note;
+
+    @TableField("image_list")
+    @ApiModelProperty(value = "图片")
+    private String imageList;
+
+
+    @ApiModelProperty(value = "任务用户信息", notes = "1:参与人员,2:缺席人员")
+    private List<CoreEduTrainingTaskToUser> taskUserList;
+
+}

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

@@ -41,6 +41,22 @@ public class CoreEduTrainingTaskDetailVo {
     private String typeText;
 
 
+    @ApiModelProperty(value = "主持人")
+    private Long hostId;
+
+
+    @ApiModelProperty(value = "主持人名称")
+    private String hostName;
+
+
+    @TableField("recorder_id")
+    @ApiModelProperty(value = "记录人")
+    private Long recorderId;
+
+
+    @ApiModelProperty(value = "记录人名称")
+    private Long recorderName;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "开始日期")
     private Date startDate;

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

@@ -10,9 +10,9 @@ import java.util.Map;
 @AllArgsConstructor
 public enum EduTrainingDoStatus {
 
-    WAIT_RECORDED(0, "未开始"),
-    WAIT_SIGN(1, "已完成"),
-    DONE(2, "逾期"),
+    WAIT_RECORDED(0, "待记录"),
+    WAIT_SIGN(1, "待签名"),
+    DONE(2, "已完成"),
 
 
     ;

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

@@ -69,6 +69,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                     .in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, idList));
             Map<Long, List<CoreEduTrainingTaskToRole>> listMap = roleList.stream().collect(Collectors.groupingBy(CoreEduTrainingTaskToRole::getEduTrainingTaskId));
             for (CoreEduTrainingTaskPageVo record : pageData.getRecords()) {
+                record.setNo(pageData.getRecords().indexOf(record) + 1);
                 record.setTypeText(EduTrainingType.getName(record.getType()));
                 record.setStatusText(EduTrainingDoStatus.getName(record.getStatus()));
                 List<CoreEduTrainingTaskToRole> coreEduTrainingTaskToRoles = listMap.get(record.getId());
@@ -205,7 +206,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 trainingTask.setType(null);
                 trainingTask.setOrgName(org.getName());
                 trainingTask.setOrgPath(org.getPath());
-                trainingTask.setStatus(EduTrainingDoStatus.UN_START.getCode());
+                trainingTask.setStatus(EduTrainingDoStatus.WAIT_RECORDED.getCode());
                 trainingTask.setPdfUrl(null);
                 trainingTask.setCreateTime(new Date());
                 trainingTask.setUpdateTime(new Date());

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

@@ -103,8 +103,15 @@
                type,
                start_date,
                end_date,
-               date_time
+               date_time,
+               t.host_id,
+               t.recorder_id,
+               u.name  as hostName,
+               u2.name as recorderName
         from core_edu_training_task t
-        where id = #{id}
+                 inner join sys_user u on u.id = t.host_id
+                 inner join sys_user u2 on u2.id = t.recorder_id
+
+        where t.id = #{id}
     </select>
 </mapper>