Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

亚健康合同

Browse Source
This commit is contained in:
xiezhijun
2021-01-29 18:38:14 +08:00
parent 2fb4395eb7
commit 54db0ba24a
15 changed files with 131 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysContractServiceImpl.java
View File

@ -106,10 +106,13 @@ 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 filePath = "/home/web/manage.shengtangdiet.com" + sysContract.getPath();
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;
FileOutputStream out;
@ -141,6 +144,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);

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -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());