diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf index 029296416..36bdf9099 100644 Binary files a/running/pdf/contract.pdf and b/running/pdf/contract.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 259d27951..5e04e8f0e 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 @@ -104,6 +104,7 @@ public class SysContractController extends BaseController { data.put("name", contract.getName()); data.put("amount", contract.getAmount().toString()); data.put("serveTime", contract.getServeTime() + ""); + data.put("tutor", contract.getTutor()); data.put("servePromise", contract.getServePromise()); ajax.put("data", data); } 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 d2ffcb27a..4dcbecf77 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 @@ -66,6 +66,8 @@ public class SysContract extends BaseEntity { */ private String signDate; + private String tutor; + /** * 合同状态 * 0-未签订;1-已签订 @@ -74,6 +76,14 @@ public class SysContract extends BaseEntity { private String servePromise; + public String getTutor() { + return tutor; + } + + public void setTutor(String tutor) { + this.tutor = tutor; + } + public void setServePromise(String servePromise) { this.servePromise = servePromise; } @@ -185,6 +195,7 @@ public class SysContract extends BaseEntity { .append("signDate", getSignDate()) .append("path", getPath()) .append("createBy", getCreateBy()) + .append("tutor", getTutor()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) 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 7954d9937..1eb881e15 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 @@ -125,6 +125,7 @@ public class SysContractServiceImpl implements ISysContractService { form.setField("name", sysContract.getName(), true); form.setField("time", sysContract.getServeTimeStr(), true); + form.setField("tutor", sysContract.getServeTimeStr(), true); form.setField("moneyUpper", sysContract.getAmountUpper(), true); form.setField("money", sysContract.getAmount().intValue() + "", true); form.setField("phone", sysContract.getPhone(), true); diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml index ff332b0ae..dae59a758 100644 --- a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, status, name, phone, cus_id, serve_time, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract + select id, status, name, phone, cus_id, serve_time, tutor, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract