字段修改

yiming
2 parents b16d8e4b 77ca37cb
Showing 3 changed files with 16 additions and 65 deletions
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesBorrow.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
@@ -3,6 +3,9 @@ package com.ruoyi.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.util.Date;
  
 /**
@@ -53,25 +56,7 @@ public class ArchivesBorrow extends ArchivesCollectBox
  
     /** 借阅文件id */
     @Excel(name = "借阅文件id")
-    private String collectBoxId;
-
-    /** 创建人 */
-    @Excel(name = "创建人")
-    private String createBy;
-
-    /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createTime;
-
-    /** 修改人 */
-    @Excel(name = "修改人")
-    private String updateBy;
-
-    /** 修改时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateTime;
+    private Long collectBoxId;
  
     /** 借阅天数 */
     @Excel(name = "借阅天数")
@@ -86,8 +71,8 @@ public class ArchivesBorrow extends ArchivesCollectBox
     @Excel(name = "借阅单号")
     private String borrowMark;
  
-    /** 借阅状态 0-借出 1-归还 2-逾期*/
-    @Excel(name = "申请状态")
+    /** 借阅状态 0-借出 1-归还 2-逾期 3-续借 */
+    @Excel(name = "借阅状态 0-借出 1-归还 2-逾期 3-续借")
     private String status;
  
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -170,54 +155,14 @@ public class ArchivesBorrow extends ArchivesCollectBox
         this.borrowType = borrowType;
     }
  
-    public String getCollectBoxId() {
+    public Long getCollectBoxId() {
         return collectBoxId;
     }
  
-    public void setCollectBoxId(String collectBoxId) {
+    public void setCollectBoxId(Long collectBoxId) {
         this.collectBoxId = collectBoxId;
     }
  
-    @Override
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    @Override
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    @Override
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    @Override
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    @Override
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
     public int getReturnDate() {
         return returnDate;
     }
@@ -148,7 +148,8 @@ public class ArchivesCollectBox extends BaseEntity
     /** 库位码 */
     private String deportNodeId;
  
-    /** 0-借出 1-归还  */
+    /** 是否借出 0-借出 1-归还  */
+    @Excel(name = "是否借出 0-借出 1-归还 ")
     private String borrowStatus;
  
     public void setId(Long id) 
@@ -40,10 +40,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="apprvoal"    column="apprvoal"    />
         <result property="belongRole"    column="belong_role"    />
         <result property="boxMark"    column="box_mark"    />
+        <result property="borrowStatus"    column="borrow_status"    />
     </resultMap>
  
     <sql id="selectArchivesCollectBoxVo">
-        select id,box_id, general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark from archives_collect_box
+        select id,box_id, general, year, title, sort, safekeeping_date, secret_level, pages, filing_number, zk_number, location_code, filing_dept, archival_code, responsibility_name, serial_mark, piece_mark, register_mark, counsellors, filing_name, summary_name, record_type, carrier_type, draft_name, page, document_mark, text, create_by, create_time, update_by, update_time, status, apprvoal, belong_role, box_mark,borrow_status from archives_collect_box
     </sql>
  
     <select id="selectArchivesCollectBoxList" parameterType="ArchivesCollectBox" resultMap="ArchivesCollectBoxResult">
@@ -79,6 +80,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null  and apprvoal != ''"> and apprvoal = #{apprvoal}</if>
             <if test="belongRole != null  and belongRole != ''"> and belong_role = #{belongRole}</if>
             <if test="boxMark != null  and boxMark != ''"> and box_mark = #{boxMark}</if>
+            <if test="borrowStatus != null  and borrowStatus != ''"> and borrow_status = #{borrowStatus}</if>
         </where>
     </select>
  
@@ -124,6 +126,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">apprvoal,</if>
             <if test="belongRole != null">belong_role,</if>
             <if test="boxMark != null">box_mark,</if>
+            <if test="borrowStatus != null">borrow_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="boxId != null">#{boxId},</if>
@@ -160,6 +163,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">#{apprvoal},</if>
             <if test="belongRole != null">#{belongRole},</if>
             <if test="boxMark != null">#{boxMark},</if>
+            <if test="borrowStatus != null">#{borrowStatus},</if>
          </trim>
     </insert>
  
@@ -200,6 +204,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="apprvoal != null">apprvoal = #{apprvoal},</if>
             <if test="belongRole != null">belong_role = #{belongRole},</if>
             <if test="boxMark != null">box_mark = #{boxMark},</if>
+            <if test="borrowStatus != null">borrow_status = #{borrowStatus},</if>
         </trim>
         where id = #{id}
     </update>