教育培训 任务管理页面

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

@@ -9,11 +9,13 @@ import java.util.Date;
 @Data
 public class CoreEduTrainingTaskPageDto extends BaseEntity {
 
+    @ApiModelProperty(value = "培训机构")
+    private Long orgId;
 
+    @ApiModelProperty(value = "培训机构")
+    private String orgPath;
     @ApiModelProperty(value = "学习主题")
     private String title;
-
-
     @ApiModelProperty(value = "类型")
     private Integer type;
 

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

@@ -1,7 +1,106 @@
 package com.xunmei.common.core.domain.edu.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class CoreEduTrainingTaskPageVo {
+
+
+    @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
+    private Long id;
+
+
+    @ApiModelProperty(value = "教育培训计划Id")
+    private Long planId;
+
+    @TableField("org_id")
+    @ApiModelProperty(value = "机构")
+    private Long orgId;
+
+
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
+
+
+    @ApiModelProperty(value = "机构")
+    private String orgPath;
+
+
+
+    @ApiModelProperty(value = "学习主题")
+    private String title;
+
+
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     * 类型
+     */
+
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+
+    @ApiModelProperty(value = "主持人")
+    private Long hostId;
+
+
+
+    @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;
+
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     */
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+//    @TableField("content")
+//    @ApiModelProperty(value = "内容")
+//    private String content;
+//
+//
+//    @TableField("note")
+//    @ApiModelProperty(value = "总结")
+//    private String note;
+
+
+//    @TableField("plan_cycle")
+//    @ApiModelProperty(value = "周期")
+//    private Integer planCycle;
+
+
+
+//    @ApiModelProperty(value = "附件")
+//    private String fileList;
+//
+//
+//    @ApiModelProperty(value = "图片")
+//    private String imageList;
+
+
+
+    @ApiModelProperty(value = "pdf下载地址")
+    private String pdfUrl;
 }

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

@@ -37,6 +37,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo<CoreEduTrainingTaskPageVo> list(CoreEduTrainingTaskPageDto coreEduTrainingTask) {
 
+        //return  new TableDataInfo<CoreEduTrainingTaskPageVo>();
         return coreEduTrainingTaskService.selectPage(coreEduTrainingTask);
     }
 

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSON;
 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,6 +16,8 @@ import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToRole;
 import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+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.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.utils.DateUtils;
@@ -51,9 +54,36 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     @Override
     public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
-        IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPage(), request);
+//        IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPage(), request);
+
+        if (request.getCheckSub()) {
+            SysOrg r = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            request.setOrgPath(r.getPath());
+        }
+        //获取数据
+        Page<CoreEduTrainingTaskPageVo> page = coreEduTrainingTaskMapper.selectPageData(request.getPage(), request);
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        for (CoreEduTrainingTaskPageVo record : page.getRecords()) {
+//            record.setNo(page.getRecords().indexOf(record) + 1);
+//            if (ObjectUtil.equal(record.getCreateOrgId(), sysOrg.getId())) {
+//                record.setCreateByTopOrg(1);
+//            }
+//            String roleNameList = coreEduTrainingPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreEduTrainingPlanRoleVo::getRoleName).collect(Collectors.joining(","));
+//            record.setPlanRoleNameList(roleNameList);
+
+        }
+        return TableDataInfo.build(page);
+
+        //抓换为TableDataInfo适配前端
+//        TableDataInfo tableDataInfo = new TableDataInfo();
+//        tableDataInfo.setMsg("操作成功");
+//        tableDataInfo.setCode(200);
+//        tableDataInfo.setTotal(page.getTotal());
+//        tableDataInfo.setRows(page.getRecords());
+//        return tableDataInfo;
+
         //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(pageData);
+        //return TableDataInfo.build(pageData);
 
 
     }

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

@@ -62,6 +62,22 @@
         limit 1
     </select>
 
-    <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo">
+    <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo" parameterType="com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto">
+        <include refid="selectCoreEduTrainingTaskVo"/>
+        <where>
+            <if test="request.title != null  and request.title != ''">
+                and title like concat('%', #{request.title}, '%')
+            </if>
+            <if test="request.type != null ">
+                and type = #{request.type}
+            </if>
+            <if test="request.status != null ">
+                and status = #{request.status}
+            </if>
+            <if test="request.range != null ">
+                and start_date >= #{request.range[0]}
+                and end_date <![CDATA[ <= ]]> #{request.range[1]}
+            </if>
+        </where>
     </select>
 </mapper>