|
|
|
|
@ -111,6 +111,15 @@ public class TemplateVariableAssignServiceImpl implements ITemplateVariableAssig
|
|
|
|
|
.collect(Collectors.joining("\n"));
|
|
|
|
|
contractInfo.setPaymentMethodDetails(paymentMethodDetails);
|
|
|
|
|
}
|
|
|
|
|
// 合同物料备注:有值时前缀「备注:」
|
|
|
|
|
if (StringUtils.isNotBlank(contractInfo.getMaterialRemark())) {
|
|
|
|
|
String remark = contractInfo.getMaterialRemark().trim();
|
|
|
|
|
if (!remark.startsWith("备注:")) {
|
|
|
|
|
contractInfo.setMaterialRemark("备注:" + remark);
|
|
|
|
|
} else {
|
|
|
|
|
contractInfo.setMaterialRemark(remark);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 为所有模板变量赋值
|
|
|
|
|
return buildAssignResultList(allTemplateVariables, variableMap, contractInfo, contractMaterials);
|
|
|
|
|
}
|
|
|
|
|
|