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 2389f4010..feae36528 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,13 +95,14 @@ public class SysContractController extends BaseController {
public AjaxResult getfile(@PathVariable long id) {
AjaxResult ajax = AjaxResult.success();
SysContract contract = sysContractService.selectSysContractById(id);
- if (contract.getPath() != null) {
+ if (contract.getPath() != null && !contract.getPath().equals("")) {
ajax.put("url", contract.getPath());
} 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().toString());
+ data.put("serveTime", contract.getServeTime() + "");
ajax.put("data", data);
}
return ajax;
@@ -115,8 +116,9 @@ public class SysContractController extends BaseController {
sysContract.setStatus(1);
String path = "/file/" + sysContract.getId() + ".pdf";
sysContract.setPath(path);
- int count = sysContractService.updateSysContract(sysContract);
- if (count > 0) {
+ boolean result = sysContractService.signContract(sysContract);
+ if (result) {
+ sysContractService.updateSysContract(sysContract);
AjaxResult ajax = AjaxResult.success();
ajax.put("url", path);
return ajax;
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 2a403816f..a32c5e01c 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
@@ -43,7 +43,9 @@ public class SysContract extends BaseEntity {
* 服务时间
*/
@Excel(name = "服务时间")
- private Integer serveTime;
+ private int serveTime;
+
+ private String serveTimeStr;
/**
* 金额
@@ -59,6 +61,11 @@ public class SysContract extends BaseEntity {
@Excel(name = "文件路径")
private String path;
+ /**
+ * 签约日期
+ */
+ private String signDate;
+
/**
* 合同状态
* 0-未签订;1-已签订
@@ -89,11 +96,11 @@ public class SysContract extends BaseEntity {
this.phone = phone;
}
- public Integer getServeTime() {
+ public int getServeTime() {
return serveTime;
}
- public void setServeTime(Integer serveTime) {
+ public void setServeTime(int serveTime) {
this.serveTime = serveTime;
}
@@ -137,6 +144,23 @@ public class SysContract extends BaseEntity {
this.cusId = cusId;
}
+ public String getSignDate() {
+ return signDate;
+ }
+
+ public void setSignDate(String signDate) {
+ this.signDate = signDate;
+ }
+
+
+ public String getServeTimeStr() {
+ return serveTimeStr;
+ }
+
+ public void setServeTimeStr(String serveTimeStr) {
+ this.serveTimeStr = serveTimeStr;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -147,6 +171,8 @@ public class SysContract extends BaseEntity {
.append("phone", getPhone())
.append("serveTime", getServeTime())
.append("amount", getAmount())
+ .append("amountUpper", getAmountUpper())
+ .append("signDate", getSignDate())
.append("path", getPath())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysContractService.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysContractService.java
index 8df35a504..abb6d0ef3 100644
--- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysContractService.java
+++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/ISysContractService.java
@@ -59,5 +59,5 @@ public interface ISysContractService
*/
public int deleteSysContractById(Long id);
- public int signContract(SysContract sysContract);
+ public boolean signContract(SysContract sysContract);
}
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 1225a5d8c..64dfe5d00 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
@@ -98,9 +98,12 @@ public class SysContractServiceImpl implements ISysContractService {
}
@Override
- public int signContract(SysContract sysContract) {
- String templatePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/pdf/contract.pdf";
- String filePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running" + sysContract.getPath() + ".pdf";
+ public boolean signContract(SysContract sysContract) {
+// String templatePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/pdf/contract.pdf";
+// String filePath = "/Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running" + sysContract.getPath();
+ String templatePath = "/home/workspace/RuoYi-Vue/running/pdf/contract.pdf";
+ String filePath = "/home/www/web/long.busyinn.com/file" + sysContract.getPath();
+
PdfReader reader;
FileOutputStream out;
ByteArrayOutputStream bos;
@@ -116,11 +119,11 @@ public class SysContractServiceImpl implements ISysContractService {
form.addSubstitutionFont(BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED));
form.setField("name", sysContract.getName(), true);
- form.setField("time", sysContract.getServeTime().toString(), true);
+ form.setField("time", sysContract.getServeTimeStr(), true);
form.setField("moneyUpper", sysContract.getAmountUpper(), true);
form.setField("money", sysContract.getAmount().intValue() + "", true);
form.setField("phone", sysContract.getPhone(), true);
- form.setField("date", sysContract.getCreateTime().toString(), true);
+ form.setField("date", DateUtils.getDate(), true);
form.setField("cusId", sysContract.getCusId(), true);
@@ -138,6 +141,8 @@ public class SysContractServiceImpl implements ISysContractService {
copy.addPage(importPage);
}
doc.close();
+
+ return true;
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
@@ -145,6 +150,6 @@ public class SysContractServiceImpl implements ISysContractService {
} catch (DocumentException e) {
e.printStackTrace();
}
- return 0;
+ return false;
}
}
diff --git a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml
index 25a001722..c417dffaf 100644
--- a/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml
+++ b/ruoyi-custom/src/main/resources/mapper/custom/SysContractMapper.xml
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id},
#{status},
#{name},
- #{cus_id},
+ #{cusId},
#{phone},
#{serveTime},
#{amount},
@@ -76,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_contract
- name = #{status},
+ status = #{status},
name = #{name},
- name = #{cus_id},
+ cus_id = #{cusId},
phone = #{phone},
serve_time = #{serveTime},
amount = #{amount},
diff --git a/ruoyi-ui/src/api/custom/contract.js b/ruoyi-ui/src/api/custom/contract.js
index a5833256e..31881d27c 100644
--- a/ruoyi-ui/src/api/custom/contract.js
+++ b/ruoyi-ui/src/api/custom/contract.js
@@ -61,8 +61,8 @@ export function getFile(id) {
export function signContract(data) {
return request({
- url: '/custom/contract/',
- method: 'put',
+ url: '/custom/contract/sign',
+ method: 'post',
data: data
})
}
diff --git a/ruoyi-ui/src/views/custom/signContract/index.vue b/ruoyi-ui/src/views/custom/signContract/index.vue
index 0919a17b2..defbbf9c0 100644
--- a/ruoyi-ui/src/views/custom/signContract/index.vue
+++ b/ruoyi-ui/src/views/custom/signContract/index.vue
@@ -9,10 +9,10 @@
¥{{form.amount}}
- {{form.serveTime}}
+ {{form.serveTimeStr}}
-
-
+
+
@@ -50,8 +50,8 @@
第二条 合作内容及费用
-
11、经甲乙双方协商确定,乙方向甲方购买{{form.serveTime}}“胜唐体控瘦身指导服务”(以下简称服务)。
- 12、乙方向甲方购买
{{form.serveTime}},经甲乙双方协商确定,乙方向甲方支付疗程费用共为人民币:
{{form.amount}}元,大写:
{{form.amountUppercase}})。
+
11、经甲乙双方协商确定,乙方向甲方购买{{form.serveTimeStr}}“胜唐体控瘦身指导服务”(以下简称服务)。
+
12、乙方向甲方购买{{form.serveTimeStr}},经甲乙双方协商确定,乙方向甲方支付疗程费用共为人民币:{{form.amount}}元,大写:{{form.amountUppercase}})。
@@ -82,17 +82,17 @@