src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/collaborativeApproval/mapper/ReadingStatusMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/collaborativeApproval/pojo/ReadingStatus.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/collaborativeApproval/ReadingStatusMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/staff/StaffJoinLeaveRecordMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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))); } } 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> { } 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; } 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> 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