1.每个月1号清除3个月前登录操作日志

2.个人参培记录审核表 及审核流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTrainApprovalController.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.CmcTrainApproval;
+import com.ruoyi.oa.service.ICmcTrainApprovalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 参培审核Controller
+ * 
+ * @author cmc
+ * @date 2025-03-04
+ */
+@RestController
+@RequestMapping("/oa/trainApproval")
+public class CmcTrainApprovalController extends BaseController
+{
+    @Autowired
+    private ICmcTrainApprovalService cmcTrainApprovalService;
+
+    /**
+     * 查询参培审核列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcTrainApproval cmcTrainApproval)
+    {
+        startPage();
+        List<CmcTrainApproval> list = cmcTrainApprovalService.selectCmcTrainApprovalList(cmcTrainApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出参培审核列表
+     */
+    @Log(title = "参培审核", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcTrainApproval cmcTrainApproval)
+    {
+        List<CmcTrainApproval> list = cmcTrainApprovalService.selectCmcTrainApprovalList(cmcTrainApproval);
+        ExcelUtil<CmcTrainApproval> util = new ExcelUtil<CmcTrainApproval>(CmcTrainApproval.class);
+        util.exportExcel(response, list, "参培审核数据");
+    }
+
+    /**
+     * 获取参培审核详细信息
+     */
+    @GetMapping(value = "/{participateId}")
+    public AjaxResult getInfo(@PathVariable("participateId") String participateId)
+    {
+        return success(cmcTrainApprovalService.selectCmcTrainApprovalByParticipateId(participateId));
+    }
+
+    /**
+     * 新增参培审核
+     */
+    @Log(title = "参培审核", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcTrainApproval cmcTrainApproval)
+    {
+        return toAjax(cmcTrainApprovalService.insertCmcTrainApproval(cmcTrainApproval));
+    }
+
+    /**
+     * 修改参培审核
+     */
+    @Log(title = "参培审核", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcTrainApproval cmcTrainApproval)
+    {
+        return toAjax(cmcTrainApprovalService.updateCmcTrainApproval(cmcTrainApproval));
+    }
+
+    /**
+     * 删除参培审核
+     */
+    @Log(title = "参培审核", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{participateIds}")
+    public AjaxResult remove(@PathVariable String[] participateIds)
+    {
+        return toAjax(cmcTrainApprovalService.deleteCmcTrainApprovalByParticipateIds(participateIds));
+    }
+}

oa-back/ruoyi-quartz/pom.xml

@@ -34,6 +34,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
 
     </dependencies>
 

oa-back/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -1,5 +1,8 @@
 package com.ruoyi.quartz.task;
 
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysOperLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.StringUtils;
 
@@ -15,6 +18,9 @@ import java.util.Date;
 @Component("ryTask")
 public class RyTask
 {
+    @Autowired
+    private ISysOperLogService sysOperLogService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -48,4 +54,9 @@ public class RyTask
         }
     }
 
+    public void deleteSysOperLog() {
+        sysOperLogService.deleteOperLogJob();
+        sysOperLogService.deleteOperLogJob();
+    }
+
 }

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

@@ -0,0 +1,195 @@
+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_train_approval
+ * 
+ * @author cmc
+ * @date 2025-03-04
+ */
+public class CmcTrainApproval extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参培id */
+    private String participateId;
+
+    /** 上报人 */
+    private Long userId;
+    @Excel(name = "上报人")
+    private String reportUserName;
+    private SysUser reportUser;
+
+    /** 上报人部门 */
+    private Long deptId;
+    @Excel(name = "上报人部门")
+    private String deptName;
+    private SysDept dept;
+
+    /** 上报日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上报日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportTime;
+
+    /** 培训名称 */
+    @Excel(name = "培训名称")
+    private String trainName;
+
+    /** 主要内容 */
+    @Excel(name = "主要内容")
+    private String content;
+
+    /** 时长 */
+    @Excel(name = "时长")
+    private Double hours;
+
+    /** 部门审核人 */
+    private Long deptUserId;
+    @Excel(name = "部门审核人")
+    private String deptUserName;
+    private SysUser deptUser;
+
+    /** 部门审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 部门审核意见 */
+    @Excel(name = "部门审核意见")
+    private String deptComment;
+
+    public void setParticipateId(String participateId) 
+    {
+        this.participateId = participateId;
+    }
+
+    public String getParticipateId() 
+    {
+        return participateId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setTrainName(String trainName) 
+    {
+        this.trainName = trainName;
+    }
+
+    public String getTrainName() 
+    {
+        return trainName;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setHours(Double hours) 
+    {
+        this.hours = hours;
+    }
+
+    public Double getHours() 
+    {
+        return hours;
+    }
+    public void setDeptUserId(Long deptUserId) 
+    {
+        this.deptUserId = deptUserId;
+    }
+
+    public Long getDeptUserId() 
+    {
+        return deptUserId;
+    }
+    public void setDeptTime(Date deptTime) 
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime() 
+    {
+        return deptTime;
+    }
+    public void setDeptComment(String deptComment) 
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment() 
+    {
+        return deptComment;
+    }
+    public void setReportUser(SysUser reportUser)
+    {
+        this.reportUser = reportUser;
+        this.reportUserName = reportUser == null ? "" : reportUser.getNickName();
+    }
+
+    public SysUser getReportUser()
+    {
+        return reportUser;
+    }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    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("participateId", getParticipateId())
+            .append("userId", getUserId())
+            .append("reportTime", getReportTime())
+            .append("trainName", getTrainName())
+            .append("content", getContent())
+            .append("hours", getHours())
+            .append("deptUserId", getDeptUserId())
+            .append("deptTime", getDeptTime())
+            .append("deptComment", getDeptComment())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTrainApproval;
+
+/**
+ * 参培审核Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-03-04
+ */
+public interface CmcTrainApprovalMapper 
+{
+    /**
+     * 查询参培审核
+     * 
+     * @param participateId 参培审核主键
+     * @return 参培审核
+     */
+    public CmcTrainApproval selectCmcTrainApprovalByParticipateId(String participateId);
+
+    /**
+     * 查询参培审核列表
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 参培审核集合
+     */
+    public List<CmcTrainApproval> selectCmcTrainApprovalList(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 新增参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    public int insertCmcTrainApproval(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 修改参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    public int updateCmcTrainApproval(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 删除参培审核
+     * 
+     * @param participateId 参培审核主键
+     * @return 结果
+     */
+    public int deleteCmcTrainApprovalByParticipateId(String participateId);
+
+    /**
+     * 批量删除参培审核
+     * 
+     * @param participateIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcTrainApprovalByParticipateIds(String[] participateIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTrainApproval;
+
+/**
+ * 参培审核Service接口
+ * 
+ * @author cmc
+ * @date 2025-03-04
+ */
+public interface ICmcTrainApprovalService 
+{
+    /**
+     * 查询参培审核
+     * 
+     * @param participateId 参培审核主键
+     * @return 参培审核
+     */
+    public CmcTrainApproval selectCmcTrainApprovalByParticipateId(String participateId);
+
+    /**
+     * 查询参培审核列表
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 参培审核集合
+     */
+    public List<CmcTrainApproval> selectCmcTrainApprovalList(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 新增参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    public int insertCmcTrainApproval(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 修改参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    public int updateCmcTrainApproval(CmcTrainApproval cmcTrainApproval);
+
+    /**
+     * 批量删除参培审核
+     * 
+     * @param participateIds 需要删除的参培审核主键集合
+     * @return 结果
+     */
+    public int deleteCmcTrainApprovalByParticipateIds(String[] participateIds);
+
+    /**
+     * 删除参培审核信息
+     * 
+     * @param participateId 参培审核主键
+     * @return 结果
+     */
+    public int deleteCmcTrainApprovalByParticipateId(String participateId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcTrainApprovalServiceImpl.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.CmcTrainApprovalMapper;
+import com.ruoyi.oa.domain.CmcTrainApproval;
+import com.ruoyi.oa.service.ICmcTrainApprovalService;
+
+/**
+ * 参培审核Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-03-04
+ */
+@Service
+public class CmcTrainApprovalServiceImpl implements ICmcTrainApprovalService 
+{
+    @Autowired
+    private CmcTrainApprovalMapper cmcTrainApprovalMapper;
+
+    /**
+     * 查询参培审核
+     * 
+     * @param participateId 参培审核主键
+     * @return 参培审核
+     */
+    @Override
+    public CmcTrainApproval selectCmcTrainApprovalByParticipateId(String participateId)
+    {
+        return cmcTrainApprovalMapper.selectCmcTrainApprovalByParticipateId(participateId);
+    }
+
+    /**
+     * 查询参培审核列表
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 参培审核
+     */
+    @Override
+    public List<CmcTrainApproval> selectCmcTrainApprovalList(CmcTrainApproval cmcTrainApproval)
+    {
+        return cmcTrainApprovalMapper.selectCmcTrainApprovalList(cmcTrainApproval);
+    }
+
+    /**
+     * 新增参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    @Override
+    public int insertCmcTrainApproval(CmcTrainApproval cmcTrainApproval)
+    {
+        return cmcTrainApprovalMapper.insertCmcTrainApproval(cmcTrainApproval);
+    }
+
+    /**
+     * 修改参培审核
+     * 
+     * @param cmcTrainApproval 参培审核
+     * @return 结果
+     */
+    @Override
+    public int updateCmcTrainApproval(CmcTrainApproval cmcTrainApproval)
+    {
+        return cmcTrainApprovalMapper.updateCmcTrainApproval(cmcTrainApproval);
+    }
+
+    /**
+     * 批量删除参培审核
+     * 
+     * @param participateIds 需要删除的参培审核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTrainApprovalByParticipateIds(String[] participateIds)
+    {
+        return cmcTrainApprovalMapper.deleteCmcTrainApprovalByParticipateIds(participateIds);
+    }
+
+    /**
+     * 删除参培审核信息
+     * 
+     * @param participateId 参培审核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTrainApprovalByParticipateId(String participateId)
+    {
+        return cmcTrainApprovalMapper.deleteCmcTrainApprovalByParticipateId(participateId);
+    }
+}

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

@@ -41,6 +41,16 @@ public interface SysOperLogMapper
      */
     public SysOperLog selectOperLogById(Long operId);
 
+    /**
+     * 删除操作日志详细
+     */
+    public void deleteOperLogJob();
+
+    /**
+     * 删除登录日志详细
+     */
+    public void deleteLoginInfoJob();
+
     /**
      * 清空操作日志
      */

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

@@ -41,6 +41,16 @@ public interface ISysOperLogService
      */
     public SysOperLog selectOperLogById(Long operId);
 
+    /**
+     * 删除操作日志详细
+     */
+    public void deleteOperLogJob();
+
+    /**
+     * 删除登录日志详细
+     */
+    public void deleteLoginInfoJob();
+
     /**
      * 清空操作日志
      */

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

@@ -65,6 +65,24 @@ public class SysOperLogServiceImpl implements ISysOperLogService
         return operLogMapper.selectOperLogById(operId);
     }
 
+    /**
+     * 删除操作日志详细
+     */
+    @Override
+    public void deleteOperLogJob()
+    {
+        operLogMapper.deleteOperLogJob();
+    }
+
+    /**
+     * 删除登录日志详细
+     */
+    @Override
+    public void deleteLoginInfoJob()
+    {
+        operLogMapper.deleteLoginInfoJob();
+    }
+
     /**
      * 清空操作日志
      */

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

@@ -0,0 +1,119 @@
+<?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.CmcTrainApprovalMapper">
+    
+    <resultMap type="CmcTrainApproval" id="CmcTrainApprovalResult">
+        <result property="participateId"    column="participate_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="trainName"    column="train_name"    />
+        <result property="content"    column="content"    />
+        <result property="hours"    column="hours"    />
+        <result property="deptUserId"    column="dept_user_id"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <association property="user"    javaType="SysUser"         resultMap="ReportUserResult" />
+        <association property="user"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ReportUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="report_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <sql id="selectCmcTrainApprovalVo">
+        select ta.participate_id, ta.user_id, u.nick_name as report_nick_name, ta.dept_id, d.dept_name, ta.report_time, ta.train_name, ta.content, ta.hours, ta.dept_user_id, u1.nick_name as dept_nick_name, ta.dept_time, ta.dept_comment from cmc_train_approval as ta
+        left join sys_user as u on u.user_id = ta.user_id
+        left join sys_user as u1 on u1.user_id = ta.user_id
+        left join sys_dept as d on d.dept_id = ta.dept_id
+    </sql>
+
+    <select id="selectCmcTrainApprovalList" parameterType="CmcTrainApproval" resultMap="CmcTrainApprovalResult">
+        <include refid="selectCmcTrainApprovalVo"/>
+        <where>  
+            <if test="userId != null "> and ta.user_id = #{userId}</if>
+            <if test="deptId != null "> and ta.dept_id = #{deptId}</if>
+            <if test="reportTime != null "> and ta.report_time = #{reportTime}</if>
+            <if test="trainName != null  and trainName != ''"> and ta.train_name like concat('%', #{trainName}, '%')</if>
+            <if test="content != null  and content != ''"> and ta.content = #{content}</if>
+            <if test="hours != null "> and ta.hours = #{hours}</if>
+            <if test="deptUserId != null "> and ta.dept_user_id = #{deptUserId}</if>
+            <if test="deptTime != null "> and ta.dept_time = #{deptTime}</if>
+            <if test="deptComment != null  and deptComment != ''"> and ta.dept_comment = #{deptComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcTrainApprovalByParticipateId" parameterType="String" resultMap="CmcTrainApprovalResult">
+        <include refid="selectCmcTrainApprovalVo"/>
+        where participate_id = #{participateId}
+    </select>
+        
+    <insert id="insertCmcTrainApproval" parameterType="CmcTrainApproval">
+        insert into cmc_train_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="participateId != null">participate_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="trainName != null">train_name,</if>
+            <if test="content != null">content,</if>
+            <if test="hours != null">hours,</if>
+            <if test="deptUserId != null">dept_user_id,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="deptComment != null">dept_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="participateId != null">#{participateId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="trainName != null">#{trainName},</if>
+            <if test="content != null">#{content},</if>
+            <if test="hours != null">#{hours},</if>
+            <if test="deptUserId != null">#{deptUserId},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcTrainApproval" parameterType="CmcTrainApproval">
+        update cmc_train_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="trainName != null">train_name = #{trainName},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="hours != null">hours = #{hours},</if>
+            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+        </trim>
+        where participate_id = #{participateId}
+    </update>
+
+    <delete id="deleteCmcTrainApprovalByParticipateId" parameterType="String">
+        delete from cmc_train_approval where participate_id = #{participateId}
+    </delete>
+
+    <delete id="deleteCmcTrainApprovalByParticipateIds" parameterType="String">
+        delete from cmc_train_approval where participate_id in 
+        <foreach item="participateId" collection="array" open="(" separator="," close=")">
+            #{participateId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -76,12 +76,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			#{operId}
         </foreach> 
  	</delete>
- 	
+
  	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
 		<include refid="selectOperLogVo"/>
 		where oper_id = #{operId}
 	</select>
-	
+
+	<delete id="deleteOperLogJob">
+		delete from sys_oper_log where oper_time &lt;= date_sub(now(),interval 3 month)
+	</delete>
+
+	<delete id="deleteLoginInfoJob">
+		delete from sys_logininfor where login_time &lt;= date_sub(now(),interval 3 month)
+	</delete>
+
 	<update id="cleanOperLog">
         truncate table sys_oper_log
     </update>

oa-ui/src/api/oa/study/trainApproval.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询参培审核列表
+export function listTrainApproval(query) {
+  return request({
+    url: '/oa/trainApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询参培审核详细
+export function getTrainApproval(participateId) {
+  return request({
+    url: '/oa/trainApproval/' + participateId,
+    method: 'get'
+  })
+}
+
+// 新增参培审核
+export function addTrainApproval(data) {
+  return request({
+    url: '/oa/trainApproval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改参培审核
+export function updateTrainApproval(data) {
+  return request({
+    url: '/oa/trainApproval',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参培审核
+export function delTrainApproval(participateId) {
+  return request({
+    url: '/oa/trainApproval/' + participateId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-27 15:38:19
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-02-28 09:16:34
 -->
 
 <template>
@@ -235,7 +235,7 @@ export default {
         },{
           id: 9,
           name: '项目结算',
-          icon: 'money',
+          icon: 'settle',
           bgColor: '#ff6f61',
           boxShadow: '0 5px 20px rgba(255,111,97,0.5)',
           path: '/product/settle/project',

oa-ui/src/views/oa/study/approval.vue

@@ -0,0 +1,362 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="上报人" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入上报人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门" prop="deptId">
+        <el-input
+            v-model="queryParams.deptId"
+            placeholder="请输入部门"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+      </el-form-item>
+      <el-form-item label="上报日期" prop="reportTime">
+        <el-date-picker clearable
+          v-model="queryParams.reportTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择上报日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="培训名称" prop="trainName">
+        <el-input
+          v-model="queryParams.trainName"
+          placeholder="请输入培训名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时长" prop="hours">
+        <el-input
+          v-model="queryParams.hours"
+          placeholder="请输入时长"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审核人" prop="deptUserId">
+        <el-input
+          v-model="queryParams.deptUserId"
+          placeholder="请输入部门审核人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审核时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门审核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="部门审核意见" prop="deptComment">
+        <el-input
+          v-model="queryParams.deptComment"
+          placeholder="请输入部门审核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:trainApproval:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:trainApproval:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:trainApproval:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:trainApproval:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trainApprovalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="参培id" align="center" prop="participateId" />
+      <el-table-column label="上报人" align="center" prop="userId" />
+      <el-table-column label="部门" align="center" prop="deptId" />
+      <el-table-column label="上报日期" align="center" prop="reportTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="培训名称" align="center" prop="trainName" />
+      <el-table-column label="主要内容" align="center" prop="content" />
+      <el-table-column label="时长" align="center" prop="hours" />
+      <el-table-column label="部门审核人" align="center" prop="deptUserId" />
+      <el-table-column label="部门审核时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门审核意见" align="center" prop="deptComment" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:trainApproval:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:trainApproval:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参培审核对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="上报人" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入上报人" />
+        </el-form-item>
+        <el-form-item label="上报日期" prop="reportTime">
+          <el-date-picker clearable
+            v-model="form.reportTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择上报日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="培训名称" prop="trainName">
+          <el-input v-model="form.trainName" placeholder="请输入培训名称" />
+        </el-form-item>
+        <el-form-item label="主要内容">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="时长" prop="hours">
+          <el-input v-model="form.hours" placeholder="请输入时长" />
+        </el-form-item>
+        <el-form-item label="部门审核人" prop="deptUserId">
+          <el-input v-model="form.deptUserId" placeholder="请输入部门审核人" />
+        </el-form-item>
+        <el-form-item label="部门审核时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="部门审核意见" prop="deptComment">
+          <el-input v-model="form.deptComment" placeholder="请输入部门审核意见" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTrainApproval, getTrainApproval, delTrainApproval, addTrainApproval, updateTrainApproval } from "@/api/oa/study/trainApproval";
+
+export default {
+  name: "TrainApproval",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 参培审核表格数据
+      trainApprovalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        reportTime: null,
+        trainName: null,
+        content: null,
+        hours: null,
+        deptUserId: null,
+        deptTime: null,
+        deptComment: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询参培审核列表 */
+    getList() {
+      this.loading = true;
+      listTrainApproval(this.queryParams).then(response => {
+        this.trainApprovalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        participateId: null,
+        userId: null,
+        reportTime: null,
+        trainName: null,
+        content: null,
+        hours: null,
+        deptUserId: null,
+        deptTime: null,
+        deptComment: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.participateId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加参培审核";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const participateId = row.participateId || this.ids
+      getTrainApproval(participateId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改参培审核";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.participateId != null) {
+            updateTrainApproval(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTrainApproval(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const participateIds = row.participateId || this.ids;
+      this.$modal.confirm('是否确认删除参培审核编号为"' + participateIds + '"的数据项？').then(function() {
+        return delTrainApproval(participateIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/trainApproval/export', {
+        ...this.queryParams
+      }, `trainApproval_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>