diff --git a/running/pdf/contract_1.pdf b/running/pdf/contract_1.pdf new file mode 100644 index 000000000..945dbcb98 Binary files /dev/null and b/running/pdf/contract_1.pdf differ diff --git a/running/pdf/contract_10.pdf b/running/pdf/contract_10.pdf new file mode 100644 index 000000000..35f40002a Binary files /dev/null and b/running/pdf/contract_10.pdf differ diff --git a/running/pdf/contract_11.pdf b/running/pdf/contract_11.pdf new file mode 100644 index 000000000..0b1b7769c Binary files /dev/null and b/running/pdf/contract_11.pdf differ diff --git a/running/pdf/contract_2.pdf b/running/pdf/contract_2.pdf new file mode 100644 index 000000000..ce3284fbc Binary files /dev/null and b/running/pdf/contract_2.pdf differ diff --git a/running/pdf/contract_3.pdf b/running/pdf/contract_3.pdf index 6574cdd6e..33aa811a2 100644 Binary files a/running/pdf/contract_3.pdf and b/running/pdf/contract_3.pdf differ diff --git a/running/pdf/contract_4.pdf b/running/pdf/contract_4.pdf new file mode 100644 index 000000000..8c84b4bd0 Binary files /dev/null and b/running/pdf/contract_4.pdf differ diff --git a/running/pdf/contract_5.pdf b/running/pdf/contract_5.pdf new file mode 100644 index 000000000..e6c0b1dc3 Binary files /dev/null and b/running/pdf/contract_5.pdf differ diff --git a/running/pdf/contract_6.pdf b/running/pdf/contract_6.pdf new file mode 100644 index 000000000..c21093ee8 Binary files /dev/null and b/running/pdf/contract_6.pdf differ diff --git a/running/pdf/contract_7.pdf b/running/pdf/contract_7.pdf new file mode 100644 index 000000000..f8319f717 Binary files /dev/null and b/running/pdf/contract_7.pdf differ diff --git a/running/pdf/contract_8.pdf b/running/pdf/contract_8.pdf new file mode 100644 index 000000000..6a06bcb2a Binary files /dev/null and b/running/pdf/contract_8.pdf differ diff --git a/running/pdf/contract_9.pdf b/running/pdf/contract_9.pdf new file mode 100644 index 000000000..6a43dcdf8 Binary files /dev/null and b/running/pdf/contract_9.pdf differ 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 73f0c018f..288baf63a 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 @@ -106,9 +106,10 @@ public class SysContractServiceImpl implements ISysContractService { @Override public PdfProcessInfo signContract(SysContract sysContract) { -// 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 pathSuffix = (sysContract.getProjectId() != null && sysContract.getProjectId().intValue() != 0) ? ("_"+sysContract.getProjectId()) : "" ; + //String templatePath = "D:\\contract\\contract"+pathSuffix+".pdf"; + //String filePath = "D:\\contract" + sysContract.getPath(); + String templatePath = "/home/workspace/ShengTangManage/running/pdf/contract"+pathSuffix+".pdf"; String filePath = "/home/web/manage.shengtangdiet.com" + sysContract.getPath(); PdfReader reader; @@ -141,6 +142,7 @@ public class SysContractServiceImpl implements ISysContractService { form.setField("remark", "(备注:" + sysContract.getRemark() + ")", true); } }else{ + form.setField("id", sysContract.getId()+"", true); form.setField("companyName", ContractContants.companyName, true); form.setField("companyLegalPerson", ContractContants.companyLegalPerson, true); form.setField("name", sysContract.getSignName(), true); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index bad90a0fa..1391c3d92 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional; * @author xzj * @date 2021-01-15 */ -@Service +@Service("sysRecipesPlanService") @Transactional public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { @@ -134,7 +134,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService } SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId); //订单为空、金额小于0不进行食谱生成、更新,只对2021年开始的订单进行食谱计划生成 - if(sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() > 2020){ + if(sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021){ return; } System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear()); diff --git a/stdiet-ui/src/views/custom/contract/index.vue b/stdiet-ui/src/views/custom/contract/index.vue index 682a02cc6..e682a6885 100644 --- a/stdiet-ui/src/views/custom/contract/index.vue +++ b/stdiet-ui/src/views/custom/contract/index.vue @@ -409,8 +409,8 @@ // }); // } else { this.form.tutor = this.selectDictLabel(this.nutritionistIdOptions, this.form.nutritionistId) - if(this.form.projectId != 0 && this.form.projectId != 3){ - return; + if(this.form.projectId != 0){ + this.form.servePromise = null; } addContract(this.form).then(response => { if (response.code === 200) { diff --git a/stdiet-ui/src/views/custom/signContract/index.vue b/stdiet-ui/src/views/custom/signContract/index.vue index 14c873ff4..055b0ef67 100644 --- a/stdiet-ui/src/views/custom/signContract/index.vue +++ b/stdiet-ui/src/views/custom/signContract/index.vue @@ -45,7 +45,7 @@
四、服务事项
五、争议及提前结束服务