From a6249b972f4b929e070ace0517da5b44f5d96be2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 11 九月 2025 13:07:50 +0800
Subject: [PATCH] 用印管理-规章的阅读状态接口
---
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | 1
src/main/java/com/ruoyi/collaborativeApproval/mapper/ReadingStatusMapper.java | 9 ++++
src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java | 70 +++++++++++++++++++++++++++++++++++
src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml | 6 +++
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 26 +++++++++++++
5 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index ad1afe3..c977781 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -1,6 +1,9 @@
package com.ruoyi.collaborativeApproval.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.collaborativeApproval.mapper.ReadingStatusMapper;
+import com.ruoyi.collaborativeApproval.pojo.ReadingStatus;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -18,6 +21,8 @@
public class RulesRegulationsManagementController {
@Autowired
private RulesRegulationsManagementService rulesRegulationsManagementService;
+ @Autowired
+ private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -45,4 +50,25 @@
}
return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
}
+ //瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
+ @PostMapping("/addReadingStatus")
+ @ApiOperation("鏂板闃呰鐘舵��")
+ public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.insert(readingStatus));
+ }
+ @PostMapping("/updateReadingStatus")
+ @ApiOperation("淇敼闃呰鐘舵��")
+ public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
+ }
+ @GetMapping("/getReadingStatusList")
+ @ApiOperation("鍒嗛〉鏌ヨ闃呰鐘舵��")
+ public AjaxResult listPage(Page page, ReadingStatus readingStatus){
+ return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+ }
+ @GetMapping("/getReadingStatusByRuleId/{ruleId}")
+ @ApiOperation("鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
+ public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
+ return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+ }
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/mapper/ReadingStatusMapper.java b/src/main/java/com/ruoyi/collaborativeApproval/mapper/ReadingStatusMapper.java
new file mode 100644
index 0000000..84834f9
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/mapper/ReadingStatusMapper.java
@@ -0,0 +1,9 @@
+package com.ruoyi.collaborativeApproval.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.collaborativeApproval.pojo.ReadingStatus;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ReadingStatusMapper extends BaseMapper<ReadingStatus> {
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java
new file mode 100644
index 0000000..1aa4892
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java
@@ -0,0 +1,70 @@
+package com.ruoyi.collaborativeApproval.pojo;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("reading_status")
+public class ReadingStatus implements Serializable {
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ /**
+ * 鍒跺害id
+ */
+ private Long ruleId;
+ /**
+ * 鍛樺伐濮撳悕
+ */
+ private String employee;
+ /**
+ * 閮ㄩ棬
+ */
+ private String department;
+ /**
+ * 纭鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime confirmTime;
+ /**
+ * 闃呰鐘舵��
+ */
+ private String status;
+ /**
+ * 鍒涘缓鑰�
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 淇敼浜�
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+ /**
+ * 淇敼鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+ /**
+ * 绉熸埛ID
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+}
diff --git a/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml b/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml
new file mode 100644
index 0000000..c61f17d
--- /dev/null
+++ b/src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml
@@ -0,0 +1,6 @@
+<?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.collaborativeApproval.mapper.ReadingStatusMapper">
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
index 7b11511..d720d37 100644
--- a/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
+++ b/src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml
@@ -16,6 +16,7 @@
<if test="staffJoinLeaveRecord.entryDateEnd != null and staffJoinLeaveRecord.entryDateEnd != '' ">
and contract_end_time like concat('%',#{staffJoinLeaveRecord.entryDateEnd},'%')
</if>
+ order by create_time desc
</select>
<select id="staffJoinLeaveRecordList" resultType="com.ruoyi.staff.pojo.StaffJoinLeaveRecord">
SELECT
--
Gitblit v1.9.3