归还修改

yiming
1 parent 4eb2ddd9
Showing 3 changed files with 24 additions and 10 deletions
ruoyi-archives/src/main/java/com/ruoyi/service/impl/ArchivesBorrowServiceImpl.java
ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml
ruoyi-ui/src/views/service/borrowReturn/index.vue
@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
@@ -75,7 +76,7 @@ public class ArchivesBorrowServiceImpl implements IArchivesBorrowService
     @Override
     public int archivesRenew(Long[] ids) {
         ArchivesBorrow archivesBorrow=new ArchivesBorrow();
-        archivesBorrow.setBorrowDate(new Date());
+        archivesBorrow.setBorrowDate(DateUtils.truncate(new Date(), Calendar.DATE));
         archivesBorrow.setStatus("3");
         int i=archivesBorrowMapper.updateArchivesBorrowByIds(archivesBorrow, ids);
         return i;
@@ -71,12 +71,11 @@
         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="borrowDate != null  "> and a.borrow_date = #{borrowDate}</if>
+        <if test="borrowDateS != null  "> and a.borrow_date >= #{borrowDateS}</if>
+        <if test="borrowDateE != null  "> 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>
@@ -90,7 +89,8 @@
     <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.returnDate != null and archivesBorrow.returnDate != 0">return_date = #{archivesBorrow.returnDate},</if>
+            <if test="archivesBorrow.borrowDate != null ">borrow_date = #{archivesBorrow.borrowDate},</if>
             <if test="archivesBorrow.returnedDate != null">returned_date = #{archivesBorrow.returnedDate},</if>
             <if test="archivesBorrow.status != null">status = #{archivesBorrow.status},</if>
         </trim>
@@ -37,7 +37,9 @@
           <el-input v-model="queryParams.dept"  />
         </el-form-item>
         <el-form-item label="借阅日期" prop="">
-          <el-input v-model="queryParams.borrowDate" />
+          <el-date-picker
+            v-model="queryParams.borrowDate" type="date" value-format="yyyy-MM-dd">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="借阅单号" prop="">
           <el-input v-model="queryParams.borrowMark"  />
@@ -59,8 +61,8 @@
           <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="borrowDate" />
-          <el-table-column label="借阅天数" align="center" prop="returnDate" />
+          <el-table-column label="借阅日期" align="center" prop="borrowDate" />
+          <el-table-column label="预期归还" align="center"  :formatter="returnDateFormat"/>
           <el-table-column label="借阅单号" align="center" prop="borrowMark" />
         </el-table>
       </el-col>
@@ -172,8 +174,19 @@ export default {
     },
     borrowStatusFormat(row, column) {
       return this.selectDictLabel(this.dict.type.borrowStatus, row.status);
+    },
+    returnDateFormat(row, column) {
+      var Dates = new Date(row.borrowDate);
+      Dates.setDate(Dates.getDate() + row.returnDate);
+      var mon = Dates.getMonth() + 1, day = Dates.getDate();
+      if(mon < 10){
+        mon = "0" + mon;//月份小于10，在前面补充0
+      }
+      if(day < 10){
+        day = "0" + day;//日小于10，在前面补充0
+      }
+      return Dates.getFullYear() + "-" + mon + "-" +day;
     }
-
   }
 };
 </script>