学习资料表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcResourceController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcResource;
+import com.ruoyi.oa.service.ICmcResourceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学习资料Controller
+ * 
+ * @author cmc
+ * @date 2025-03-05
+ */
+@RestController
+@RequestMapping("/oa/resource")
+public class CmcResourceController extends BaseController
+{
+    @Autowired
+    private ICmcResourceService cmcResourceService;
+
+    /**
+     * 查询学习资料列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcResource cmcResource)
+    {
+        startPage();
+        List<CmcResource> list = cmcResourceService.selectCmcResourceList(cmcResource);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学习资料列表
+     */
+    @Log(title = "学习资料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcResource cmcResource)
+    {
+        List<CmcResource> list = cmcResourceService.selectCmcResourceList(cmcResource);
+        ExcelUtil<CmcResource> util = new ExcelUtil<CmcResource>(CmcResource.class);
+        util.exportExcel(response, list, "学习资料数据");
+    }
+
+    /**
+     * 获取学习资料详细信息
+     */
+    @GetMapping(value = "/{resourceId}")
+    public AjaxResult getInfo(@PathVariable("resourceId") Integer resourceId)
+    {
+        return success(cmcResourceService.selectCmcResourceByResourceId(resourceId));
+    }
+
+    /**
+     * 新增学习资料
+     */
+    @Log(title = "学习资料", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcResource cmcResource)
+    {
+        return toAjax(cmcResourceService.insertCmcResource(cmcResource));
+    }
+
+    /**
+     * 修改学习资料
+     */
+    @Log(title = "学习资料", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcResource cmcResource)
+    {
+        return toAjax(cmcResourceService.updateCmcResource(cmcResource));
+    }
+
+    /**
+     * 删除学习资料
+     */
+    @Log(title = "学习资料", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{resourceIds}")
+    public AjaxResult remove(@PathVariable Integer[] resourceIds)
+    {
+        return toAjax(cmcResourceService.deleteCmcResourceByResourceIds(resourceIds));
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -140,6 +140,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Resource
     private ICmcPerformanceService cmcPerformanceService;
     @Resource
+    private ICmcTrainApprovalService cmcTrainApprovalService;
+    @Resource
     private ICmcBudgetService cmcBudgetService;
     @Resource
     private FlowVarInstMapper flowVarInstMapper;
@@ -1811,5 +1813,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (cmcPerformance != null)
                 flowTaskDto.setTitle(cmcPerformance.getRemark());
         }
+        if (flowTaskDto.getProcDefName().equals("参培审核")) {
+            CmcTrainApproval cmcTrainApproval = cmcTrainApprovalService.selectCmcTrainApprovalByParticipateId(formId);
+            if (cmcTrainApproval != null)
+                flowTaskDto.setTitle(cmcTrainApproval.getContent());
+        }
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcResource.java

@@ -0,0 +1,178 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 学习资料对象 cmc_resource
+ * 
+ * @author cmc
+ * @date 2025-03-05
+ */
+public class CmcResource extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 资料id */
+    private Integer resourceId;
+
+    /** 上传人 */
+    private Long uploader;
+    @Excel(name = "上传人")
+    private String uploadUserName;
+    private SysUser uploadUser;
+
+    /** 上传部门 */
+    private Long uploadDept;
+    @Excel(name = "上传部门")
+    private String deptName;
+    private SysDept dept;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 上传附件 */
+    @Excel(name = "上传附件")
+    private String sourcePath;
+
+    /** 文件类型 */
+    @Excel(name = "文件类型")
+    private String type;
+
+    /** 专业领域 */
+    @Excel(name = "专业领域")
+    private String field;
+
+    /** 上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /** 学习时长 */
+    @Excel(name = "学习时长")
+    private Long hours;
+
+    public void setResourceId(Integer resourceId) 
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getResourceId() 
+    {
+        return resourceId;
+    }
+    public void setUploader(Long uploader) 
+    {
+        this.uploader = uploader;
+    }
+
+    public Long getUploader() 
+    {
+        return uploader;
+    }
+    public void setUploadDept(Long uploadDept) 
+    {
+        this.uploadDept = uploadDept;
+    }
+
+    public Long getUploadDept() 
+    {
+        return uploadDept;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setSourcePath(String sourcePath) 
+    {
+        this.sourcePath = sourcePath;
+    }
+
+    public String getSourcePath() 
+    {
+        return sourcePath;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setField(String field) 
+    {
+        this.field = field;
+    }
+
+    public String getField() 
+    {
+        return field;
+    }
+    public void setUploadTime(Date uploadTime) 
+    {
+        this.uploadTime = uploadTime;
+    }
+
+    public Date getUploadTime() 
+    {
+        return uploadTime;
+    }
+    public void setHours(Long hours) 
+    {
+        this.hours = hours;
+    }
+
+    public Long getHours() 
+    {
+        return hours;
+    }
+    public void setUploadUser(SysUser uploadUser)
+    {
+        this.uploadUser = uploadUser;
+        this.uploadUserName = uploadUser == null ? "" : uploadUser.getNickName();
+    }
+
+    public SysUser getUploadUser()
+    {
+        return uploadUser;
+    }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("resourceId", getResourceId())
+            .append("uploader", getUploader())
+            .append("uploadDept", getUploadDept())
+            .append("title", getTitle())
+            .append("sourcePath", getSourcePath())
+            .append("type", getType())
+            .append("field", getField())
+            .append("uploadTime", getUploadTime())
+            .append("hours", getHours())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcResourceMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcResource;
+
+/**
+ * 学习资料Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-03-05
+ */
+public interface CmcResourceMapper 
+{
+    /**
+     * 查询学习资料
+     * 
+     * @param resourceId 学习资料主键
+     * @return 学习资料
+     */
+    public CmcResource selectCmcResourceByResourceId(Integer resourceId);
+
+    /**
+     * 查询学习资料列表
+     * 
+     * @param cmcResource 学习资料
+     * @return 学习资料集合
+     */
+    public List<CmcResource> selectCmcResourceList(CmcResource cmcResource);
+
+    /**
+     * 新增学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    public int insertCmcResource(CmcResource cmcResource);
+
+    /**
+     * 修改学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    public int updateCmcResource(CmcResource cmcResource);
+
+    /**
+     * 删除学习资料
+     * 
+     * @param resourceId 学习资料主键
+     * @return 结果
+     */
+    public int deleteCmcResourceByResourceId(Integer resourceId);
+
+    /**
+     * 批量删除学习资料
+     * 
+     * @param resourceIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcResourceByResourceIds(Integer[] resourceIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcResourceService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcResource;
+
+/**
+ * 学习资料Service接口
+ * 
+ * @author cmc
+ * @date 2025-03-05
+ */
+public interface ICmcResourceService 
+{
+    /**
+     * 查询学习资料
+     * 
+     * @param resourceId 学习资料主键
+     * @return 学习资料
+     */
+    public CmcResource selectCmcResourceByResourceId(Integer resourceId);
+
+    /**
+     * 查询学习资料列表
+     * 
+     * @param cmcResource 学习资料
+     * @return 学习资料集合
+     */
+    public List<CmcResource> selectCmcResourceList(CmcResource cmcResource);
+
+    /**
+     * 新增学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    public int insertCmcResource(CmcResource cmcResource);
+
+    /**
+     * 修改学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    public int updateCmcResource(CmcResource cmcResource);
+
+    /**
+     * 批量删除学习资料
+     * 
+     * @param resourceIds 需要删除的学习资料主键集合
+     * @return 结果
+     */
+    public int deleteCmcResourceByResourceIds(Integer[] resourceIds);
+
+    /**
+     * 删除学习资料信息
+     * 
+     * @param resourceId 学习资料主键
+     * @return 结果
+     */
+    public int deleteCmcResourceByResourceId(Integer resourceId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcResourceServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcResourceMapper;
+import com.ruoyi.oa.domain.CmcResource;
+import com.ruoyi.oa.service.ICmcResourceService;
+
+/**
+ * 学习资料Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-03-05
+ */
+@Service
+public class CmcResourceServiceImpl implements ICmcResourceService 
+{
+    @Autowired
+    private CmcResourceMapper cmcResourceMapper;
+
+    /**
+     * 查询学习资料
+     * 
+     * @param resourceId 学习资料主键
+     * @return 学习资料
+     */
+    @Override
+    public CmcResource selectCmcResourceByResourceId(Integer resourceId)
+    {
+        return cmcResourceMapper.selectCmcResourceByResourceId(resourceId);
+    }
+
+    /**
+     * 查询学习资料列表
+     * 
+     * @param cmcResource 学习资料
+     * @return 学习资料
+     */
+    @Override
+    public List<CmcResource> selectCmcResourceList(CmcResource cmcResource)
+    {
+        return cmcResourceMapper.selectCmcResourceList(cmcResource);
+    }
+
+    /**
+     * 新增学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    @Override
+    public int insertCmcResource(CmcResource cmcResource)
+    {
+        return cmcResourceMapper.insertCmcResource(cmcResource);
+    }
+
+    /**
+     * 修改学习资料
+     * 
+     * @param cmcResource 学习资料
+     * @return 结果
+     */
+    @Override
+    public int updateCmcResource(CmcResource cmcResource)
+    {
+        return cmcResourceMapper.updateCmcResource(cmcResource);
+    }
+
+    /**
+     * 批量删除学习资料
+     * 
+     * @param resourceIds 需要删除的学习资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcResourceByResourceIds(Integer[] resourceIds)
+    {
+        return cmcResourceMapper.deleteCmcResourceByResourceIds(resourceIds);
+    }
+
+    /**
+     * 删除学习资料信息
+     * 
+     * @param resourceId 学习资料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcResourceByResourceId(Integer resourceId)
+    {
+        return cmcResourceMapper.deleteCmcResourceByResourceId(resourceId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcResourceMapper">
+    
+    <resultMap type="CmcResource" id="CmcResourceResult">
+        <result property="resourceId"    column="resource_id"    />
+        <result property="uploader"    column="uploader"    />
+        <result property="uploadDept"    column="upload_dept"    />
+        <result property="title"    column="title"    />
+        <result property="sourcePath"    column="source_path"    />
+        <result property="type"    column="type"    />
+        <result property="field"    column="field"    />
+        <result property="uploadTime"    column="upload_time"    />
+        <result property="hours"    column="hours"    />
+        <association property="uploadUser"    javaType="SysUser"         resultMap="UploadUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="UploadUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <sql id="selectCmcResourceVo">
+        select r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field, r.upload_time, r.hours from cmc_resource as r
+        left join sys_user as u on u.user_id = r.uploader
+        left join sys_dept as d on d.dept_id = r.upload_dept
+    </sql>
+
+    <select id="selectCmcResourceList" parameterType="CmcResource" resultMap="CmcResourceResult">
+        <include refid="selectCmcResourceVo"/>
+        <where>  
+            <if test="uploader != null "> and r.uploader = #{uploader}</if>
+            <if test="uploadDept != null "> and r.upload_dept = #{uploadDept}</if>
+            <if test="title != null  and title != ''"> and r.title = #{title}</if>
+            <if test="sourcePath != null  and sourcePath != ''"> and r.source_path = #{sourcePath}</if>
+            <if test="type != null  and type != ''"> and r.type = #{type}</if>
+            <if test="field != null  and field != ''"> and r.field = #{field}</if>
+            <if test="uploadTime != null "> and r.upload_time = #{uploadTime}</if>
+            <if test="hours != null "> and r.hours = #{hours}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcResourceByResourceId" parameterType="Integer" resultMap="CmcResourceResult">
+        <include refid="selectCmcResourceVo"/>
+        where resource_id = #{resourceId}
+    </select>
+        
+    <insert id="insertCmcResource" parameterType="CmcResource" useGeneratedKeys="true" keyProperty="resourceId">
+        insert into cmc_resource
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="uploader != null">uploader,</if>
+            <if test="uploadDept != null">upload_dept,</if>
+            <if test="title != null">title,</if>
+            <if test="sourcePath != null">source_path,</if>
+            <if test="type != null">type,</if>
+            <if test="field != null">field,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="hours != null">hours,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="uploader != null">#{uploader},</if>
+            <if test="uploadDept != null">#{uploadDept},</if>
+            <if test="title != null">#{title},</if>
+            <if test="sourcePath != null">#{sourcePath},</if>
+            <if test="type != null">#{type},</if>
+            <if test="field != null">#{field},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="hours != null">#{hours},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcResource" parameterType="CmcResource">
+        update cmc_resource
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="uploader != null">uploader = #{uploader},</if>
+            <if test="uploadDept != null">upload_dept = #{uploadDept},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="sourcePath != null">source_path = #{sourcePath},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="field != null">field = #{field},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="hours != null">hours = #{hours},</if>
+        </trim>
+        where resource_id = #{resourceId}
+    </update>
+
+    <delete id="deleteCmcResourceByResourceId" parameterType="Integer">
+        delete from cmc_resource where resource_id = #{resourceId}
+    </delete>
+
+    <delete id="deleteCmcResourceByResourceIds" parameterType="String">
+        delete from cmc_resource where resource_id in 
+        <foreach item="resourceId" collection="array" open="(" separator="," close=")">
+            #{resourceId}
+        </foreach>
+    </delete>
+</mapper>