新增学习记录表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcStudyController.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.CmcStudy;
+import com.ruoyi.oa.service.ICmcStudyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学习记录Controller
+ * 
+ * @author cmc
+ * @date 2025-03-06
+ */
+@RestController
+@RequestMapping("/oa/study")
+public class CmcStudyController extends BaseController
+{
+    @Autowired
+    private ICmcStudyService cmcStudyService;
+
+    /**
+     * 查询学习记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcStudy cmcStudy)
+    {
+        startPage();
+        List<CmcStudy> list = cmcStudyService.selectCmcStudyList(cmcStudy);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学习记录列表
+     */
+    @Log(title = "学习记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcStudy cmcStudy)
+    {
+        List<CmcStudy> list = cmcStudyService.selectCmcStudyList(cmcStudy);
+        ExcelUtil<CmcStudy> util = new ExcelUtil<CmcStudy>(CmcStudy.class);
+        util.exportExcel(response, list, "学习记录数据");
+    }
+
+    /**
+     * 获取学习记录详细信息
+     */
+    @GetMapping(value = "/{studyId}")
+    public AjaxResult getInfo(@PathVariable("studyId") Integer studyId)
+    {
+        return success(cmcStudyService.selectCmcStudyByStudyId(studyId));
+    }
+
+    /**
+     * 新增学习记录
+     */
+    @Log(title = "学习记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcStudy cmcStudy)
+    {
+        return toAjax(cmcStudyService.insertCmcStudy(cmcStudy));
+    }
+
+    /**
+     * 修改学习记录
+     */
+    @Log(title = "学习记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcStudy cmcStudy)
+    {
+        return toAjax(cmcStudyService.updateCmcStudy(cmcStudy));
+    }
+
+    /**
+     * 删除学习记录
+     */
+    @Log(title = "学习记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{studyIds}")
+    public AjaxResult remove(@PathVariable Integer[] studyIds)
+    {
+        return toAjax(cmcStudyService.deleteCmcStudyByStudyIds(studyIds));
+    }
+}

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

@@ -0,0 +1,151 @@
+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_study
+ * 
+ * @author cmc
+ * @date 2025-03-06
+ */
+public class CmcStudy extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 学习id */
+    private Integer studyId;
+
+    /** 学习资料id */
+    private Integer resourceId;
+    @Excel(name = "学习资料标题")
+    private String title;
+    private CmcResource resource;
+
+    /** 用户id */
+    private Long userId;
+    @Excel(name = "姓名")
+    private String nickName;
+    private SysUser user;
+
+    /** 部门 */
+    @Excel(name = "部门")
+    private String deptName;
+    private SysDept dept;
+
+    /** 上次位置（视频文本百分比） */
+    @Excel(name = "上次位置", readConverterExp = "视=频文本百分比")
+    private String lastPoint;
+
+    /** 上次时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上次时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastTime;
+
+    /** 可获学时 */
+    @Excel(name = "可获学时")
+    private Double getHours;
+
+    public void setStudyId(Integer studyId) 
+    {
+        this.studyId = studyId;
+    }
+
+    public Integer getStudyId() 
+    {
+        return studyId;
+    }
+    public void setResourceId(Integer resourceId) 
+    {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getResourceId() 
+    {
+        return resourceId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setLastPoint(String lastPoint) 
+    {
+        this.lastPoint = lastPoint;
+    }
+
+    public String getLastPoint() 
+    {
+        return lastPoint;
+    }
+    public void setLastTime(Date lastTime) 
+    {
+        this.lastTime = lastTime;
+    }
+
+    public Date getLastTime() 
+    {
+        return lastTime;
+    }
+    public void setGetHours(Double getHours) 
+    {
+        this.getHours = getHours;
+    }
+
+    public Double getGetHours() 
+    {
+        return getHours;
+    }
+    public void setResource(CmcResource resource)
+    {
+        this.resource = resource;
+        this.title = resource == null ? "" : resource.getTitle();
+    }
+
+    public CmcResource getResource()
+    {
+        return resource;
+    }
+    public void setUser(SysUser user)
+    {
+        this.user = user;
+        this.nickName = user == null ? "" : user.getNickName();
+    }
+
+    public SysUser getUser()
+    {
+        return user;
+    }
+    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("studyId", getStudyId())
+            .append("resourceId", getResourceId())
+            .append("userId", getUserId())
+            .append("lastPoint", getLastPoint())
+            .append("lastTime", getLastTime())
+            .append("getHours", getGetHours())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcStudy;
+
+/**
+ * 学习记录Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-03-06
+ */
+public interface CmcStudyMapper 
+{
+    /**
+     * 查询学习记录
+     * 
+     * @param studyId 学习记录主键
+     * @return 学习记录
+     */
+    public CmcStudy selectCmcStudyByStudyId(Integer studyId);
+
+    /**
+     * 查询学习记录列表
+     * 
+     * @param cmcStudy 学习记录
+     * @return 学习记录集合
+     */
+    public List<CmcStudy> selectCmcStudyList(CmcStudy cmcStudy);
+
+    /**
+     * 新增学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    public int insertCmcStudy(CmcStudy cmcStudy);
+
+    /**
+     * 修改学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    public int updateCmcStudy(CmcStudy cmcStudy);
+
+    /**
+     * 删除学习记录
+     * 
+     * @param studyId 学习记录主键
+     * @return 结果
+     */
+    public int deleteCmcStudyByStudyId(Integer studyId);
+
+    /**
+     * 批量删除学习记录
+     * 
+     * @param studyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcStudyByStudyIds(Integer[] studyIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcStudy;
+
+/**
+ * 学习记录Service接口
+ * 
+ * @author cmc
+ * @date 2025-03-06
+ */
+public interface ICmcStudyService 
+{
+    /**
+     * 查询学习记录
+     * 
+     * @param studyId 学习记录主键
+     * @return 学习记录
+     */
+    public CmcStudy selectCmcStudyByStudyId(Integer studyId);
+
+    /**
+     * 查询学习记录列表
+     * 
+     * @param cmcStudy 学习记录
+     * @return 学习记录集合
+     */
+    public List<CmcStudy> selectCmcStudyList(CmcStudy cmcStudy);
+
+    /**
+     * 新增学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    public int insertCmcStudy(CmcStudy cmcStudy);
+
+    /**
+     * 修改学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    public int updateCmcStudy(CmcStudy cmcStudy);
+
+    /**
+     * 批量删除学习记录
+     * 
+     * @param studyIds 需要删除的学习记录主键集合
+     * @return 结果
+     */
+    public int deleteCmcStudyByStudyIds(Integer[] studyIds);
+
+    /**
+     * 删除学习记录信息
+     * 
+     * @param studyId 学习记录主键
+     * @return 结果
+     */
+    public int deleteCmcStudyByStudyId(Integer studyId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcStudyServiceImpl.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.CmcStudyMapper;
+import com.ruoyi.oa.domain.CmcStudy;
+import com.ruoyi.oa.service.ICmcStudyService;
+
+/**
+ * 学习记录Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-03-06
+ */
+@Service
+public class CmcStudyServiceImpl implements ICmcStudyService 
+{
+    @Autowired
+    private CmcStudyMapper cmcStudyMapper;
+
+    /**
+     * 查询学习记录
+     * 
+     * @param studyId 学习记录主键
+     * @return 学习记录
+     */
+    @Override
+    public CmcStudy selectCmcStudyByStudyId(Integer studyId)
+    {
+        return cmcStudyMapper.selectCmcStudyByStudyId(studyId);
+    }
+
+    /**
+     * 查询学习记录列表
+     * 
+     * @param cmcStudy 学习记录
+     * @return 学习记录
+     */
+    @Override
+    public List<CmcStudy> selectCmcStudyList(CmcStudy cmcStudy)
+    {
+        return cmcStudyMapper.selectCmcStudyList(cmcStudy);
+    }
+
+    /**
+     * 新增学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    @Override
+    public int insertCmcStudy(CmcStudy cmcStudy)
+    {
+        return cmcStudyMapper.insertCmcStudy(cmcStudy);
+    }
+
+    /**
+     * 修改学习记录
+     * 
+     * @param cmcStudy 学习记录
+     * @return 结果
+     */
+    @Override
+    public int updateCmcStudy(CmcStudy cmcStudy)
+    {
+        return cmcStudyMapper.updateCmcStudy(cmcStudy);
+    }
+
+    /**
+     * 批量删除学习记录
+     * 
+     * @param studyIds 需要删除的学习记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcStudyByStudyIds(Integer[] studyIds)
+    {
+        return cmcStudyMapper.deleteCmcStudyByStudyIds(studyIds);
+    }
+
+    /**
+     * 删除学习记录信息
+     * 
+     * @param studyId 学习记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcStudyByStudyId(Integer studyId)
+    {
+        return cmcStudyMapper.deleteCmcStudyByStudyId(studyId);
+    }
+}

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

@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="reportDept != null  and reportDept != ''"> and s.report_dept = #{reportDept}</if>
-            <if test="xmName != null"> and s.xm_name = #{xmName}</if>
+            <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>
             <if test="reportTime != null "> and s.report_time = #{reportTime}</if>

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

@@ -0,0 +1,97 @@
+<?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.CmcStudyMapper">
+    
+    <resultMap type="CmcStudy" id="CmcStudyResult">
+        <result property="studyId"    column="study_id"    />
+        <result property="resourceId"    column="resource_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="lastPoint"    column="last_point"    />
+        <result property="lastTime"    column="last_time"    />
+        <result property="getHours"    column="get_hours"    />
+        <association property="user"    javaType="SysUser"         resultMap="userResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="resource"    javaType="CmcResource"         resultMap="CmcResourceResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="UserResult">
+        <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>
+
+    <resultMap type="CmcResource" id="CmcResourceResult">
+        <result property="resourceId"    column="resource_id"    />
+        <result property="title"    column="title"    />
+    </resultMap>
+
+    <sql id="selectCmcStudyVo">
+        select s.study_id, s.resource_id, r.tile, s.user_id, u.nick_name, d.dept_name, s.last_point, s.last_time, s.get_hours from cmc_study as s
+        left join sys_user as u on u.user_id = s.user_id
+        left join sys_dept as d on d.dept_id = u.dept_id
+        left join cmc_resource as r on r.resource_id = s.resource_id
+    </sql>
+
+    <select id="selectCmcStudyList" parameterType="CmcStudy" resultMap="CmcStudyResult">
+        <include refid="selectCmcStudyVo"/>
+        <where>  
+            <if test="resourceId != null "> and s.resource_id = #{resourceId}</if>
+            <if test="userId != null "> and s.user_id = #{userId}</if>
+            <if test="lastPoint != null  and lastPoint != ''"> and s.last_point = #{lastPoint}</if>
+            <if test="lastTime != null "> and s.last_time = #{lastTime}</if>
+            <if test="getHours != null "> and s.get_hours = #{getHours}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcStudyByStudyId" parameterType="Integer" resultMap="CmcStudyResult">
+        <include refid="selectCmcStudyVo"/>
+        where study_id = #{studyId}
+    </select>
+        
+    <insert id="insertCmcStudy" parameterType="CmcStudy" useGeneratedKeys="true" keyProperty="studyId">
+        insert into cmc_study
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resourceId != null">resource_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="lastPoint != null">last_point,</if>
+            <if test="lastTime != null">last_time,</if>
+            <if test="getHours != null">get_hours,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resourceId != null">#{resourceId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="lastPoint != null">#{lastPoint},</if>
+            <if test="lastTime != null">#{lastTime},</if>
+            <if test="getHours != null">#{getHours},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcStudy" parameterType="CmcStudy">
+        update cmc_study
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="resourceId != null">resource_id = #{resourceId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="lastPoint != null">last_point = #{lastPoint},</if>
+            <if test="lastTime != null">last_time = #{lastTime},</if>
+            <if test="getHours != null">get_hours = #{getHours},</if>
+        </trim>
+        where study_id = #{studyId}
+    </update>
+
+    <delete id="deleteCmcStudyByStudyId" parameterType="Integer">
+        delete from cmc_study where study_id = #{studyId}
+    </delete>
+
+    <delete id="deleteCmcStudyByStudyIds" parameterType="String">
+        delete from cmc_study where study_id in 
+        <foreach item="studyId" collection="array" open="(" separator="," close=")">
+            #{studyId}
+        </foreach>
+    </delete>
+</mapper>