diff --git a/running/file/1603673251084.pdf b/running/file/1603673251084.pdf new file mode 100644 index 000000000..94cecc7e8 Binary files /dev/null and b/running/file/1603673251084.pdf differ diff --git a/running/file/1603933440270.pdf b/running/file/1603933440270.pdf new file mode 100644 index 000000000..60f16c8c5 Binary files /dev/null and b/running/file/1603933440270.pdf differ 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 1040b6b60..ff94502cf 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 @@ -96,7 +96,7 @@ public class SysContractController extends BaseController { public AjaxResult getfile(@PathVariable long id) { AjaxResult ajax = AjaxResult.success(); SysContract contract = sysContractService.selectSysContractById(id); - if (contract.getStatus() == 1) { + if (contract.getStatus().equals("yes")) { ajax.put("url", contract.getPath()); } else { Map data = new HashMap<>(); @@ -114,11 +114,11 @@ public class SysContractController extends BaseController { */ @PostMapping("/sign") public AjaxResult signContract(@RequestBody SysContract sysContract) { - sysContract.setStatus(1); String path = "/file/" + sysContract.getId() + ".pdf"; sysContract.setPath(path); PdfProcessInfo result = sysContractService.signContract(sysContract); if (result.getCode() == 1) { + sysContract.setStatus("yes"); sysContractService.updateSysContract(sysContract); AjaxResult ajax = AjaxResult.success(); ajax.put("url", path); diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java index a32c5e01c..18277cc1f 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/domain/SysContract.java @@ -70,7 +70,7 @@ public class SysContract extends BaseEntity { * 合同状态 * 0-未签订;1-已签订 */ - private int Status; + private String Status; public Long getId() { return id; @@ -128,11 +128,11 @@ public class SysContract extends BaseEntity { this.path = path; } - public int getStatus() { + public String getStatus() { return Status; } - public void setStatus(int status) { + public void setStatus(String status) { Status = status; } 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 dfec16810..0291a1294 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 @@ -61,7 +61,8 @@ 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()); + sysContract.setStatus("no"); + sysContract.setPath("/f/contract/" + sysContract.getId()); return sysContractMapper.insertSysContract(sysContract); } diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index a4c3637a7..6c261adb1 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -49,7 +49,7 @@ router.beforeEach((to, from, next) => { } } else { // 没有token - if (whiteList.indexOf(to.path) !== -1 || to.path.startsWith('/file')) { + if (whiteList.indexOf(to.path) !== -1 || to.path.startsWith('/f/contract/')) { // 在免登录白名单,直接进入 next() } else { diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 77c91210e..25b3c0eae 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -125,7 +125,7 @@ export const constantRoutes = [ ] }, { - path: '/file/contract/:id(\\d+)', + path: '/f/contract/:id(\\d+)', hidden: true, component: (resolve) => require(['@/views/custom/signContract'], resolve), meta: { title: '合同' } diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index 8f8a9176d..67bbab82e 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -28,6 +28,16 @@ @keyup.enter.native="handleQuery" /> + + + + + 搜索 重置 @@ -80,20 +90,21 @@ - + - - - + + + + - +