档案借阅

yiming
1 parent 4dfd417c
Showing 2 changed files with 33 additions and 41 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml
@@ -11,7 +11,7 @@ import java.util.Date;
  * @author ym
  * @date 2022-08-23
  */
-public class ArchivesBorrow extends BaseEntity
+public class ArchivesBorrow extends ArchivesCollectBox
 {
     private static final long serialVersionUID = 1L;
@@ -97,12 +97,12 @@ public class ArchivesBorrow extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date borrowDateE;
-    private Long filingDept;
-
+    @Override
     public Long getId() {
         return id;
     }
+    @Override
     public void setId(Long id) {
         this.id = id;
     }
@@ -243,10 +243,12 @@ public class ArchivesBorrow extends BaseEntity
         this.borrowMark = borrowMark;
     }
+    @Override
     public String getStatus() {
         return status;
     }
+    @Override
     public void setStatus(String status) {
         this.status = status;
     }
@@ -266,39 +268,4 @@ public class ArchivesBorrow extends BaseEntity
     public void setBorrowDateE(Date borrowDateE) {
         this.borrowDateE = borrowDateE;
     }
-
-    public Long getFilingDept() {
-        return filingDept;
-    }
-
-    public void setFilingDept(Long filingDept) {
-        this.filingDept = filingDept;
-    }
-
-    @Override
-    public String toString() {
-        return "ArchivesBorrow{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", dept='" + dept + '\'' +
-                ", borrowDate=" + borrowDate +
-                ", phone='" + phone + '\'' +
-                ", mode='" + mode + '\'' +
-                ", boxType='" + boxType + '\'' +
-                ", borrowName='" + borrowName + '\'' +
-                ", borrowType='" + borrowType + '\'' +
-                ", collectBoxId='" + collectBoxId + '\'' +
-                ", createBy='" + createBy + '\'' +
-                ", createTime=" + createTime +
-                ", updateBy='" + updateBy + '\'' +
-                ", updateTime=" + updateTime +
-                ", returnDate=" + returnDate +
-                ", returnedDate=" + returnedDate +
-                ", borrowMark='" + borrowMark + '\'' +
-                ", status='" + status + '\'' +
-                ", borrowDateS=" + borrowDateS +
-                ", borrowDateE=" + borrowDateE +
-                ", filingDept=" + filingDept +
-                '}';
-    }
 }
@@ -25,6 +25,30 @@
         <result property="status"    column="status"    />
     </resultMap>
+    <resultMap type="ArchivesBorrow" id="ArchivesBorrowAndBox">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="dept"    column="dept"    />
+        <result property="borrowDate"    column="borrow_date"    />
+        <result property="phone"    column="phone"    />
+        <result property="mode"    column="mode"    />
+        <result property="boxType"    column="box_type"    />
+        <result property="borrowName"    column="borrow_name"    />
+        <result property="borrowType"    column="borrow_type"    />
+        <result property="collectBoxId"    column="collect_box_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="returnDate"    column="return_date"    />
+        <result property="returnedDate"    column="returned_date"    />
+        <result property="borrowMark"    column="borrow_mark"    />
+        <result property="status"    column="status"    />
+        <result property="archivalCode"    column="archival_code"    />
+        <result property="title"    column="title"    />
+        <result property="borrowStatus"    column="borrow_status"    />
+    </resultMap>
+
     <sql id="selectArchivesBorrowVo">
         select * from archives_borrow
     </sql>
@@ -41,15 +65,16 @@
         </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
+    <select id="selectArchivesBorrowListByFilingDept" parameterType="ArchivesBorrow" resultMap="ArchivesBorrowAndBox">
+        select a.*,b.* from archives_borrow a,archives_collect_box b,archives_dept c
+        where a.collect_box_id=b.id and  b.filing_dept=c.dept_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>
+        <if test="filingDept != null  and filingDept != ''"> AND (b.filing_dept=#{filingDept} or FIND_IN_SET(#{filingDept},c.ancestors))</if>
     </select>
 </mapper>
 \ No newline at end of file