From 8aa9254db44dffbee2dd5b996e546c5882a4a328 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 30 Nov 2020 10:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 running/pdf/contract.pdf                      | Bin 334210 -> 345511 bytes
 .../service/impl/SysContractServiceImpl.java  |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf
index f52d44713f87e26c9a45fc7de6ac09fd2b7eff1e..0a8a498341cfa68fc027b63ec02a4b61b10c3d59 100644
GIT binary patch
delta 3525
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

delta 19
acmZ49E!wnMq@jheg{g(Pg=GtClOzC0ss?`m

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
index 9d9400f5d..61236dbf1 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
@@ -4,6 +4,7 @@ import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.pdf.*;
 import com.stdiet.common.utils.DateUtils;
+import com.stdiet.common.utils.StringUtils;
 import com.stdiet.custom.domain.SysContract;
 import com.stdiet.custom.mapper.SysContractMapper;
 import com.stdiet.custom.page.PdfProcessInfo;
@@ -102,8 +103,8 @@ public class SysContractServiceImpl implements ISysContractService {
 
     @Override
     public PdfProcessInfo signContract(SysContract sysContract) {
-//        String templatePath = "/Users/wonder/Documents/Workspaces/java/ShengTangMange/running/pdf/contract.pdf";
-//        String filePath = "/Users/wonder/Documents/Workspaces/java/ShengTangMange/running" + sysContract.getPath();
+//        String templatePath = "/Users/wonder/Documents/Workspaces/java/ShengTangManage/running/pdf/contract.pdf";
+//        String filePath = "/Users/wonder/Documents/Workspaces/java/ShengTangManage/running" + sysContract.getPath();
         String templatePath = "/home/workspace/ShengTangManage/running/pdf/contract.pdf";
         String filePath = "/home/web/manage.shengtangdiet.com" + sysContract.getPath();
 
@@ -130,12 +131,11 @@ public class SysContractServiceImpl implements ISysContractService {
             form.setField("phone", sysContract.getPhone(), true);
             form.setField("promise", sysContract.getServePromise(), true);
             form.setField("date", DateUtils.getDate(), true);
+//            form.setField("date", sysContract.getSignDate());
             form.setField("cusId", sysContract.getCusId(), true);
-            String remark = "";
-            if (sysContract.getRemark() != null && !sysContract.getRemark().equals("")) {
-                remark = "（备注：" + sysContract.getRemark() + ")";
+            if (StringUtils.isNotEmpty(sysContract.getRemark())) {
+                form.setField("remark", "（备注：" + sysContract.getRemark() + ")", true);
             }
-            form.setField("remark", remark, true);
 
 
             stamper.setFormFlattening(true);// 如果为false那么生成的PDF文件还能编辑，一定要设为true