Merge remote-tracking branch 'origin/master'

# Conflicts: # ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml

Merge remote-tracking branch 'origin/master'
# Conflicts: # ruoyi-archives/src/main/resources/mapper/archives/ArchivesBorrowMapper.xml
yiming
2 parents a76f92f5 de53b254
Showing 14 changed files with 518 additions and 35 deletions
ruoyi-admin/src/main/resources/application-druid.yml
ruoyi-admin/src/main/resources/application.yml
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesBorrowController.java
ruoyi-archives/src/main/java/com/ruoyi/controller/ArchivesController.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-generator/src/main/resources/generator.yml
ruoyi-ui/src/api/archives/borrow.js
ruoyi-ui/src/views/archives/collerctbox/filingindex.vue
ruoyi-ui/src/views/archives/collerctbox/index.vue
ruoyi-ui/src/views/archives/remove/index.vue
ruoyi-ui/src/views/borrow/index.vue
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.168.111:3306/archives?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.168.140:3306/archives?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: root
             # 从库数据源
@@ -62,7 +62,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.168.111
+    host: 192.168.168.140
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -94,7 +94,7 @@ token:
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
+    typeAliasesPackage: com.archives.**.domain,com.ruoyi.**.domain
     # 配置mapper的扫描，找到所有的mapper.xml映射文件
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件
@@ -62,4 +62,16 @@ public class ArchivesBorrowController extends BaseController
         return success();
     }
  
+
+    /**
+     * 新增【请填写功能名称】
+     */
+    @PreAuthorize("@ss.hasPermi('archives:borrow:add')")
+    @Log(title = "【新增】", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ArchivesBorrow archivesBorrow)
+    {
+        return toAjax(archivesBorrowService.insertArchivesBorrow(archivesBorrow));
+    }
+    
 }
@@ -9,31 +9,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/archives")
 public class ArchivesController {
  
-    /**
-     * 登记著录
-     */
-    @PreAuthorize("@ss.hasPermi('archives:list')")
-    @RequestMapping("/index")
-    public void ArchivesController(){
-    }
-
-
-    /**
-     * 登记著录
-     */
-    @PreAuthorize("@ss.hasPermi('archives:list')")
-    @RequestMapping("/yfiling")
-    public void ArchivesYfilingController(){
-    }
-
-
-    /**
-     * 登记著录
-     */
-    @PreAuthorize("@ss.hasPermi('archives:list')")
-    @RequestMapping("/filing")
-    public void ArchivesFilingController(){
-    }
-    
  
 }
@@ -46,6 +46,14 @@ public interface ArchivesBorrowMapper
      * @return 【请填写功能名称】集合
      */
     int updateArchivesBorrowByIds(@Param("archivesBorrow") ArchivesBorrow archivesBorrow, @Param("ids") Long[] ids);
+    
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertArchivesBorrow(ArchivesBorrow archivesBorrow); 
  
     int updateArchivesBorrowById(ArchivesBorrow archivesBorrow);
  
@@ -44,4 +44,13 @@ public interface IArchivesBorrowService
      * @return
      */
     int archivesRenew(Long[] ids);
+
+
+    /**
+     * 新增
+     *
+     * @param archivesBorrow 
+     * @return 结果
+     */
+    public int insertArchivesBorrow(ArchivesBorrow archivesBorrow);
 }
@@ -14,6 +14,9 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.Random;
+
+import com.ruoyi.common.utils.DateUtils;
  
 /**
  * 【请填写功能名称】Service业务层处理
@@ -79,4 +82,21 @@ public class ArchivesBorrowServiceImpl implements IArchivesBorrowService
     }
  
  
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param archivesBorrow 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertArchivesBorrow(ArchivesBorrow archivesBorrow)
+    {   //借阅单号
+        Random r=new Random();
+        String borrowMark = "ASDF" + System.currentTimeMillis() + "-" + r.nextInt(500);
+        archivesBorrow.setBorrowMark(borrowMark);
+        archivesBorrow.setCreateTime(DateUtils.getNowDate());
+        return archivesBorrowMapper.insertArchivesBorrow(archivesBorrow);
+    }
+
+
 }
@@ -90,7 +90,7 @@
     <update id="updateArchivesBorrowByIds" parameterType="ArchivesBorrow">
         update archives_borrow
         <trim prefix="SET" suffixOverrides=",">
-            <if test="archivesBorrow.borrowDate != null">borrow_date = #{archivesBorrow.borrowDate},</if>
+            <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>
@@ -108,4 +108,45 @@
         where id = #{id}
     </update>
  
+    <insert id="insertArchivesBorrow" parameterType="ArchivesBorrow" useGeneratedKeys="true" keyProperty="id">
+        insert into archives_borrow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="dept != null">dept,</if>
+            <if test="borrowDate != null">borrow_date,</if>
+            <if test="phone != null">phone,</if>
+            <if test="mode != null">mode,</if>
+            <if test="boxType != null">box_type,</if>
+            <if test="borrowName != null">borrow_name,</if>
+            <if test="borrowType != null">borrow_type,</if>
+            <if test="collectBoxId != null">collect_box_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="returnDate != null">return_date,</if>
+            <if test="returnedDate != null">returned_date,</if>
+            <if test="borrowMark != null">borrow_mark,</if>
+            <if test="status != null">status,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="dept != null">#{dept},</if>
+            <if test="borrowDate != null">#{borrowDate},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="mode != null">#{mode},</if>
+            <if test="boxType != null">#{boxType},</if>
+            <if test="borrowName != null">#{borrowName},</if>
+            <if test="borrowType != null">#{borrowType},</if>
+            <if test="collectBoxId != null">#{collectBoxId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="returnDate != null">#{returnDate},</if>
+            <if test="returnedDate != null">#{returnedDate},</if>
+            <if test="borrowMark != null">#{borrowMark},</if>
+            <if test="status != null">#{status},</if>
+        </trim>
+    </insert>
 </mapper>
 \ No newline at end of file
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: li
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.archives
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
 \ No newline at end of file
+  tablePrefix: 
 \ No newline at end of file
+import request from '@/utils/request'
+// 新增【请填写功能名称】
+export function addBorrow(data) {
+  return request({
+    url: '/archives/borrow',
+    method: 'post',
+    data: data
+  })
+}
@@ -490,7 +490,6 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        status: "0",
         apprvoal: null,
         belongRole: null,
         boxMark: null,
@@ -524,7 +524,6 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        status: "0",
         apprvoal: null,
         belongRole: null,
         boxMark: null,
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "index"
+}
+</script>
+
+<style scoped>
+
+</style>
+<template>
+  <div class="app-container">
+
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" >
+      <el-form-item label="全宗号1" prop="general">
+        <el-input
+          v-model="queryParams.general"
+          placeholder="请输入全宗号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="年度" prop="year">
+        <el-input
+          v-model="queryParams.year"
+          placeholder="请输入年度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="题名" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入题名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分类号" prop="sort">
+        <el-input
+          v-model="queryParams.sort"
+          placeholder="请输入分类号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5" >
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="single"
+          @click="handleupdateborrow"
+          v-hasPermi="['archives:collerctbox:inserBox']"
+        >借阅</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="boxList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="操作" align="center" prop="year" >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCheck(scope.row)"
+            v-hasPermi="['archives:box:check']"
+          >查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="全宗号" align="center" prop="general" />
+      <el-table-column label="年度" align="center" prop="year" />
+      <el-table-column label="题名" align="center" prop="title" />
+      <el-table-column label="分类号" align="center" prop="sort" />
+      <el-table-column label="保管期限" align="center" prop="safekeepingDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.safekeepingDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="密级" align="center" prop="secretLevel" />
+      <el-table-column label="页数" align="center" prop="pages" />
+      <el-table-column label="归档份数" align="center" prop="filingNumber" />
+      <el-table-column label="在库份数" align="center" prop="zkNumber" />
+      <el-table-column label="库位码" align="center" prop="locationCode" />
+      <el-table-column label="归档部门" align="center" prop="filingDept" />
+      <el-table-column label="档号" align="center" prop="archivalCode" />
+      <el-table-column label="责任者" align="center" prop="responsibilityName" />
+      <el-table-column label="序号" align="center" prop="serialMark" />
+      <el-table-column label="件号" align="center" prop="pieceMark" />
+      <el-table-column label="登记号" align="center" prop="registerMark" />
+      <el-table-column label="参议人员" align="center" prop="counsellors" />
+      <el-table-column label="归档人" align="center" prop="filingName" />
+      <el-table-column label="纪要人" align="center" prop="summaryName" />
+      <el-table-column label="文种" align="center" prop="recordType" />
+      <el-table-column label="载体类型" align="center" prop="carrierType" />
+      <el-table-column label="拟稿人" align="center" prop="draftName" />
+      <el-table-column label="页次" align="center" prop="page" />
+      <el-table-column label="文号" align="center" prop="documentMark" />
+      <el-table-column label="原文" align="center" prop="text" />
+      <el-table-column label="盒号" align="center" prop="boxMark" />
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+    <el-dialog :title="title" :visible.sync="open"  width="40%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+        <el-form-item label="借阅人" prop="name">
+          <el-input v-model="form.name" placeholder="请输入借阅人" />
+        </el-form-item>
+          </el-col>
+          <el-col :span="12">
+        <el-form-item label="借阅部门" prop="dept">
+          <el-input v-model="form.dept" placeholder="请输入借阅部门" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+        <el-form-item label="借阅日期" prop="borrowDate">
+          <el-date-picker clearable
+                          v-model="form.borrowDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择借阅日期">
+          </el-date-picker>
+        </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="实体利用方式" prop="mode" >
+              <el-radio v-model="form.mode" label="1">实体借阅</el-radio>
+              <el-radio v-model="form.mode" label="2">实体查阅</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子利用方式" prop="mode">
+              <el-radio v-model="form.mode" label="3">查看</el-radio>
+              <el-radio v-model="form.mode" label="4">下载</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="档案门类" prop="borrowName1">
+              <el-input v-model="form.borrowName1" placeholder="请输入借阅登记人" />
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="借阅登记人" prop="borrowName">
+              <el-input v-model="form.borrowName" placeholder="请输入借阅登记人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-form-item label="借阅目的" prop="borrowName">
+            <el-select v-model="form.borrowType" placeholder="请选择借阅目的">
+              <el-option
+                v-for="dict in dict.type.borrow_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+        </el-row>
+
+
+        <el-row>
+
+          <el-form-item label="申请借阅档案信息" >
+            添加档案
+            <table id="borrowTable" >
+              <tr style="border:1px solid #FFDCDF;">
+                <td>档号</td>
+                <td>题名</td>
+              </tr>
+              <tr style="border:1px solid #FFDCDF;">
+                <td>11111111111</td>
+                <td>222222222</td>
+              </tr>
+              <tr>
+
+              </tr>
+            </table>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { listCollerBox, getBox, delBox, addBox, updateBox,updatedelBox } from "@/api/archives/collerctbox";
+  import { addBorrow } from "@/api/archives/borrow.js";
+
+  import file from "@/views/archives/file";
+  export default {
+    dicts: ['borrow_type'],
+    components: { file },
+    props: {
+      statusPd: {
+        type: Number, // 这里你接收的值是什么类型就写什么类型
+      },
+      boxsId: {
+        type: Number,
+      }
+    },
+
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 【登记著录】表格数据
+        boxList: [],
+        boxtwoList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          general: null,
+          year: null,
+          title: null,
+          sort: null,
+          safekeepingDate: null,
+          secretLevel: null,
+          pages: null,
+          filingNumber: null,
+          zkNumber: null,
+          locationCode: null,
+          filingDept: null,
+          archivalCode: null,
+          responsibilityName: null,
+          serialMark: null,
+          pieceMark: null,
+          registerMark: null,
+          counsellors: null,
+          filingName: null,
+          summaryName: null,
+          recordType: null,
+          carrierType: null,
+          draftName: null,
+          page: null,
+          documentMark: null,
+          text: null,
+          status: null,
+          apprvoal: null,
+          belongRole: null,
+          boxMark: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        },
+        borrowStatus : 1,//可借阅
+        collectBoxId : null,
+      };
+    },
+    //statusPd  0未整理文件 1 已整理文件 2 盒
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询【登记著录】列表 */
+      getList() {
+        this.queryParams.boxId = this.boxsId != null ? this.boxsId : null; //是否盒内文件
+        listCollerBox(this.queryParams).then(response => {
+          this.boxList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          name: null,
+          dept: null,
+          borrowDate: null,
+          phone: null,
+          mode: null,
+          boxType: null,
+          borrowName: null,
+          borrowType: null,
+          collectBoxId: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          returnDate: null,
+          returnedDate: null,
+          borrowMark: null,
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+
+
+
+      handleupdateborrow(row){
+        this.open = true;
+        this.collectBoxId = row.id;
+      },
+
+
+      submitForm(){
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            this.form.collectBoxId =  this.collectBoxId;
+            addBorrow(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+
+          }
+        });
+      }
+
+
+    }
+  };
+</script>
+
+<style>
+  #borrowTable{
+    width: 80%;
+    border: 1px solid #FFDCDF;
+    margin-left: 10% ;
+    text-align: center;
+  }
+  #borrowTable tr td{
+   border: 1px solid #FFDCDF;
+  }
+  #borrowTable{
+   border-collapse: collapse;
+  }
+</style>