档案归还

yiming
1 parent c8b0ab27
Showing 9 changed files with 153 additions and 47 deletions
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesBorrowController.java
ruoyi-archives/src/main/java/com/ruoyi/domain/ArchivesCollectBox.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesBorrowMapper.java
ruoyi-archives/src/main/java/com/ruoyi/mapper/ArchivesCollectBoxMapper.java
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesBorrowServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml
ruoyi-archives/src/main/resources/mapper/archives/ArchivesCollectBoxMapper.xml
ruoyi-ui/src/api/service/borrowReturn.js
ruoyi-ui/src/views/service/borrowReturn/index.vue
@@ -38,6 +38,7 @@ public class ArchivesBorrowController extends BaseController
     public TableDataInfo list(ArchivesBorrow archivesBorrow)
     {
         startPage();
+        archivesBorrow.setStatus("true");
         List<ArchivesBorrow> list = archivesBorrowService.selectArchivesBorrowListByFilingDept(archivesBorrow);
         return getDataTable(list);
     }
@@ -145,6 +145,12 @@ public class ArchivesCollectBox extends BaseEntity
     @Excel(name = "盒号")
     private String boxMark;
  
+    /** 库位码 */
+    private String deportNodeId;
+
+    /** 0-借出 1-归还  */
+    private String borrowStatus;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -425,44 +431,58 @@ public class ArchivesCollectBox extends BaseEntity
         this.boxId = boxId;
     }
  
+    public String getDeportNodeId() {
+        return deportNodeId;
+    }
+
+    public void setDeportNodeId(String deportNodeId) {
+        this.deportNodeId = deportNodeId;
+    }
+
+    public String getBorrowStatus() {
+        return borrowStatus;
+    }
+
+    public void setBorrowStatus(String borrowStatus) {
+        this.borrowStatus = borrowStatus;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("boxId", getBoxId())
-            .append("general", getGeneral())
-            .append("year", getYear())
-            .append("title", getTitle())
-            .append("sort", getSort())
-            .append("safekeepingDate", getSafekeepingDate())
-            .append("secretLevel", getSecretLevel())
-            .append("pages", getPages())
-            .append("filingNumber", getFilingNumber())
-            .append("zkNumber", getZkNumber())
-            .append("locationCode", getLocationCode())
-            .append("filingDept", getFilingDept())
-            .append("archivalCode", getArchivalCode())
-            .append("responsibilityName", getResponsibilityName())
-            .append("serialMark", getSerialMark())
-            .append("pieceMark", getPieceMark())
-            .append("registerMark", getRegisterMark())
-            .append("counsellors", getCounsellors())
-            .append("filingName", getFilingName())
-            .append("summaryName", getSummaryName())
-            .append("recordType", getRecordType())
-            .append("carrierType", getCarrierType())
-            .append("draftName", getDraftName())
-            .append("page", getPage())
-            .append("documentMark", getDocumentMark())
-            .append("text", getText()) 
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("status", getStatus())
-            .append("apprvoal", getApprvoal())
-            .append("belongRole", getBelongRole())
-            .append("boxMark", getBoxMark())
-            .toString();
+        return "ArchivesCollectBox{" +
+                "id=" + id +
+                ", boxId=" + boxId +
+                ", general='" + general + '\'' +
+                ", year='" + year + '\'' +
+                ", title='" + title + '\'' +
+                ", sort='" + sort + '\'' +
+                ", safekeepingDate=" + safekeepingDate +
+                ", secretLevel='" + secretLevel + '\'' +
+                ", pages='" + pages + '\'' +
+                ", filingNumber='" + filingNumber + '\'' +
+                ", zkNumber='" + zkNumber + '\'' +
+                ", locationCode='" + locationCode + '\'' +
+                ", filingDept='" + filingDept + '\'' +
+                ", archivalCode='" + archivalCode + '\'' +
+                ", responsibilityName='" + responsibilityName + '\'' +
+                ", serialMark='" + serialMark + '\'' +
+                ", pieceMark='" + pieceMark + '\'' +
+                ", registerMark='" + registerMark + '\'' +
+                ", counsellors='" + counsellors + '\'' +
+                ", filingName='" + filingName + '\'' +
+                ", summaryName='" + summaryName + '\'' +
+                ", recordType='" + recordType + '\'' +
+                ", carrierType='" + carrierType + '\'' +
+                ", draftName='" + draftName + '\'' +
+                ", page='" + page + '\'' +
+                ", documentMark='" + documentMark + '\'' +
+                ", text='" + text + '\'' +
+                ", status='" + status + '\'' +
+                ", apprvoal='" + apprvoal + '\'' +
+                ", belongRole='" + belongRole + '\'' +
+                ", boxMark='" + boxMark + '\'' +
+                ", deportNodeId='" + deportNodeId + '\'' +
+                ", borrowStatus='" + borrowStatus + '\'' +
+                '}';
     }
 }
 package com.ruoyi.mapper;
  
 import com.ruoyi.domain.ArchivesBorrow;
+import com.ruoyi.domain.ArchivesBox;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
  
 /**
@@ -28,4 +31,20 @@ public interface ArchivesBorrowMapper
      */
     List<ArchivesBorrow> selectArchivesBorrowListByFilingDept(ArchivesBorrow archivesBorrow);
  
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param ids 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    Long[] selectCollectBoxIds(Long[] ids);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    int updateArchivesBorrowByIds(@Param("archivesBorrow") ArchivesBorrow archivesBorrow, @Param("ids") Long[] ids);
+
 }
@@ -69,4 +69,6 @@ public interface ArchivesCollectBoxMapper
      * @return
      */
     public int Scatter(@Param("apprvoal")String apprvoal, @Param("boxId") Long boxId,@Param("status") String status);
+
+    int updateArchivesCollectBoxByIds(@Param("archivesCollectBox") ArchivesCollectBox archivesCollectBox, @Param("ids") Long[] ids);
 }
 package com.ruoyi.service.impl;
  
 import com.ruoyi.domain.ArchivesBorrow;
+import com.ruoyi.domain.ArchivesCollectBox;
 import com.ruoyi.mapper.ArchivesBorrowMapper;
+import com.ruoyi.mapper.ArchivesCollectBoxMapper;
 import com.ruoyi.service.IArchivesBorrowService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
  
 /**
@@ -19,6 +27,9 @@ public class ArchivesBorrowServiceImpl implements IArchivesBorrowService
     @Resource
     private ArchivesBorrowMapper archivesBorrowMapper;
  
+    @Resource
+    private ArchivesCollectBoxMapper archivesCollectBoxMapper;
+
  
     /**
      * 查询【请填写功能名称】列表
@@ -45,13 +56,26 @@ public class ArchivesBorrowServiceImpl implements IArchivesBorrowService
     }
  
     @Override
+    @Transactional
     public int archivesReturn(Long[] ids) {
-        return 0;
+        ArchivesBorrow archivesBorrow=new ArchivesBorrow();
+        archivesBorrow.setReturnedDate(new Date());
+        archivesBorrow.setStatus("1");
+        int i=archivesBorrowMapper.updateArchivesBorrowByIds(archivesBorrow, ids);
+        Long[] boxIds=archivesBorrowMapper.selectCollectBoxIds(ids);
+        ArchivesCollectBox archivesCollectBox=new ArchivesCollectBox();
+        archivesCollectBox.setBorrowStatus("1");
+        archivesCollectBoxMapper.updateArchivesCollectBoxByIds(archivesCollectBox,boxIds);
+        return i;
     }
  
     @Override
     public int archivesRenew(Long[] ids) {
-        return 0;
+        ArchivesBorrow archivesBorrow=new ArchivesBorrow();
+        archivesBorrow.setReturnedDate(new Date());
+        archivesBorrow.setStatus("3");
+        int i=archivesBorrowMapper.updateArchivesBorrowByIds(archivesBorrow, ids);
+        return i;
     }
  
  
@@ -75,6 +75,28 @@
         <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} or FIND_IN_SET(#{filingDept},c.ancestors))</if>
+        <if test="filingDept != null  and filingDept != ''"> AND (b.filing_dept=#{filingDept} or FIND_IN_SET(#{filingDept},c.ancestors))</if>
+        <if test="status == 'true'"> and a.status != '1'</if>
+    </select>
+
+    <select id="selectCollectBoxIds" parameterType="Long" resultType="Long">
+        select collect_box_id from archives_borrow where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
  
+    <update id="updateArchivesBorrowByIds" parameterType="ArchivesBorrow">
+        update archives_borrow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="archivesBorrow.returnDate != null">return_date = #{archivesBorrow.returnDate},</if>
+            <if test="archivesBorrow.returnedDate != null">returned_date = #{archivesBorrow.returnedDate},</if>
+            <if test="archivesBorrow.status != null">status = #{archivesBorrow.status},</if>
+        </trim>
+        where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>
 \ No newline at end of file
@@ -228,6 +228,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         update archives_collect_box set
         <if test="boxId != null">box_id =Null , status = #{status} ,apprvoal= #{apprvoal} where box_id = #{boxId}</if>
     </update>
+
+    <update id="updateArchivesCollectBoxByIds" parameterType="ArchivesCollectBox">
+        update archives_collect_box
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="archivesCollectBox.borrowStatus != null">borrow_status = #{archivesCollectBox.borrowStatus},</if>
+            <if test="archivesCollectBox.deportNodeId != null">deport_node_id = #{archivesCollectBox.deportNodeId},</if>
+        </trim>
+        where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
  
  
 </mapper>
 \ No newline at end of file
@@ -11,13 +11,13 @@ export function listPost(query) {
  
 export function archivesReturn(id) {
   return request({
-    url: '/service/expiration/archivesReturn/' + id,
+    url: '/archives/borrow/archivesReturn/' + id,
     method: 'post',
   })
 }
 export function archivesRenew(id) {
   return request({
-    url: '/service/expiration/archivesRenew/' + id,
+    url: '/archives/borrow/archivesRenew/' + id,
     method: 'post',
   })
 }
@@ -54,12 +54,12 @@
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="档号" align="center" prop="archivalCode"  />
           <el-table-column label="题名" align="center"  prop="title" />
+          <el-table-column label="状态" align="center"  prop="status" :formatter="borrowStatusFormat"/>
           <el-table-column label="目的" align="center"  prop="borrowType" />
           <el-table-column label="借阅人" align="center" prop="name" />
           <el-table-column label="部门" align="center" prop="dept" />
           <el-table-column label="实体利用方式" align="center" prop="mode" />
-          <el-table-column label="在库状态" align="center" prop="borrowStatus" />
-          <el-table-column label="借阅日期" align="center" prop="borrowDate" />
+          <el-table-column label="领取日期" align="center" prop="borrowDate" />
           <el-table-column label="待归还日期" align="center" prop="returnDate" />
           <el-table-column label="借阅单号" align="center" prop="borrowMark" />
         </el-table>
@@ -71,10 +71,11 @@
  
 <script >
 import {treeselect} from "@/api/archives/dept";
-import {listPost} from "@/api/service/borrowReturn";
+import {listPost,archivesReturn,archivesRenew} from "@/api/service/borrowReturn";
  
 export default {
   name: "borrowRecord",
+  dicts: ['borrowStatus'],
   data() {
     return {
       // 部门树选项
@@ -93,6 +94,7 @@ export default {
       },
       loading: false,
       list: [],
+      ids: [],
     };
   },
  
@@ -133,7 +135,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.params.ids= selection.map(item => item.id)
+      this.ids= selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -150,8 +152,9 @@ export default {
     /** 归还按钮 */
     archivesReturn(row) {
       const ids =row.id || this.ids;
+      console.log(ids);
       this.$modal.confirm('是否确认归还？').then(function() {
-        return this.archivesReturn(ids);
+        return archivesReturn(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("提交成功");
@@ -161,11 +164,14 @@ export default {
     archivesRenew(row) {
       const ids =row.id || this.ids;
       this.$modal.confirm('是否确认续借？').then(function() {
-        return this.archivesRenew(ids);
+        return archivesRenew(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("提交成功");
       }).catch(() => {});
+    },
+    borrowStatusFormat(row, column) {
+      return this.selectDictLabel(this.dict.type.borrowStatus, row.status);
     }
  
   }