From f095bd8c8c9d262f602a6bda2c2c3d438ad48484 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 28 Oct 2020 10:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B2=E8=81=94=E5=90=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysContractController.java | 2 +- .../service/impl/SysContractServiceImpl.java | 1 + ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/custom/contract/index.vue | 22 ++++++++++++++++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java index feae36528..ab04a8f39 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java @@ -95,7 +95,7 @@ public class SysContractController extends BaseController { public AjaxResult getfile(@PathVariable long id) { AjaxResult ajax = AjaxResult.success(); SysContract contract = sysContractService.selectSysContractById(id); - if (contract.getPath() != null && !contract.getPath().equals("")) { + if (contract.getStatus() == 1) { ajax.put("url", contract.getPath()); } else { Map data = new HashMap<>(); diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java index 64dfe5d00..33c8b681b 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java @@ -60,6 +60,7 @@ public class SysContractServiceImpl implements ISysContractService { public int insertSysContract(SysContract sysContract) { sysContract.setId(DateUtils.getNowDate().getTime()); sysContract.setCreateTime(DateUtils.getNowDate()); + sysContract.setPath("/file/contract/" + sysContract.getId()); return sysContractMapper.insertSysContract(sysContract); } diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 9d8264216..aedb1e1fa 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -43,7 +43,7 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.18.1", "base-64": "^1.0.0", - "clipboard": "2.0.4", + "clipboard": "^2.0.6", "core-js": "3.6.5", "dayjs": "^1.9.1", "echarts": "4.2.1", diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index f4cab396a..889e963d0 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -94,7 +94,13 @@ - + + +