diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java index 0c421d70..c8b51cd7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/controller/LeaseTaskController.java @@ -237,7 +237,7 @@ public class LeaseTaskController extends BaseController { replacements.put("${unitName}", String.valueOf(info.getUnitName())); -// replacements.put("${leasePerson}", String.valueOf(info.getLeasePerson())); + replacements.put("${leasePerson}", String.valueOf(info.getLeasePerson())); replacements.put("${companyName}", String.valueOf(info.getCompanyName())); @@ -342,12 +342,12 @@ public class LeaseTaskController extends BaseController { replacements.put("${month}", String.valueOf(month)); replacements.put("${day}", String.valueOf(day)); - replacements.put("${companyName}", String.valueOf(info.getCompanyName())); - replacements.put("${leasePerson}", String.valueOf(info.getLeasePerson())); - replacements.put("${unitName}", String.valueOf(info.getUnitName())); - replacements.put("${projectName}", String.valueOf(info.getProjectName())); - replacements.put("${phone}", String.valueOf(info.getPhone())); - replacements.put("${code}", String.valueOf(info.getCode())); + replacements.put("${companyName}", info.getCompanyName()); + replacements.put("TTTleas", info.getLeasePerson()); + replacements.put("${unitName}", info.getUnitName()); + replacements.put("${projectName}", info.getProjectName()); + replacements.put("${phone}", info.getPhone()); + replacements.put("${code}", info.getCode()); replacements.put("${createTime}", String.valueOf(info.getCreateTime())); replacements.put("${createBy}", String.valueOf(info.getCreateBy())); diff --git a/bonus-modules/bonus-material/src/main/resources/template/yewu.docx b/bonus-modules/bonus-material/src/main/resources/template/yewu.docx index 33225d29..cf68e69f 100644 Binary files a/bonus-modules/bonus-material/src/main/resources/template/yewu.docx and b/bonus-modules/bonus-material/src/main/resources/template/yewu.docx differ