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 5e04e8f0e..43025ca9d 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 @@ -37,6 +37,11 @@ public class SysContractController extends BaseController { public TableDataInfo list(SysContract sysContract) { startPage(); List list = sysContractService.selectSysContractList(sysContract); + for (SysContract contract : list) { + if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) { + contract.setName(contract.getName() + "(" + contract.getSignName() + ")"); + } + } return getDataTable(list); } @@ -101,7 +106,6 @@ public class SysContractController extends BaseController { } else { Map data = new HashMap<>(); data.put("id", contract.getId().toString()); - data.put("name", contract.getName()); data.put("amount", contract.getAmount().toString()); data.put("serveTime", contract.getServeTime() + ""); data.put("tutor", contract.getTutor()); 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 4dcbecf77..97c078f8b 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 @@ -28,6 +28,11 @@ public class SysContract extends BaseEntity { @Excel(name = "客户姓名") private String name; + /** + * 客户签名 + */ + private String signName; + /** * 客户身份证 */ @@ -66,6 +71,9 @@ public class SysContract extends BaseEntity { */ private String signDate; + /** + * 营养师 + */ private String tutor; /** @@ -76,6 +84,14 @@ public class SysContract extends BaseEntity { private String servePromise; + public String getSignName() { + return signName; + } + + public void setSignName(String signName) { + this.signName = signName; + } + public String getTutor() { return tutor; } @@ -84,14 +100,14 @@ public class SysContract extends BaseEntity { this.tutor = tutor; } - public void setServePromise(String servePromise) { - this.servePromise = servePromise; - } - public String getServePromise() { return servePromise; } + public void setServePromise(String servePromise) { + this.servePromise = servePromise; + } + public Long getId() { return id; } @@ -128,6 +144,10 @@ public class SysContract extends BaseEntity { return amount; } + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + public String getAmountUpper() { return amountUpper; } @@ -136,10 +156,6 @@ public class SysContract extends BaseEntity { this.amountUpper = amountUpper; } - public void setAmount(BigDecimal amount) { - this.amount = amount; - } - public String getPath() { return path; } diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml index dae59a758..5e1faab40 100644 --- a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml +++ b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml @@ -1,54 +1,56 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - 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 + select id, status, name, sign_name, phone, cus_id, serve_time, tutor, serve_promise, amount, path, create_by, create_time, update_by, update_time, remark from sys_contract - + - + insert into sys_contract id, status, name, + sign_name, tutor, cus_id, phone, @@ -61,12 +63,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, - + #{id}, #{status}, #{name}, - #{tutor}, + #{signName}, + #{tutor}, #{cusId}, #{phone}, #{serveTime}, @@ -78,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, - + @@ -86,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, name = #{name}, - tutor = #{tutor}, + sign_name = #{signName}, + tutor = #{tutor}, cus_id = #{cusId}, phone = #{phone}, serve_time = #{serveTime}, @@ -107,10 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_contract where id in + delete from sys_contract where id in #{id} - + \ No newline at end of file diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index d03d83179..9ab690b35 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -162,6 +162,13 @@ + + + + + + 斤 + - - - - - -