档案借阅

yiming
1 parent 62e2c712
Showing 7 changed files with 216 additions and 5 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesBorrowController.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesBorrowMapper.java
ruoyi-archives/src/main/java/com/ruoyi/service/IArchivesBorrowService.java
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesBorrowServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml
ruoyi-service/src/main/java/com/ruoyi/service/domain/ArchivesBorrowRecord.java
+package com.ruoyi.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ArchivesBorrow;
+import com.ruoyi.domain.ArchivesBox;
+import com.ruoyi.service.IArchivesBorrowService;
+import com.ruoyi.service.IArchivesBoxService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Controller
+ * 
+ * @author ym
+ * @date 2022-08-23
+ */
+@RestController
+@RequestMapping("/archives/borrow")
+public class ArchivesBorrowController extends BaseController
+{
+    @Autowired
+    private IArchivesBorrowService archivesBorrowService;
+
+    /**
+     * 查询【请填写功能名称】列表
+     */
+    @PreAuthorize("@ss.hasPermi('archives:borrow:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ArchivesBorrow archivesBorrow)
+    {
+        startPage();
+        List<ArchivesBorrow> list = archivesBorrowService.selectArchivesBorrowListByFilingDept(archivesBorrow);
+        return getDataTable(list);
+    }
+
+
+
+}
@@ -78,11 +78,16 @@ public class ArchivesBorrow extends BaseEntity
     @Excel(name = "待归还日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
+    /** 实际还日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际还日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date returnedDate;
+
     /** 借阅单号 */
     @Excel(name = "借阅单号")
     private String borrowMark;
-    /** 申请状态 0-待审核 1-通过 2-不通过*/
+    /** 借阅状态 0-借出 1-归还 2-逾期*/
     @Excel(name = "申请状态")
     private String status;
@@ -92,6 +97,8 @@ public class ArchivesBorrow extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date borrowDateE;
+    private Long filingDept;
+
     public Long getId() {
         return id;
     }
@@ -220,6 +227,14 @@ public class ArchivesBorrow extends BaseEntity
         this.returnDate = returnDate;
     }
+    public Date getReturnedDate() {
+        return returnedDate;
+    }
+
+    public void setReturnedDate(Date returnedDate) {
+        this.returnedDate = returnedDate;
+    }
+
     public String getBorrowMark() {
         return borrowMark;
     }
@@ -252,6 +267,14 @@ public class ArchivesBorrow extends BaseEntity
         this.borrowDateE = borrowDateE;
     }
+    public Long getFilingDept() {
+        return filingDept;
+    }
+
+    public void setFilingDept(Long filingDept) {
+        this.filingDept = filingDept;
+    }
+
     @Override
     public String toString() {
         return "ArchivesBorrow{" +
@@ -270,10 +293,12 @@ public class ArchivesBorrow extends BaseEntity
                 ", updateBy='" + updateBy + '\'' +
                 ", updateTime=" + updateTime +
                 ", returnDate=" + returnDate +
+                ", returnedDate=" + returnedDate +
                 ", borrowMark='" + borrowMark + '\'' +
                 ", status='" + status + '\'' +
                 ", borrowDateS=" + borrowDateS +
                 ", borrowDateE=" + borrowDateE +
+                ", filingDept=" + filingDept +
                 '}';
     }
 }
@@ -15,9 +15,17 @@ public interface ArchivesBorrowMapper
     /**
      * 查询【请填写功能名称】列表
      * 
-     * @param archivesBox 【请填写功能名称】
+     * @param archivesBorrow 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-     List<ArchivesBorrow> selectArchivesBorrowList(ArchivesBorrow archivesBox);
+     List<ArchivesBorrow> selectArchivesBorrowList(ArchivesBorrow archivesBorrow);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<ArchivesBorrow> selectArchivesBorrowListByFilingDept(ArchivesBorrow archivesBorrow);
 }
@@ -21,4 +21,12 @@ public interface IArchivesBorrowService
      */
      List<ArchivesBorrow> selectArchivesBorrowList(ArchivesBorrow archivesBorrow);
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<ArchivesBorrow> selectArchivesBorrowListByFilingDept(ArchivesBorrow archivesBorrow);
+
 }
 package com.ruoyi.service.impl;
 import com.ruoyi.domain.ArchivesBorrow;
-import com.ruoyi.domain.ArchivesBox;
 import com.ruoyi.mapper.ArchivesBorrowMapper;
 import com.ruoyi.service.IArchivesBorrowService;
 import org.springframework.stereotype.Service;
@@ -33,4 +32,16 @@ public class ArchivesBorrowServiceImpl implements IArchivesBorrowService
         return archivesBorrowMapper.selectArchivesBorrowList(archivesBorrow);
     }
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<ArchivesBorrow> selectArchivesBorrowListByFilingDept(ArchivesBorrow archivesBorrow)
+    {
+        return archivesBorrowMapper.selectArchivesBorrowListByFilingDept(archivesBorrow);
+    }
+
 }
@@ -20,7 +20,8 @@
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="returnDate"    column="return_date"    />
-        <result property="borrow_mark"    column="borrowMark"    />
+        <result property="returnedDate"    column="returned_date"    />
+        <result property="borrowMark"    column="borrow_mark"    />
         <result property="status"    column="status"    />
     </resultMap>
@@ -40,4 +41,15 @@
         </where>
     </select>
+    <select id="selectArchivesBorrowListByFilingDept" parameterType="ArchivesBorrow" resultMap="ArchivesBorrowResult">
+        select a.* from archives_borrow a,archives_collect_box b where a.collect_box_id=b.id
+        <if test="name != null  and name != ''"> and a.name = #{name}</if>
+        <if test="dept != null  and dept != ''"> and a.dept = #{dept}</if>
+        <if test="borrowDate != null  and borrowDate != ''"> and a.borrow_date = #{borrowDate}</if>
+        <if test="borrowDateS != null  and borrowDateS != ''"> and a.borrow_date >= #{borrowDateS}</if>
+        <if test="borrowDateE != null  and borrowDateE != ''"> and a.borrow_date &lt;= #{borrowDateE}</if>
+        <if test="borrowMark != null  and borrowMark != ''"> and a.borrow_mark = #{borrowMark}</if>
+        <if test="filingDept != null  and filingDept != ''"> and b.filing_dept = #{filingDept}</if>
+    </select>
+
 </mapper>
 \ No newline at end of file
+package com.ruoyi.service.domain;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.domain.ArchivesBorrow;
+import java.util.Date;
+
+
+/**
+ * 借阅记录 archives_borrow_record
+ * 
+ * @author ym
+ */
+public class ArchivesBorrowRecord extends ArchivesBorrow
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /** 借阅申请 */
+    private Long borrowId;
+
+    /** 借阅文件 */
+    private Long archivesId;
+
+    /** 领取时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 状态 0-借出 1-归还 2-逾期 */
+    private String recordStatus;
+
+    /** 归还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date returnedTime;
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getBorrowId() {
+        return borrowId;
+    }
+
+    public void setBorrowId(Long borrowId) {
+        this.borrowId = borrowId;
+    }
+
+    public Long getArchivesId() {
+        return archivesId;
+    }
+
+    public void setArchivesId(Long archivesId) {
+        this.archivesId = archivesId;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRecordStatus() {
+        return recordStatus;
+    }
+
+    public void setRecordStatus(String recordStatus) {
+        this.recordStatus = recordStatus;
+    }
+
+    public Date getReturnedTime() {
+        return returnedTime;
+    }
+
+    public void setReturnedTime(Date returnedTime) {
+        this.returnedTime = returnedTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ArchivesBorrowRecord{" +
+                "id=" + id +
+                ", borrowId=" + borrowId +
+                ", archivesId=" + archivesId +
+                ", createTime=" + createTime +
+                ", recordStatus='" + recordStatus + '\'' +
+                ", returnedTime=" + returnedTime +
+                '}';
+    }
+}